Index: lams_tool_daco/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.24.2.4 -r1.24.2.5
--- lams_tool_daco/conf/language/lams/ApplicationResources.properties	11 May 2016 07:14:28 -0000	1.24.2.4
+++ lams_tool_daco/conf/language/lams/ApplicationResources.properties	29 Jun 2016 05:53:08 -0000	1.24.2.5
@@ -254,5 +254,7 @@
 label.search=Search... 
 label.monitoring.average.number.records.heading=Average Number of Records
 label.scroll.hint=(Scroll the columns to see more records.)
+label.activity.completion=End of Activity
+label.notifications=Notifications
 
 #======= End labels: Exported 246 labels for en AU =====
Index: lams_tool_daco/web/WEB-INF/tags/Arrow.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/tags/Attic/Arrow.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_daco/web/WEB-INF/tags/Arrow.tag	18 Mar 2016 09:01:53 -0000	1.1.2.1
+++ lams_tool_daco/web/WEB-INF/tags/Arrow.tag	29 Jun 2016 05:54:07 -0000	1.1.2.2
@@ -6,6 +6,8 @@
 <%@ attribute name="state" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="onclick" required="false" rtexprvalue="true"%>
+<%@ attribute name="id" required="false" rtexprvalue="true"%>
+<%@ attribute name="display" required="false"  rtexprvalue="true"%>
 
 <c:choose>
 	<c:when test="${not empty title}">
@@ -26,10 +28,28 @@
 </c:choose>
 
 <c:choose>
+	<c:when test="${not empty id}">
+		<c:set var="fullId">id="${id}"</c:set>
+	</c:when>
+	<c:otherwise>
+		<c:set var="fullId" value=""/>
+	</c:otherwise>
+</c:choose>
+
+<c:choose>
+	<c:when test="${not empty display}">
+	<c:set var="fullDisplay">style='display:${display}'</c:set>
+	</c:when>
+	<c:otherwise>
+		<c:set var="fullDisplay" value=""/>
+	</c:otherwise>
+</c:choose>
+
+<c:choose>
 	<c:when test="${fn:containsIgnoreCase(state, 'up')}">
-		<i class="fa fa-long-arrow-up fa-pull-left" ${fullTitle} ${fullOnclick}></i>
+		<i class="fa fa-long-arrow-up fa-pull-left" ${fullId} ${fullTitle} ${fullOnclick} ${fullDisplay}></i>
 	</c:when>
 	<c:otherwise>
-		<i class="fa fa-long-arrow-down fa-pull-right"  ${fullTitle} ${fullOnclick}></i>
+		<i class="fa fa-long-arrow-down fa-pull-right"  ${fullId} ${fullTitle} ${fullOnclick} ${fullDisplay}></i>
 	</c:otherwise>
 </c:choose>
Index: lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.12.2.1 -r1.12.2.2
--- lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag	15 Apr 2016 11:47:34 -0000	1.12.2.1
+++ lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag	29 Jun 2016 05:54:07 -0000	1.12.2.2
@@ -122,7 +122,7 @@
     	window.close();
     }  				
 </script>	
-<div id="saveCancelButtons voffset5" >
+<div id="saveCancelButtons" >
 		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="btn btn-primary pull-right">
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
 		</html:link>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_daco/web/WEB-INF/tags/AuthoringRatingCriteria.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_daco/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/tags/Attic/CommentsAuthor.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_daco/web/WEB-INF/tags/CommentsAuthor.tag	20 Apr 2016 00:33:36 -0000	1.1.2.1
+++ lams_tool_daco/web/WEB-INF/tags/CommentsAuthor.tag	29 Jun 2016 05:54:07 -0000	1.1.2.2
@@ -24,18 +24,18 @@
 	<c:set var="likeDislikeLabelKey" value="advanced.comments.like.and.dislike" />
 </c:if>
 
-<p class="voffset5">
+<div class="checkbox">
+	<label>
 	<html:checkbox property="${allowCommentsVariableName}" value="1"
-		styleClass="noBorder" styleId="${allowCommentsVariableName}">
-		&nbsp;<fmt:message key="${allowCommentLabelKey}" />
+		styleId="${allowCommentsVariableName}">
 	</html:checkbox>
-</p>
-	<div style="padding-left: 20px" id="likedislike">
-	<p>
+	<fmt:message key="${allowCommentLabelKey}"/>
+	</label>
+</div>
+<div class="loffset20" id="likedislike">
 		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
 		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
