diff --git a/reference/library/src/morpheus-master/sass/modules/tool/samigo/_samigo.scss b/reference/library/src/morpheus-master/sass/modules/tool/samigo/_samigo.scss
index 9393882820dd..6f3abc1fa1aa 100644
--- a/reference/library/src/morpheus-master/sass/modules/tool/samigo/_samigo.scss
+++ b/reference/library/src/morpheus-master/sass/modules/tool/samigo/_samigo.scss
@@ -202,48 +202,26 @@
 
 	.extendedTimeDataTable {
 		margin-bottom: .5em;
-	}
-
-	.extendedTimeDataTable thead tr th {
-		padding-left: .5em;
-		border-bottom: 1px solid black;
-	}
 
-	.extendedTime-user {
-		min-width: 130px;
-	}
+		select {
+			max-width: 150px;
+		}
 
-	.extendedTime-group {
-		min-width: 130px;
-	}
+		thead tr th {
+			border-bottom: 1px solid black;
+		}
 
-	.extendedTime-start {
-		min-width: 250px;
-	}
-	.extendedTime-due {
-		min-width: 250px;
-	}
-	.extendedTime-retract {
-		min-width: 250px;
-	}
-	.extendedTime-hours {
-		min-width: 70px;
-	}
-	.extendedTime-mins {
-		min-width: 70px;
-	}
+		tr {
+			border-bottom: 1px solid lightgrey;
+		}
 
-	.extendedTimeDataTable tr {
-		border-bottom: 1px solid lightgrey;
-	}
+		.extendedTime-user, .extendedTime-group {
+			max-width: 160px;
+		}
 
-	.extendedTimeDataTable tr td {
-		padding-left: .25em;
-		padding-right: .25em;
+		.extendedTime-mins {
+			min-width: 70px;
+		}
 	}
 
-	.extendedTimeEntryTable tr td {
-		padding-left: .25em;
-		padding-right: .25em;
-	}
 }
diff --git a/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AssessmentSettingsMessages.properties b/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AssessmentSettingsMessages.properties
index 9a8357ce7df3..019f95949681 100755
--- a/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AssessmentSettingsMessages.properties
+++ b/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AssessmentSettingsMessages.properties
@@ -18,6 +18,7 @@ heading_metadata=Metadata
 heading_about=About this Assessment
 heading_availability=Availability and Submissions
 heading_grading_feedback=Grading and Feedback
+heading_extended_time=Exceptions to Time Limit and Delivery Date
 heading_layout=Layout and Appearance
 heading_background=Change background?
 clear_calendar_alt=Clear Date
@@ -36,6 +37,7 @@ assessment_available=It is available
 assessment_due=It is due
 has_time_limit=and has a time limit of
 late_accept=Late submissions accepted?
+late_accept_until=Late submissions accepted until?
 late_accept_help=Students get one chance to submit after due date if they haven't already submitted.
 no_late=No, not after due date
 yes_late=Yes, until
@@ -305,9 +307,11 @@ less_than_two_columns=columns field need to have at least two inputs, separated
 selectFromFavorites=Select from Favorites
 
 # Extended time
-extendedTimeHeading=Exceptions to Time Limit and Delivery Date
-extendedTimeAdd=Add a Time Limit/Delivery Date Exception
-extendedTimeEdit=Update a Time Limit / Delivery Date Exception
+extendedTimeNew=Add New Exception
+extendedTimeExisting=Existing Exceptions
+extendedTimeInstruction=You must click the 'Add an Exception' button to add individual exception(s) before saving settings
+extendedTimeAdd=Add an Exception
+extendedTimeEdit=Update an Exception
 extendedTimeCancel=Cancel
 header_extendedTime_user=User
 header_extendedTime_group=Group
@@ -318,6 +322,9 @@ header_extendedTime_hours=Hours
 header_extendedTime_minutes=Minutes
 header_extendedTime_delete=Delete
 header_extendedTime_edit=Edit
+extendedTimeUser=Exception for User
+extendedTimeGroup=Exception for Group
+extendedTime_select_User=Select User
 extendedTime_select_group=Select Group
 extendedTime_select_User=Select User
 extendedTime_data_table_title=Extended time entry data table.
