Index: lams_tool_bbb/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.8.2.3 -r1.8.2.4
--- lams_tool_bbb/conf/language/lams/ApplicationResources.properties	4 Jun 2016 11:56:03 -0000	1.8.2.3
+++ lams_tool_bbb/conf/language/lams/ApplicationResources.properties	1 Jul 2016 06:47:00 -0000	1.8.2.4
@@ -69,5 +69,5 @@
 message.unableToStartLesson  =Unable to join meeting.  Please see your instructor.
 button.submit  =Finish
 message.monitoring.summary.no.session  =No Session Available
-
+label.activity.completion=End of Activity
 #======= End labels: Exported 63 labels for en AU =====
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/Arrow.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/AuthoringRatingCriteria.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/Comments.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/CommentsAuthor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_bbb/web/WEB-INF/tags/Date.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/WEB-INF/tags/Date.tag,v
diff -u -r1.2 -r1.2.2.1
--- lams_tool_bbb/web/WEB-INF/tags/Date.tag	6 May 2014 20:01:42 -0000	1.2
+++ lams_tool_bbb/web/WEB-INF/tags/Date.tag	1 Jul 2016 06:47:00 -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_bbb/web/WEB-INF/tags/Page.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.3 -r1.1.2.4
--- lams_tool_bbb/web/WEB-INF/tags/Page.tag	19 May 2016 07:00:22 -0000	1.1.2.3
+++ lams_tool_bbb/web/WEB-INF/tags/Page.tag	1 Jul 2016 06:47:00 -0000	1.1.2.4
@@ -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_bbb/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_bbb/web/WEB-INF/tags/SimplePanel.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_bbb/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.3.2.4 -r1.3.2.5
--- lams_tool_bbb/web/WEB-INF/tlds/lams/lams.tld	19 May 2016 07:00:23 -0000	1.3.2.4
+++ lams_tool_bbb/web/WEB-INF/tlds/lams/lams.tld	1 Jul 2016 06:47:00 -0000	1.3.2.5
@@ -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>
@@ -446,16 +454,28 @@
    	<tag-file>
 	    <name>Page</name>
 		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>  
+   	</tag-file>
    	<tag-file>
 	    <name>TSTable</name>
 		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>  
+   	</tag-file>    
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
+   	</tag-file>
    	<tag-file>
-	    <name>AdvancedAccordian</name>
-		<path>/WEB-INF/tags/AdvancedAccordian.tag</path>
+       <name>AdvancedAccordian</name>
+       <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>
@@ -497,5 +517,13 @@
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
 	</tag-file>
+   	<tag-file>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+   	</tag-file>
 
 </taglib>
Index: lams_tool_bbb/web/pages/authoring/advanced.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/pages/authoring/advanced.jsp,v
diff -u -r1.1.4.1 -r1.1.4.2
--- lams_tool_bbb/web/pages/authoring/advanced.jsp	19 May 2016 03:36:58 -0000	1.1.4.1
+++ lams_tool_bbb/web/pages/authoring/advanced.jsp	1 Jul 2016 06:47:00 -0000	1.1.4.2
@@ -2,20 +2,24 @@
 
 <!-- ========== Advanced Tab ========== -->
 
-<div class="checkbox">
-	<label for="lockOnFinished"><html:checkbox property="lockOnFinished" value="1" styleClass="noBorder"
-			styleId="lockOnFinished"></html:checkbox> <fmt:message key="advanced.lockOnFinished" /> </label>
-</div>
+<lams:SimplePanel titleKey="label.activity.completion">
 
-<div class="checkbox voffset10">
-	<label for="reflectOnActivity"> <html:checkbox property="reflectOnActivity" value="1" styleClass="noBorder"
-			styleId="reflectOnActivity"></html:checkbox> <fmt:message key="advanced.reflectOnActivity" />
-	</label>
-</div>
+	<div class="checkbox">
+		<label for="lockOnFinished"><html:checkbox property="lockOnFinished" value="1" styleClass="noBorder"
+				styleId="lockOnFinished"></html:checkbox> <fmt:message key="advanced.lockOnFinished" /> </label>
+	</div>
+	
+	<div class="checkbox voffset10">
+		<label for="reflectOnActivity"> <html:checkbox property="reflectOnActivity" value="1" styleClass="noBorder"
+				styleId="reflectOnActivity"></html:checkbox> <fmt:message key="advanced.reflectOnActivity" />
+		</label>
+	</div>
+	
+	<div class="form-group">
+		<html:textarea property="reflectInstructions" styleId="reflectInstructions" styleClass="form-control" rows="3"/>
+	</div>
 
-<div class="form-group">
-	<html:textarea property="reflectInstructions" styleId="reflectInstructions" styleClass="form-control" rows="3"/>
-</div>
+</lams:SimplePanel>
 
 <script type="text/javascript">
 <!--