Index: samigo-app/src/webapp/jsf/delivery/submitted.jsp
===================================================================
--- samigo-app/src/webapp/jsf/delivery/submitted.jsp	(revision 118735)
+++ samigo-app/src/webapp/jsf/delivery/submitted.jsp	(working copy)
@@ -129,14 +129,13 @@
 </div>
 
 <br /><br />
+
+
 <div class="tier1">
   <h:panelGrid columns="2" cellpadding="3" cellspacing="3">
     <h:commandButton type="submit" value="#{deliveryMessages.button_continue}" action="select"
        rendered="#{delivery.actionString=='takeAssessment'}" />
 
-    <h:commandButton value="#{deliveryMessages.button_close_window}" type="button" 
-       rendered="#{delivery.actionString=='takeAssessmentViaUrl' && !delivery.anonymousLogin}"
-       style="act" onclick="javascript:window.close();" />
 
 
     <h:commandButton value="#{deliveryMessages.review_results}" type="button" id="reviewAssessment"
Index: samigo-app/src/webapp/jsf/delivery/confirmSubmit.jsp
===================================================================
--- samigo-app/src/webapp/jsf/delivery/confirmSubmit.jsp	(revision 118735)
+++ samigo-app/src/webapp/jsf/delivery/confirmSubmit.jsp	(working copy)
@@ -142,6 +142,11 @@
 	disabled="#{delivery.actionString=='previewAssessment'}" 
     onclick="disableSubmitForGrade()" onkeypress="" />
 
+    <h:commandButton value="#{deliveryMessages.button_close_window}" type="button" 
+       rendered="#{delivery.actionString=='takeAssessmentViaUrl' && !delivery.anonymousLogin}"
+       style="act" onclick="javascript:window.close();" />
+    
+
   <%-- SUBMIT FOR GRADE FOR LINEAR ACCESS --%>
   <h:commandButton type="submit" value="#{deliveryMessages.button_submit_grading}"
       action="#{delivery.submitForGrade}"  id="submitForm" styleClass="active"