diff --git a/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/AssessmentSettingsBean.java b/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/AssessmentSettingsBean.java
index 275bca5bba64..bc9f4dd8ede2 100644
--- a/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/AssessmentSettingsBean.java
+++ b/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/AssessmentSettingsBean.java
@@ -1717,7 +1717,7 @@ public ExtendedTime getExtendedTime() {
     }
 
     public String getExtendedTimeStartString() {
-        return getDisplayFormatFromDate(this.extendedTime.getStartDate());
+        return tu.getDateTimeWithTimezoneConversion(this.extendedTime.getStartDate());
     }
 
     public void setExtendedTimeStartString(String exTimeStartString) {
@@ -1728,7 +1728,7 @@ public void setExtendedTimeStartString(String exTimeStartString) {
     }
 
     public String getExtendedTimeDueString() {
-        return getDisplayFormatFromDate(this.extendedTime.getDueDate());
+        return tu.getDateTimeWithTimezoneConversion(this.extendedTime.getDueDate());
     }
 
     public void setExtendedTimeDueString(String exTimeDueString) {
@@ -1739,7 +1739,7 @@ public void setExtendedTimeDueString(String exTimeDueString) {
     }
 
     public String getExtendedTimeRetractString() {
-        return getDisplayFormatFromDate(this.extendedTime.getRetractDate());
+        return tu.getDateTimeWithTimezoneConversion(this.extendedTime.getRetractDate());
     }
 
     public void setExtendedTimeRetractString(String exTimeRetractString) {
diff --git a/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/PublishedAssessmentSettingsBean.java b/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/PublishedAssessmentSettingsBean.java
index 0025cf527b2c..a8152ab442dd 100644
--- a/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/PublishedAssessmentSettingsBean.java
+++ b/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/PublishedAssessmentSettingsBean.java
@@ -1608,7 +1608,7 @@ public ExtendedTime getExtendedTime() {
   }
 
   public String getExtendedTimeStartString() {
-    return getDisplayFormatFromDate(this.extendedTime.getStartDate());
+    return tu.getDateTimeWithTimezoneConversion(this.extendedTime.getStartDate());
   }
 
   public void setExtendedTimeStartString(String exTimeStartString) {
@@ -1619,7 +1619,7 @@ public void setExtendedTimeStartString(String exTimeStartString) {
   }
 
   public String getExtendedTimeDueString() {
-    return getDisplayFormatFromDate(this.extendedTime.getDueDate());
+    return tu.getDateTimeWithTimezoneConversion(this.extendedTime.getDueDate());
   }
 
   public void setExtendedTimeDueString(String exTimeDueString) {
@@ -1630,7 +1630,7 @@ public void setExtendedTimeDueString(String exTimeDueString) {
   }
 
   public String getExtendedTimeRetractString() {
-    return getDisplayFormatFromDate(this.extendedTime.getRetractDate());
+    return tu.getDateTimeWithTimezoneConversion(this.extendedTime.getRetractDate());
   }
 
   public void setExtendedTimeRetractString(String exTimeRetractString) {
diff --git a/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/util/TimeUtil.java b/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/util/TimeUtil.java
index 5225862a4d34..5a1b4b92df83 100755
--- a/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/util/TimeUtil.java
+++ b/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/util/TimeUtil.java
@@ -32,6 +32,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.ISODateTimeFormat;
@@ -166,6 +167,20 @@ public String getIsoDateWithLocalTime(Date dateToConvert) {
       DateTimeFormatter localFmtTime = fmtTime.withLocale(new ResourceLoader().getLocale());
       return dt.toString(localFmt) + " " + dt.toString(localFmtTime);
   }
+
+  public String getDateTimeWithTimezoneConversion(Date dateToConvert) {
+      DateTime dt = new DateTime(dateToConvert);
+      DateTimeFormatter fmt = ISODateTimeFormat.yearMonthDay();
+      DateTimeFormatter fmtTime = ISODateTimeFormat.hourMinuteSecond();
+
+      // If the client browser is in a different timezone than server, need to modify date
+      if (m_client_timezone !=null && m_server_timezone!=null && !m_client_timezone.hasSameRules(m_server_timezone)) {
+        DateTimeZone dateTimeZone = DateTimeZone.forTimeZone(m_client_timezone);
+        fmt = fmt.withZone(dateTimeZone);
+        fmtTime = fmtTime.withZone(dateTimeZone);
+      }
+      return dt.toString(fmt) + " " + dt.toString(fmtTime);
+  }
   
   /*
    * SAM-2323: the jquery-ui datepicker provides a hidden field with ISO-8601 date/time
diff --git a/samigo/samigo-app/src/webapp/jsf/author/authorSettings.jsp b/samigo/samigo-app/src/webapp/jsf/author/authorSettings.jsp
index 787af14d4df1..23e256640c43 100755
--- a/samigo/samigo-app/src/webapp/jsf/author/authorSettings.jsp
+++ b/samigo/samigo-app/src/webapp/jsf/author/authorSettings.jsp
@@ -50,7 +50,20 @@
       <script type="text/javascript">
         $(document).ready(function() {
           // set up the accordion for settings
-          $("#jqueryui-accordion").accordion({ heightStyle: "content", collapsible: true, active: 1 });
+          var accordionPanel = 1;
+          if (window.sessionStorage && window.sessionStorage.getItem('samigo_assessmentsettings')) {
+              accordionPanel = parseInt(window.sessionStorage.getItem('samigo_assessmentsettings'));
+          }
+          $("#jqueryui-accordion").accordion({
+              heightStyle: "content",
+              activate: function(event, ui) {
+                  if (window.sessionStorage) {
+                      window.sessionStorage.setItem('samigo_assessmentsettings', $("#jqueryui-accordion").accordion("option", "active"));
+                  }
+              },
+              active: accordionPanel,
+              collapsible: true
+          });
           // This is a sub-accordion inside of the About the Assessment Panel
           $("#jqueryui-accordion-metadata").accordion({ heightStyle: "content",collapsible: true,active: false });
           // This is a sub-accordion inside of the Availability and Submission Panel
@@ -92,27 +105,27 @@
               ashidden: { iso8601: 'feedbackDateISO8601' }
           });
           localDatePicker({
-              input: '#assessmentSettingsAction\\:extendedTimeTable\\:newEntry-start_date',
+              input: '#assessmentSettingsAction\\:newEntry-start_date',
               useTime: 1,
               parseFormat: 'YYYY-MM-DD HH:mm:ss',
               allowEmptyDate: true,
-              val: '',
+              val: '<h:outputText value="#{assessmentSettings.extendedTimeStartString}"/>',
               ashidden: { iso8601: 'newEntry-start_date-iso8601' }
           });
           localDatePicker({
-              input: '#assessmentSettingsAction\\:extendedTimeTable\\:newEntry-due_date',
+              input: '#assessmentSettingsAction\\:newEntry-due_date',
               useTime: 1,
               parseFormat: 'YYYY-MM-DD HH:mm:ss',
               allowEmptyDate: true,
-              val: '',
+              val: '<h:outputText value="#{assessmentSettings.extendedTimeDueString}"/>',
               ashidden: { iso8601: 'newEntry-due_date-iso8601' }
           });
           localDatePicker({
-              input: '#assessmentSettingsAction\\:extendedTimeTable\\:newEntry-retract_date',
+              input: '#assessmentSettingsAction\\:newEntry-retract_date',
               useTime: 1,
               parseFormat: 'YYYY-MM-DD HH:mm:ss',
               allowEmptyDate: true,
-              val: '',
+              val: '<h:outputText value="#{assessmentSettings.extendedTimeRetractString}"/>',
               ashidden: { iso8601: 'newEntry-retract_date-iso8601' }
           });
 
@@ -383,9 +396,6 @@
     </div>
   </h:panelGroup>
 
-  <!-- Extended Time -->
-  <%@ include file="inc/extendedTime.jspf"%>
-
   <!-- AUTOMATIC SUBMISSION -->
   <h:panelGroup styleClass="form-group row" layout="block" rendered="#{assessmentSettings.valueMap.automaticSubmission_isInstructorEditable==true}">
     <h:outputLabel styleClass="col-md-2" value="#{assessmentSettingsMessages.auto_submit}" />
@@ -495,6 +505,11 @@
 
 </samigo:hideDivision><!-- END the Availabity and Submissions category -->
 
+<samigo:hideDivision title="#{assessmentSettingsMessages.heading_extended_time}" >
+  <!-- Extended Time -->
+  <%@ include file="inc/extendedTime.jspf"%>
+</samigo:hideDivision>
+
 <samigo:hideDivision title="#{assessmentSettingsMessages.heading_grading_feedback}" >
 
   <!-- *** GRADING *** -->
diff --git a/samigo/samigo-app/src/webapp/jsf/author/inc/extendedTime.jspf b/samigo/samigo-app/src/webapp/jsf/author/inc/extendedTime.jspf
index e06e808a273c..e2cb7d7518c6 100644
--- a/samigo/samigo-app/src/webapp/jsf/author/inc/extendedTime.jspf
+++ b/samigo/samigo-app/src/webapp/jsf/author/inc/extendedTime.jspf
@@ -1,12 +1,71 @@
 <!-- Extended Time -->
-<h:panelGroup styleClass="form-group row" layout="block">
-    <h:outputLabel styleClass="col-md-2" value="#{assessmentSettingsMessages.extendedTimeHeading}"/>
-    <div class="col-md-11 col-md-offset-1">
-        <t:dataTable cellpadding="0" cellspacing="0"
+<h:panelGroup styleClass="row" layout="block">
+    <h:outputLabel styleClass="col-md-2" value="#{assessmentSettingsMessages.extendedTimeNew}" />
+    <h:panelGroup styleClass="col-md-10" layout="block">
+        <h:panelGroup styleClass="form-group row" layout="block">
+                <h:outputLabel styleClass="col-md-2" for="newEntry-user" value="#{assessmentSettingsMessages.extendedTimeUser}"/>
+                <h:panelGroup styleClass="col-md-4" layout="block">
+                    <h:selectOneMenu id="newEntry-user" value="#{assessmentSettings.extendedTime.user}">
+                        <f:selectItems value="#{assessmentSettings.usersInSite}" />
+                    </h:selectOneMenu>
+                </h:panelGroup>
+        </h:panelGroup>
+        <h:panelGroup styleClass="form-group row" layout="block">
+                <h:outputLabel styleClass="col-md-2" for="newEntry-group" value="#{assessmentSettingsMessages.extendedTimeGroup}"/>
+                <h:panelGroup styleClass="col-md-4" layout="block">
+                    <h:selectOneMenu id="newEntry-group" value="#{assessmentSettings.extendedTime.group}">
+                        <f:selectItems value="#{assessmentSettings.groupsForSiteWithNoGroup}" />
+                    </h:selectOneMenu>
+                </h:panelGroup>
+        </h:panelGroup>
+        <h:panelGroup styleClass="form-group row" layout="block">
+                <h:outputLabel styleClass="col-md-2" for="newEntry-due_date" value="#{assessmentSettingsMessages.assessment_available}"/>
+                <h:panelGroup styleClass="col-md-3" layout="block">
+                    <h:inputText id="newEntry-start_date" size="25" value="#{assessmentSettings.extendedTimeStartString}"/>
+                </h:panelGroup>
+        </h:panelGroup>
+        <h:panelGroup styleClass="form-group row" layout="block">
+                <h:outputLabel styleClass="col-md-2" for="newEntry-due_date" value="#{assessmentSettingsMessages.assessment_due}"/>
+                <h:panelGroup styleClass="col-md-3" layout="block">
+                 <h:inputText id="newEntry-due_date" size="25" value="#{assessmentSettings.extendedTimeDueString}"/>
+                </h:panelGroup>
+                <h:panelGroup styleClass="col-md-6" layout="block">
+        <h:outputText value="#{assessmentSettingsMessages.has_time_limit} " />
+                    <h:selectOneMenu id="newEntry-hours" value="#{assessmentSettings.extendedTime.timeHours}" >
+                        <f:selectItems value="#{assessmentSettings.hours}" />
+                    </h:selectOneMenu>
+                    <h:selectOneMenu id="newEntry-mins" value="#{assessmentSettings.extendedTime.timeMinutes}" >
+                        <f:selectItems value="#{assessmentSettings.mins}" />
+                    </h:selectOneMenu>
+                </h:panelGroup>
+        </h:panelGroup>
+        <h:panelGroup styleClass="form-group row" layout="block" rendered="#{assessmentSettings.valueMap.lateHandling_isInstructorEditable==true}">
+                <h:outputLabel styleClass="col-md-2" for="newEntry-retract_date" value="#{assessmentSettingsMessages.late_accept_until}"/>
+                <h:panelGroup styleClass="col-md-3" layout="block">
+                    <h:inputText id="newEntry-retract_date" size="25" value="#{assessmentSettings.extendedTimeRetractString}"/>
+                </h:panelGroup>
+        </h:panelGroup>
+        <h:panelGroup styleClass="form-group row" layout="block">
+                <h:panelGroup rendered="#{not assessmentSettings.editingExtendedTime}">
+                    <h:commandButton value="#{assessmentSettingsMessages.extendedTimeAdd}" id="extendedTimeAdd" action="#{assessmentSettings.addExtendedTime}" />
+                    <h:outputLabel styleClass="help-block info-text small" for="extendedTimeAdd" value="#{assessmentSettingsMessages.extendedTimeInstruction}" />
+                </h:panelGroup>
+                <h:panelGroup rendered="#{assessmentSettings.editingExtendedTime}">
+                    <h:commandButton value="#{assessmentSettingsMessages.extendedTimeEdit}" action="#{assessmentSettings.saveEditedExtendedTime}" />
+                    <h:commandButton value="#{assessmentSettingsMessages.extendedTimeCancel}" action="#{assessmentSettings.cancelEdit}" />
+                </h:panelGroup>
+        </h:panelGroup>
+    </h:panelGroup>
+</h:panelGroup>
+
+<h:panelGroup styleClass="row" layout="block" rendered="#{not empty assessmentSettings.extendedTimes}">
+    <h:outputLabel styleClass="col-md-2" value="#{assessmentSettingsMessages.extendedTimeExisting}" />
+    <h:panelGroup styleClass="col-md-10 table-responsive" layout="block">
+        <t:dataTable
                      id="extendedTimeTable"
                      value="#{assessmentSettings.extendedTimes}"
                      var="entry"
-                     styleClass="extendedTimeDataTable"
+                     styleClass="table table-condensed table-borderless extendedTimeDataTable"
                      columnClasses="extendedTime-user, extendedTime-group, extendedTime-start, extendedTime-due,
                      extendedTime-retract, extendedTime-hours, extendedTime-mins, extendedTime-edit, extendedTime-delete"
                      title="#{assessmentSettingsMessages.extendedTime_data_table_title}">
@@ -17,11 +76,6 @@
                 <h:selectOneMenu id="extendedTimeUser" value="#{entry.user}" disabled="true">
                     <f:selectItems value="#{assessmentSettings.usersInSite}" />
                 </h:selectOneMenu>
-                <f:facet name="footer">
-                    <h:selectOneMenu id="newEntry-user" value="#{assessmentSettings.extendedTime.user}">
-                        <f:selectItems value="#{assessmentSettings.usersInSite}" />
-                    </h:selectOneMenu>
-                </f:facet>
             </h:column>
             <h:column headerClass="extendedTime-group">
                 <f:facet name="header">
@@ -30,66 +84,42 @@
                 <h:selectOneMenu id="extendedTimeGroup" value="#{entry.group}" disabled="true">
                     <f:selectItems value="#{assessmentSettings.groupsForSiteWithNoGroup}" />
                 </h:selectOneMenu>
-                <f:facet name="footer">
-                    <h:selectOneMenu id="newEntry-group" value="#{assessmentSettings.extendedTime.group}">
-                        <f:selectItems value="#{assessmentSettings.groupsForSiteWithNoGroup}" />
-                    </h:selectOneMenu>
-                </f:facet>
             </h:column>
             <h:column headerClass="extendedTime-start">
                 <f:facet name="header">
                     <h:outputText value="#{assessmentSettingsMessages.header_extendedTime_start_date}" />
                 </f:facet>
                 <h:outputText id="extendedTimeStartDate" value="#{entry.startDate}">
-                    <f:convertDateTime pattern="yyyy-MM-dd HH:mm:ss"/>
+                    <f:convertDateTime pattern="#{generalMessages.output_date_no_sec}"/>
                 </h:outputText>
-                <f:facet name="footer">
-                    <h:inputText id="newEntry-start_date" size="25" value="#{assessmentSettings.extendedTimeStartString}"/>
-                </f:facet>
             </h:column>
             <h:column headerClass="extendedTime-due">
                 <f:facet name="header">
                     <h:outputText value="#{assessmentSettingsMessages.header_extendedTime_due_date}" />
                 </f:facet>
                 <h:outputText id="extendedTimeEndDate" value="#{entry.dueDate}">
-                    <f:convertDateTime pattern="yyyy-MM-dd HH:mm:ss"/>
+                    <f:convertDateTime pattern="#{generalMessages.output_date_no_sec}"/>
                 </h:outputText>
-                <f:facet name="footer">
-                    <h:inputText id="newEntry-due_date" size="25" value="#{assessmentSettings.extendedTimeDueString}"/>
-                </f:facet>
             </h:column>
             <h:column headerClass="extendedTime-retract">
                 <f:facet name="header">
                     <h:outputText value="#{assessmentSettingsMessages.header_extendedTime_retract_date}" />
                 </f:facet>
                 <h:outputText id="extendedTimeRetractDate" value="#{entry.retractDate}">
-                    <f:convertDateTime pattern="yyyy-MM-dd HH:mm:ss"/>
+                    <f:convertDateTime pattern="#{generalMessages.output_date_no_sec}"/>
                 </h:outputText>
-                <f:facet name="footer">
-                    <h:inputText id="newEntry-retract_date" size="25" value="#{assessmentSettings.extendedTimeRetractString}"/>
-                </f:facet>
             </h:column>
             <h:column headerClass="extendedTime-hours">
                 <f:facet name="header">
                     <h:outputText value="#{assessmentSettingsMessages.header_extendedTime_hours}" />
                 </f:facet>
                 <h:outputText id="extendedTimeHours" value="#{entry.timeHours}" />
-                <f:facet name="footer">
-                    <h:selectOneMenu id="newEntry-hours" value="#{assessmentSettings.extendedTime.timeHours}" >
-                        <f:selectItems value="#{assessmentSettings.hours}" />
-                    </h:selectOneMenu>
-                </f:facet>
             </h:column>
             <h:column headerClass="extendedTime-mins">
                 <f:facet name="header">
                     <h:outputText value="#{assessmentSettingsMessages.header_extendedTime_minutes}" />
                 </f:facet>
                 <h:outputText id="extendedTimeMinutes" value="#{entry.timeMinutes}" />
-                <f:facet name="footer">
-                    <h:selectOneMenu id="newEntry-mins" value="#{assessmentSettings.extendedTime.timeMinutes}" >
-                        <f:selectItems value="#{assessmentSettings.mins}" />
-                    </h:selectOneMenu>
-                </f:facet>
             </h:column>
             <h:column headerClass="extendedTime-edit" rendered="#{assessmentSettings.extendedTimesSize > 0}">
                 <f:facet name="header">
@@ -108,8 +138,5 @@
                 </h:commandButton>
             </h:column>
         </t:dataTable>
-        <h:commandButton value="#{assessmentSettingsMessages.extendedTimeAdd}" action="#{assessmentSettings.addExtendedTime}" rendered="#{not assessmentSettings.editingExtendedTime}"/>
-        <h:commandButton value="#{assessmentSettingsMessages.extendedTimeEdit}" action="#{assessmentSettings.saveEditedExtendedTime}" rendered="#{assessmentSettings.editingExtendedTime}"/>
-        <h:commandButton value="#{assessmentSettingsMessages.extendedTimeCancel}" action="#{assessmentSettings.cancelEdit}" rendered="#{assessmentSettings.editingExtendedTime}"/>
-    </div>
+    </h:panelGroup>
 </h:panelGroup>
diff --git a/samigo/samigo-app/src/webapp/jsf/author/inc/publishedExtendedTime.jspf b/samigo/samigo-app/src/webapp/jsf/author/inc/publishedExtendedTime.jspf
index 1f72a42acb2d..eba7bf6503b4 100644
--- a/samigo/samigo-app/src/webapp/jsf/author/inc/publishedExtendedTime.jspf
+++ b/samigo/samigo-app/src/webapp/jsf/author/inc/publishedExtendedTime.jspf
@@ -1,115 +1,142 @@
 <!-- Extended Time -->
-<h:panelGroup>
-	<h:outputLabel value="<h4 class=\"samigo-category-subhead\"> #{assessmentSettingsMessages.extendedTimeHeading} </h4>" escape="false"/>
-	<div class="col-md-11 col-md-offset-1">
-		<t:dataTable cellpadding="0" cellspacing="0"
-					 id="extendedTimeTable"
-					 value="#{publishedSettings.extendedTimes}"
-					 var="entry"
-					 styleClass="extendedTimeDataTable"
-					 columnClasses="extendedTime-user, extendedTime-group, extendedTime-start, extendedTime-due,
-					 extendedTime-retract, extendedTime-hours, extendedTime-mins, extendedTime-edit, extendedTime-delete"
-					 title="#{assessmentSettingsMessages.extendedTime_data_table_title}">
-			<h:column headerClass="extendedTime-user">
-				<f:facet name="header">
-					<h:outputText value="#{assessmentSettingsMessages.header_extendedTime_user}" />
-				</f:facet>
-				<h:selectOneMenu id="extendedTimeUser" value="#{entry.user}" disabled="true">
-					<f:selectItems value="#{publishedSettings.usersInSite}" />
-				</h:selectOneMenu>
-				<f:facet name="footer">
-					<h:selectOneMenu id="newEntry-user" value="#{publishedSettings.extendedTime.user}">
-						<f:selectItems value="#{publishedSettings.usersInSite}" />
-					</h:selectOneMenu>
-				</f:facet>
-			</h:column>
-			<h:column headerClass="extendedTime-group">
-				<f:facet name="header">
-					<h:outputText value="#{assessmentSettingsMessages.header_extendedTime_group}" />
-				</f:facet>
-				<h:selectOneMenu id="extendedTimeGroup" value="#{entry.group}" disabled="true">
-					<f:selectItems value="#{publishedSettings.groupsForSiteWithNoGroup}" />
-				</h:selectOneMenu>
-				<f:facet name="footer">
-					<h:selectOneMenu id="newEntry-group" value="#{publishedSettings.extendedTime.group}">
-						<f:selectItems value="#{publishedSettings.groupsForSiteWithNoGroup}" />
-					</h:selectOneMenu>
-				</f:facet>
-			</h:column>
-			<h:column headerClass="extendedTime-start">
-				<f:facet name="header">
-					<h:outputText value="#{assessmentSettingsMessages.header_extendedTime_start_date}" />
-				</f:facet>
-				<h:outputText id="extendedTimeStartDate" value="#{entry.startDate}">
-					<f:convertDateTime pattern="yyyy-MM-dd HH:mm:ss"/>
-				</h:outputText>
-				<f:facet name="footer">
-					<h:inputText id="newEntry-start_date" size="25" value="#{publishedSettings.extendedTimeStartString}"/>
-				</f:facet>
-			</h:column>
-			<h:column headerClass="extendedTime-due">
-				<f:facet name="header">
-					<h:outputText value="#{assessmentSettingsMessages.header_extendedTime_due_date}" />
-				</f:facet>
-				<h:outputText id="extendedTimeEndDate" value="#{entry.dueDate}">
-					<f:convertDateTime pattern="yyyy-MM-dd HH:mm:ss"/>
-				</h:outputText>
-				<f:facet name="footer">
-					<h:inputText id="newEntry-due_date" size="25" value="#{publishedSettings.extendedTimeDueString}"/>
-				</f:facet>
-			</h:column>
-			<h:column headerClass="extendedTime-retract">
-				<f:facet name="header">
-					<h:outputText value="#{assessmentSettingsMessages.header_extendedTime_retract_date}" />
-				</f:facet>
-				<h:outputText id="extendedTimeRetractDate" value="#{entry.retractDate}">
-					<f:convertDateTime pattern="yyyy-MM-dd HH:mm:ss"/>
-				</h:outputText>
-				<f:facet name="footer">
-					<h:inputText id="newEntry-retract_date" size="25" value="#{publishedSettings.extendedTimeRetractString}"/>
-				</f:facet>
-			</h:column>
-			<h:column headerClass="extendedTime-hours">
-				<f:facet name="header">
-					<h:outputText value="#{assessmentSettingsMessages.header_extendedTime_hours}" />
-				</f:facet>
-				<h:outputText id="extendedTimeHours" value="#{entry.timeHours}" />
-				<f:facet name="footer">
-					<h:selectOneMenu id="newEntry-hours" value="#{publishedSettings.extendedTime.timeHours}" >
-						<f:selectItems value="#{publishedSettings.hours}" />
-					</h:selectOneMenu>
-				</f:facet>
-			</h:column>
-			<h:column headerClass="extendedTime-mins">
-				<f:facet name="header">
-					<h:outputText value="#{assessmentSettingsMessages.header_extendedTime_minutes}" />
-				</f:facet>
-				<h:outputText id="extendedTimeMinutes" value="#{entry.timeMinutes}" />
-				<f:facet name="footer">
-					<h:selectOneMenu id="newEntry-mins" value="#{publishedSettings.extendedTime.timeMinutes}" >
-						<f:selectItems value="#{publishedSettings.mins}" />
-					</h:selectOneMenu>
-				</f:facet>
-			</h:column>
-			<h:column headerClass="extendedTime-edit" rendered="#{publishedSettings.extendedTimesSize > 0}">
-				<f:facet name="header">
-					<h:outputText value="#{assessmentSettingsMessages.header_extendedTime_edit}" />
-				</f:facet>
-				<h:commandButton value="#{assessmentSettingsMessages.header_extendedTime_edit}" action="#{publishedSettings.editExtendedTime}">
-					<f:setPropertyActionListener target="#{publishedSettings.transitoryExtendedTime}" value="#{entry}" />
-				</h:commandButton>
-			</h:column>
-			<h:column headerClass="extendedTime-delete" rendered="#{publishedSettings.extendedTimesSize > 0}">
-				<f:facet name="header">
-					<h:outputText value="#{assessmentSettingsMessages.header_extendedTime_delete}" />
-				</f:facet>
-				<h:commandButton value="#{assessmentSettingsMessages.header_extendedTime_delete}" action="#{publishedSettings.deleteExtendedTime}"  >
-					<f:setPropertyActionListener target="#{publishedSettings.transitoryExtendedTime}" value="#{entry}" />
-				</h:commandButton>
-			</h:column>
-		</t:dataTable>
-		<h:commandButton value="#{assessmentSettingsMessages.extendedTimeAdd}" action="#{publishedSettings.addExtendedTime}" rendered="#{not publishedSettings.editingExtendedTime}"/>
-		<h:commandButton value="#{assessmentSettingsMessages.extendedTimeEdit}" action="#{publishedSettings.saveEditedExtendedTime}" rendered="#{publishedSettings.editingExtendedTime}"/>
-		<h:commandButton value="#{assessmentSettingsMessages.extendedTimeCancel}" action="#{publishedSettings.cancelEdit}" rendered="#{publishedSettings.editingExtendedTime}"/>
-	</div>
+<h:panelGroup styleClass="row" layout="block">
+    <h:outputLabel styleClass="col-md-2" value="#{assessmentSettingsMessages.extendedTimeNew}" />
+    <h:panelGroup styleClass="col-md-10" layout="block">
+        <h:panelGroup styleClass="form-group row" layout="block">
+                <h:outputLabel styleClass="col-md-2" for="newEntry-user" value="#{assessmentSettingsMessages.extendedTimeUser}"/>
+                <h:panelGroup styleClass="col-md-4" layout="block">
+                    <h:selectOneMenu id="newEntry-user" value="#{publishedSettings.extendedTime.user}">
+                        <f:selectItems value="#{publishedSettings.usersInSite}" />
+                    </h:selectOneMenu>
+                </h:panelGroup>
+        </h:panelGroup>
+        <h:panelGroup styleClass="form-group row" layout="block">
+                <h:outputLabel styleClass="col-md-2" for="newEntry-group" value="#{assessmentSettingsMessages.extendedTimeGroup}"/>
+                <h:panelGroup styleClass="col-md-4" layout="block">
+                    <h:selectOneMenu id="newEntry-group" value="#{publishedSettings.extendedTime.group}">
+                        <f:selectItems value="#{publishedSettings.groupsForSiteWithNoGroup}" />
+                    </h:selectOneMenu>
+                </h:panelGroup>
+        </h:panelGroup>
+        <h:panelGroup styleClass="form-group row" layout="block">
+                <h:outputLabel styleClass="col-md-2" for="newEntry-due_date" value="#{assessmentSettingsMessages.assessment_available}"/>
+                <h:panelGroup styleClass="col-md-3" layout="block">
+                    <h:inputText id="newEntry-start_date" size="25" value="#{publishedSettings.extendedTimeStartString}"/>
+                </h:panelGroup>
+        </h:panelGroup>
+        <h:panelGroup styleClass="form-group row" layout="block">
+                <h:outputLabel styleClass="col-md-2" for="newEntry-due_date" value="#{assessmentSettingsMessages.assessment_due}"/>
+                <h:panelGroup styleClass="col-md-3" layout="block">
+                 <h:inputText id="newEntry-due_date" size="25" value="#{publishedSettings.extendedTimeDueString}"/>
+                </h:panelGroup>
+                <h:panelGroup styleClass="col-md-6" layout="block">
+        <h:outputText value="#{assessmentSettingsMessages.has_time_limit} " />
+                    <h:selectOneMenu id="newEntry-hours" value="#{publishedSettings.extendedTime.timeHours}" >
+                        <f:selectItems value="#{publishedSettings.hours}" />
+                    </h:selectOneMenu>
+                    <h:selectOneMenu id="newEntry-mins" value="#{publishedSettings.extendedTime.timeMinutes}" >
+                        <f:selectItems value="#{publishedSettings.mins}" />
+                    </h:selectOneMenu>
+                </h:panelGroup>
+        </h:panelGroup>
+        <h:panelGroup styleClass="form-group row" layout="block" rendered="#{publishedSettings.valueMap.lateHandling_isInstructorEditable==true}">
+                <h:outputLabel styleClass="col-md-2" for="newEntry-retract_date" value="#{assessmentSettingsMessages.late_accept_until}"/>
+                <h:panelGroup styleClass="col-md-3" layout="block">
+                    <h:inputText id="newEntry-retract_date" size="25" value="#{publishedSettings.extendedTimeRetractString}"/>
+                </h:panelGroup>
+        </h:panelGroup>
+        <h:panelGroup styleClass="form-group row" layout="block">
+                <h:panelGroup rendered="#{not publishedSettings.editingExtendedTime}">
+                    <h:commandButton value="#{assessmentSettingsMessages.extendedTimeAdd}" id="extendedTimeAdd" action="#{publishedSettings.addExtendedTime}" />
+                    <h:outputLabel styleClass="help-block info-text small" for="extendedTimeAdd" value="#{assessmentSettingsMessages.extendedTimeInstruction}" />
+                </h:panelGroup>
+                <h:panelGroup rendered="#{publishedSettings.editingExtendedTime}">
+                    <h:commandButton value="#{assessmentSettingsMessages.extendedTimeEdit}" action="#{publishedSettings.saveEditedExtendedTime}" />
+                    <h:commandButton value="#{assessmentSettingsMessages.extendedTimeCancel}" action="#{publishedSettings.cancelEdit}" />
+                </h:panelGroup>
+        </h:panelGroup>
+    </h:panelGroup>
+</h:panelGroup>
+
+<h:panelGroup styleClass="row" layout="block" rendered="#{not empty publishedSettings.extendedTimes}">
+    <h:outputLabel styleClass="col-md-2" value="#{assessmentSettingsMessages.extendedTimeExisting}" />
+    <h:panelGroup styleClass="col-md-10 table-responsive" layout="block">
+        <t:dataTable
+                     id="extendedTimeTable"
+                     value="#{publishedSettings.extendedTimes}"
+                     var="entry"
+                     styleClass="table table-condensed table-borderless extendedTimeDataTable"
+                     columnClasses="extendedTime-user, extendedTime-group, extendedTime-start, extendedTime-due,
+                     extendedTime-retract, extendedTime-hours, extendedTime-mins, extendedTime-edit, extendedTime-delete"
+                     title="#{assessmentSettingsMessages.extendedTime_data_table_title}">
+            <h:column headerClass="extendedTime-user">
+                <f:facet name="header">
+                    <h:outputText value="#{assessmentSettingsMessages.header_extendedTime_user}" />
+                </f:facet>
+                <h:selectOneMenu id="extendedTimeUser" value="#{entry.user}" disabled="true">
+                    <f:selectItems value="#{publishedSettings.usersInSite}" />
+                </h:selectOneMenu>
+            </h:column>
+            <h:column headerClass="extendedTime-group">
+                <f:facet name="header">
+                    <h:outputText value="#{assessmentSettingsMessages.header_extendedTime_group}" />
+                </f:facet>
+                <h:selectOneMenu id="extendedTimeGroup" value="#{entry.group}" disabled="true">
+                    <f:selectItems value="#{publishedSettings.groupsForSiteWithNoGroup}" />
+                </h:selectOneMenu>
+            </h:column>
+            <h:column headerClass="extendedTime-start">
+                <f:facet name="header">
+                    <h:outputText value="#{assessmentSettingsMessages.header_extendedTime_start_date}" />
+                </f:facet>
+                <h:outputText id="extendedTimeStartDate" value="#{entry.startDate}">
+                    <f:convertDateTime pattern="#{generalMessages.output_date_no_sec}"/>
+                </h:outputText>
+            </h:column>
+            <h:column headerClass="extendedTime-due">
+                <f:facet name="header">
+                    <h:outputText value="#{assessmentSettingsMessages.header_extendedTime_due_date}" />
+                </f:facet>
+                <h:outputText id="extendedTimeEndDate" value="#{entry.dueDate}">
+                    <f:convertDateTime pattern="#{generalMessages.output_date_no_sec}"/>
+                </h:outputText>
+            </h:column>
+            <h:column headerClass="extendedTime-retract">
+                <f:facet name="header">
+                    <h:outputText value="#{assessmentSettingsMessages.header_extendedTime_retract_date}" />
+                </f:facet>
+                <h:outputText id="extendedTimeRetractDate" value="#{entry.retractDate}">
+                    <f:convertDateTime pattern="#{generalMessages.output_date_no_sec}"/>
+                </h:outputText>
+            </h:column>
+            <h:column headerClass="extendedTime-hours">
+                <f:facet name="header">
+                    <h:outputText value="#{assessmentSettingsMessages.header_extendedTime_hours}" />
+                </f:facet>
+                <h:outputText id="extendedTimeHours" value="#{entry.timeHours}" />
+            </h:column>
+            <h:column headerClass="extendedTime-mins">
+                <f:facet name="header">
+                    <h:outputText value="#{assessmentSettingsMessages.header_extendedTime_minutes}" />
+                </f:facet>
+                <h:outputText id="extendedTimeMinutes" value="#{entry.timeMinutes}" />
+            </h:column>
+            <h:column headerClass="extendedTime-edit" rendered="#{publishedSettings.extendedTimesSize > 0}">
+                <f:facet name="header">
+                    <h:outputText value="#{assessmentSettingsMessages.header_extendedTime_edit}" />
+                </f:facet>
+                <h:commandButton value="#{assessmentSettingsMessages.header_extendedTime_edit}" action="#{publishedSettings.editExtendedTime}">
+                    <f:setPropertyActionListener target="#{publishedSettings.transitoryExtendedTime}" value="#{entry}" />
+                </h:commandButton>
+            </h:column>
+            <h:column headerClass="extendedTime-delete" rendered="#{publishedSettings.extendedTimesSize > 0}">
+                <f:facet name="header">
+                    <h:outputText value="#{assessmentSettingsMessages.header_extendedTime_delete}" />
+                </f:facet>
+                <h:commandButton value="#{assessmentSettingsMessages.header_extendedTime_delete}" action="#{publishedSettings.deleteExtendedTime}"  >
+                    <f:setPropertyActionListener target="#{publishedSettings.transitoryExtendedTime}" value="#{entry}" />
+                </h:commandButton>
+            </h:column>
+        </t:dataTable>
+    </h:panelGroup>
 </h:panelGroup>
diff --git a/samigo/samigo-app/src/webapp/jsf/author/publishedSettings.jsp b/samigo/samigo-app/src/webapp/jsf/author/publishedSettings.jsp
index 4647b3775d2a..819f18e9548e 100644
--- a/samigo/samigo-app/src/webapp/jsf/author/publishedSettings.jsp
+++ b/samigo/samigo-app/src/webapp/jsf/author/publishedSettings.jsp
@@ -57,7 +57,20 @@
       <script type="text/javascript">
         $(document).ready(function() {
           // set up the accordion for settings
-          $("#jqueryui-accordion").accordion({ heightStyle: "content", collapsible: true, active: 1 });
+          var accordionPanel = 1;
+          if (window.sessionStorage && window.sessionStorage.getItem('samigo_publishedsettings')) {
+              accordionPanel = parseInt(window.sessionStorage.getItem('samigo_publishedsettings'));
+          }
+          $("#jqueryui-accordion").accordion({
+              heightStyle: "content",
+              activate: function(event, ui) {
+                  if (window.sessionStorage) {
+                      window.sessionStorage.setItem('samigo_publishedsettings', $("#jqueryui-accordion").accordion("option", "active"));
+                  }
+              },
+              active: accordionPanel,
+              collapsible: true
+          });
           // This is a sub-accordion inside of the About the Assessment Panel
           $("#jqueryui-accordion-metadata").accordion({ heightStyle: "content",collapsible: true,active: false });
           // This is a sub-accordion inside of the Availability and Submission Panel
@@ -99,27 +112,27 @@
               ashidden: { iso8601: 'feedbackDateISO8601' }
           });
           localDatePicker({
-              input: '#assessmentSettingsAction\\:extendedTimeTable\\:newEntry-start_date',
+              input: '#assessmentSettingsAction\\:newEntry-start_date',
               useTime: 1,
               parseFormat: 'YYYY-MM-DD HH:mm:ss',
               allowEmptyDate: true,
-              val: '',
+              val: '<h:outputText value="#{publishedSettings.extendedTimeStartString}"/>',
               ashidden: { iso8601: 'newEntry-start_date-iso8601' }
           });
           localDatePicker({
-              input: '#assessmentSettingsAction\\:extendedTimeTable\\:newEntry-due_date',
+              input: '#assessmentSettingsAction\\:newEntry-due_date',
               useTime: 1,
               parseFormat: 'YYYY-MM-DD HH:mm:ss',
               allowEmptyDate: true,
-              val: '',
+              val: '<h:outputText value="#{publishedSettings.extendedTimeDueString}"/>',
               ashidden: { iso8601: 'newEntry-due_date-iso8601' }
           });
           localDatePicker({
-              input: '#assessmentSettingsAction\\:extendedTimeTable\\:newEntry-retract_date',
+              input: '#assessmentSettingsAction\\:newEntry-retract_date',
               useTime: 1,
               parseFormat: 'YYYY-MM-DD HH:mm:ss',
               allowEmptyDate: true,
-              val: '',
+              val: '<h:outputText value="#{publishedSettings.extendedTimeRetractString}"/>',
               ashidden: { iso8601: 'newEntry-retract_date-iso8601' }
           });
 
@@ -383,10 +396,6 @@
     </div>
   </h:panelGroup>
 
-  <!-- Extended Time -->
-  <%@ include file="inc/publishedExtendedTime.jspf"%>
-
-  
   <!-- AUTOMATIC SUBMISSION -->
   <h:panelGroup styleClass="form-group row" layout="block" rendered="#{publishedSettings.valueMap.automaticSubmission_isInstructorEditable==true}">
     <h:outputLabel styleClass="col-md-2" value="#{assessmentSettingsMessages.auto_submit}" />
@@ -493,6 +502,11 @@
 
 </samigo:hideDivision><!-- END the Availabity and Submissions category -->
 
+<samigo:hideDivision title="#{assessmentSettingsMessages.heading_extended_time}" >
+  <!-- Extended Time -->
+  <%@ include file="inc/publishedExtendedTime.jspf"%>
+</samigo:hideDivision>
+
 <samigo:hideDivision title="#{assessmentSettingsMessages.heading_grading_feedback}" >
 
   <!-- *** GRADING *** -->