Index: lams_tool_notebook/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.29.2.7 -r1.29.2.8
--- lams_tool_notebook/conf/language/lams/ApplicationResources.properties	18 May 2016 10:29:30 -0000	1.29.2.7
+++ lams_tool_notebook/conf/language/lams/ApplicationResources.properties	1 Jul 2016 00:58:09 -0000	1.29.2.8
@@ -118,6 +118,7 @@
 label.yes=Yes
 label.no=No
 label.reply.comment  =Instructor's comment
+label.editing.options=Editing Options
+label.activity.completion=End of Activity
 
-
 #======= End labels: Exported 112 labels for en AU =====
Index: lams_tool_notebook/web/WEB-INF/tags/Arrow.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/Attic/Arrow.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_notebook/web/WEB-INF/tags/Arrow.tag	17 May 2016 10:20:12 -0000	1.1.2.1
+++ lams_tool_notebook/web/WEB-INF/tags/Arrow.tag	1 Jul 2016 00:58:09 -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>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_notebook/web/WEB-INF/tags/AuthoringRatingCriteria.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_notebook/web/WEB-INF/tags/Date.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/Date.tag,v
diff -u -r1.4 -r1.4.2.1
--- lams_tool_notebook/web/WEB-INF/tags/Date.tag	6 May 2014 20:00:55 -0000	1.4
+++ lams_tool_notebook/web/WEB-INF/tags/Date.tag	1 Jul 2016 00:58:09 -0000	1.4.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_notebook/web/WEB-INF/tags/Page.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.3 -r1.1.2.4
--- lams_tool_notebook/web/WEB-INF/tags/Page.tag	17 May 2016 10:20:12 -0000	1.1.2.3
+++ lams_tool_notebook/web/WEB-INF/tags/Page.tag	1 Jul 2016 00:58:09 -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_notebook/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_notebook/web/WEB-INF/tags/SimplePanel.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.3.2.4 -r1.3.2.5
--- lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	17 May 2016 10:20:13 -0000	1.3.2.4
+++ lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	1 Jul 2016 00:58:09 -0000	1.3.2.5
@@ -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>
@@ -463,6 +471,10 @@
    		<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>
Index: lams_tool_notebook/web/pages/authoring/advanced.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/authoring/advanced.jsp,v
diff -u -r1.5.14.2 -r1.5.14.3
--- lams_tool_notebook/web/pages/authoring/advanced.jsp	25 May 2016 16:24:23 -0000	1.5.14.2
+++ lams_tool_notebook/web/pages/authoring/advanced.jsp	1 Jul 2016 00:58:09 -0000	1.5.14.3
@@ -2,16 +2,21 @@
 
 <!-- ========== Advanced Tab ========== -->
 
-<div class="checkbox">
-	<label for="lockOnFinished">
-		<html:checkbox property="lockOnFinished" styleId="lockOnFinished" value="1" />
-		<fmt:message key="advanced.lockOnFinished" />
-	</label>
-</div>
 
+<lams:SimplePanel titleKey="label.editing.options">
 <div class="checkbox">
 	<label for="allowRichEditor">
 		<html:checkbox property="allowRichEditor" styleId="allowRichEditor" value="1" />
 		<fmt:message key="advanced.allowRichEditor" />
 	</label>
 </div>
+</lams:SimplePanel>
+
+<lams:SimplePanel titleKey="label.activity.completion">
+<div class="checkbox">
+	<label for="lockOnFinished">
+		<html:checkbox property="lockOnFinished" styleId="lockOnFinished" value="1" />
+		<fmt:message key="advanced.lockOnFinished" />
+	</label>
+</div>
+</lams:SimplePanel>