-	</p>
-	</div>
+</div>
 
 <script>
 jQuery( document ).ready(function( $ ) {
Index: lams_tool_daco/web/WEB-INF/tags/Date.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/tags/Date.tag,v
diff -u -r1.2 -r1.2.2.1
--- lams_tool_daco/web/WEB-INF/tags/Date.tag	6 May 2014 20:01:04 -0000	1.2
+++ lams_tool_daco/web/WEB-INF/tags/Date.tag	29 Jun 2016 05:54:07 -0000	1.2.2.1
@@ -34,6 +34,7 @@
 <%@ attribute name="value" required="true" rtexprvalue="true" type="java.util.Date" %>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="timeago" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-core" prefix="c" %>
@@ -42,6 +43,10 @@
 	<c:set var="type" value="both" scope="request"/>
 </c:if>
 
+<c:if test="${not empty timeago}">
+	<time class="timeago" datetime="<fmt:formatDate value='${value}' timeZone="GMT" pattern="yyyy-MM-dd'T'HH:mm:ss.S'Z'"/>">
+</c:if>
+	
 <c:choose>
 	<c:when test="${style=='short'}">
 		<fmt:formatDate value="${value}" type="${type}" dateStyle="short" timeStyle="short" />
@@ -53,3 +58,7 @@
 		<fmt:formatDate value="${value}" type="${type}" dateStyle="long" timeStyle="medium" />
 	</c:otherwise>
 </c:choose>
+
+<c:if test="${not empty timeago}">
+	</time>
+</c:if>
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/tags/Page.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_tool_daco/web/WEB-INF/tags/Page.tag	14 Apr 2016 13:25:48 -0000	1.1.2.2
+++ lams_tool_daco/web/WEB-INF/tags/Page.tag	29 Jun 2016 05:54:07 -0000	1.1.2.3
@@ -24,7 +24,7 @@
 						<div class="panel-title panel-${type}-title">
 							<c:out value="${title}" escapeXml="true" />
 							<c:if test="${not empty titleHelpURL}">
-								<a style="float: right" href="${titleHelpURL}" target="_new"><span class="help" style="margin: 0px"></span></a>
+								<span class="pull-right">${titleHelpURL}</span>
 							</c:if>
 						</div>
 						<c:if test="${not empty headingContent}">
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_daco/web/WEB-INF/tags/Rating.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_daco/web/WEB-INF/tags/RestrictedUsageAccordian.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_daco/web/WEB-INF/tags/SimplePanel.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.6.2.7 -r1.6.2.8
--- lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	26 Apr 2016 12:03:13 -0000	1.6.2.7
+++ lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	29 Jun 2016 05:54:07 -0000	1.6.2.8
@@ -178,7 +178,7 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+      
       <attribute>
          <description>Output stylesheet based on the user preferences.</description>
          <name>style</name>
@@ -426,8 +426,16 @@
    	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
-   	</tag-file>   	
+   	</tag-file>   
    	<tag-file>
+       <name>AuthoringRatingCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file>    		
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
@@ -460,6 +468,14 @@
        <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
    	</tag-file>  
    	<tag-file>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+   	</tag-file>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
Index: lams_tool_daco/web/pages/authoring/advanced.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/authoring/advanced.jsp,v
diff -u -r1.6.12.4 -r1.6.12.5
--- lams_tool_daco/web/pages/authoring/advanced.jsp	9 May 2016 12:13:55 -0000	1.6.12.4
+++ lams_tool_daco/web/pages/authoring/advanced.jsp	29 Jun 2016 05:53:08 -0000	1.6.12.5
@@ -8,8 +8,9 @@
 </script>
 
 <!-- Advance Tab Content -->
-<div class="form-group form-inline voffset10">
-<label><strong><fmt:message key="label.authoring.advanced.record" /></strong></label><BR/>
+
+<lams:SimplePanel titleKey="label.authoring.advanced.record">
+<div class="form-group form-inline">
 <!-- Minimum number of records learner must provide -->
 <label for="daco.minRecords"><fmt:message key="label.common.min" /></label> 
 <html:select property="daco.minRecords" styleClass="roffset5 form-control">
@@ -20,7 +21,7 @@
 		<html:option value="${index}">${index}</html:option>
 	</c:forEach>
 </html:select>
-<label for="maxRecords" style="space-left"> <fmt:message key="label.common.max" /> </label> 
+<label for="maxRecords" class="loffset10"> <fmt:message key="label.common.max" /> </label> 
 <!-- Maximum number of records learner must provide -->
 <html:select
 	property="daco.maxRecords" styleClass="form-control">
@@ -32,8 +33,9 @@
 	</c:forEach>
 </html:select>
 </div>
+</lams:SimplePanel>
 
-<div class="form-horizontal">
+<lams:SimplePanel titleKey="label.notifications">
 <div class="checkbox">
 <label for="notifyTeachersOnLearnerEntry"><html:checkbox property="daco.notifyTeachersOnLearnerEntry" styleId="notifyTeachersOnLearnerEntry" />
 <fmt:message key="label.authoring.advanced.notify.onlearnerentry" /></label>
@@ -43,12 +45,13 @@
 <label for="notifyTeachersOnRecordSubmit"><html:checkbox property="daco.notifyTeachersOnRecordSumbit" styleId="notifyTeachersOnRecordSubmit"/> 
 <fmt:message key="label.authoring.advanced.notify.onrecordsubmit" /> </label>
 </div>
+</lams:SimplePanel>
 
+<lams:SimplePanel titleKey="label.activity.completion">
 <div class="checkbox">
 <label for="lockOnFinished"><html:checkbox property="daco.lockOnFinished" styleId="lockOnFinished" />
 <fmt:message key="label.authoring.advanced.lock.on.finished" /></label>
 </div>
-</div>
 
 <div class="checkbox">
 <label for="reflectOn"><html:checkbox property="daco.reflectOnActivity" styleId="reflectOn"/>
@@ -57,5 +60,6 @@
 <html:textarea property="daco.reflectInstructions" styleId="reflectInstructions"  styleClass="form-control" cols="50" rows="3"
 	onkeyup="javascript:turnOnReflect()"/>
 </div>
+</lams:SimplePanel>