Index: lams_tool_larsrc/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r17b8d4d2fa5dffd734e4a62d06cb92dfdc6ca9bf
--- lams_tool_larsrc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_larsrc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 17b8d4d2fa5dffd734e4a62d06cb92dfdc6ca9bf)
@@ -172,6 +172,8 @@
 monitoring.label.actions  =Actions
 monitoring.label.views  =Views
 label.monitoring.heading  =Share Resources Monitoring
+label.resource.options=Resource Options
+label.activity.completion=End of Activity
+label.notifications=Notifications
 
-
 #======= End labels: Exported 167 labels for en AU =====
Index: lams_tool_larsrc/web/WEB-INF/tags/Arrow.tag
===================================================================
diff -u -rce92f0b193ab5e4ce9a9c161e515cdca982b7ffd -r17b8d4d2fa5dffd734e4a62d06cb92dfdc6ca9bf
--- lams_tool_larsrc/web/WEB-INF/tags/Arrow.tag	(.../Arrow.tag)	(revision ce92f0b193ab5e4ce9a9c161e515cdca982b7ffd)
+++ lams_tool_larsrc/web/WEB-INF/tags/Arrow.tag	(.../Arrow.tag)	(revision 17b8d4d2fa5dffd734e4a62d06cb92dfdc6ca9bf)
@@ -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_larsrc/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -rce92f0b193ab5e4ce9a9c161e515cdca982b7ffd -r17b8d4d2fa5dffd734e4a62d06cb92dfdc6ca9bf
--- lams_tool_larsrc/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision ce92f0b193ab5e4ce9a9c161e515cdca982b7ffd)
+++ lams_tool_larsrc/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 17b8d4d2fa5dffd734e4a62d06cb92dfdc6ca9bf)
@@ -1,13 +1,16 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeOnlyCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="commentPanelHeaderKey" required="false" rtexprvalue="true"%>
 
+
 <c:if test="${empty allowCommentsVariableName}">
 	<c:set var="allowCommentsVariableName" value="allowComments" />
 </c:if>
@@ -23,7 +26,11 @@
 <c:if test="${empty likeDislikeLabelKey}">
 	<c:set var="likeDislikeLabelKey" value="advanced.comments.like.and.dislike" />
 </c:if>
+<c:if test="${empty commentPanelHeaderKey}">
+	<c:set var="commentPanelHeaderKey" value="advanced.comment.header" />
+</c:if>
 
+<lams:SimplePanel titleKey="advanced.comment.header">
 <div class="checkbox">
 	<label>
 	<html:checkbox property="${allowCommentsVariableName}" value="1"
@@ -36,6 +43,7 @@
 		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
 		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
+</lams:SimplePanel>
 
 <script>
 jQuery( document ).ready(function( $ ) {
Index: lams_tool_larsrc/web/WEB-INF/tags/Date.tag
===================================================================
diff -u -rb6718851271ad991d43a5a3158f8e10c9ccceaaa -r17b8d4d2fa5dffd734e4a62d06cb92dfdc6ca9bf
--- lams_tool_larsrc/web/WEB-INF/tags/Date.tag	(.../Date.tag)	(revision b6718851271ad991d43a5a3158f8e10c9ccceaaa)
+++ lams_tool_larsrc/web/WEB-INF/tags/Date.tag	(.../Date.tag)	(revision 17b8d4d2fa5dffd734e4a62d06cb92dfdc6ca9bf)
@@ -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_larsrc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rb3fe40cd67fc779a6eee8320fadc3a489565a557 -r17b8d4d2fa5dffd734e4a62d06cb92dfdc6ca9bf
--- lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision b3fe40cd67fc779a6eee8320fadc3a489565a557)
+++ lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 17b8d4d2fa5dffd734e4a62d06cb92dfdc6ca9bf)
@@ -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}">
Index: lams_tool_larsrc/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u
--- lams_tool_larsrc/web/WEB-INF/tags/SimplePanel.tag	(revision 0)
+++ lams_tool_larsrc/web/WEB-INF/tags/SimplePanel.tag	(revision 17b8d4d2fa5dffd734e4a62d06cb92dfdc6ca9bf)
@@ -0,0 +1,32 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+
+<c:if test="${not empty titleKey}">
+	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
+</c:if>
+
+<div class="panel panel-default">
+	<c:if test="${not empty title or not empty titleHelpURL}">
+	<div class="panel-heading">
+		<div class="panel-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>
+		</c:if>
+		</div>
+	</div>
+	</c:if>
+	<div class="panel-body ${panelBodyClass}">
+		<jsp:doBody />
+	</div>
+</div>
+
+
+		
+			
Index: lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r890b918004fdab510b8bd9bdf810c37326c447f4 -r17b8d4d2fa5dffd734e4a62d06cb92dfdc6ca9bf
--- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 890b918004fdab510b8bd9bdf810c37326c447f4)
+++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 17b8d4d2fa5dffd734e4a62d06cb92dfdc6ca9bf)
@@ -471,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_larsrc/web/pages/authoring/advance.jsp
===================================================================
diff -u -rb3fe40cd67fc779a6eee8320fadc3a489565a557 -r17b8d4d2fa5dffd734e4a62d06cb92dfdc6ca9bf
--- lams_tool_larsrc/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision b3fe40cd67fc779a6eee8320fadc3a489565a557)
+++ lams_tool_larsrc/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 17b8d4d2fa5dffd734e4a62d06cb92dfdc6ca9bf)
@@ -3,74 +3,87 @@
 
 <!-- Advance Tab Content -->
 
-<div class="checkbox">
-<label for="lockWhenFinished"><html:checkbox property="resource.lockWhenFinished" styleId="lockWhenFinished" />
-<fmt:message key="label.authoring.advance.lock.on.finished" /></label>
-</div>
+<lams:SimplePanel titleKey="label.resource.options">
 
-<div class="checkbox">
-<label for="runAuto"><html:checkbox property="resource.runAuto" styleId="runAuto" />
-<fmt:message key="label.authoring.advance.run.content.auto" /></label>
-</div>
+	<div class="checkbox">
+	<label for="runAuto"><html:checkbox property="resource.runAuto" styleId="runAuto" />
+	<fmt:message key="label.authoring.advance.run.content.auto" /></label>
+	</div>
+	
+	<div class="form-group">
+	<html:select property="resource.miniViewResourceNumber" styleClass="form-control form-control-inline input-sm"
+		styleId="viewNumList" style="width:100px">
+		<c:forEach begin="1" end="${fn:length(resourceList)}"
+			varStatus="status">
+			<c:choose>
+				<c:when
+					test="${formBean.resource.miniViewResourceNumber == status.index}">
+					<option value="${status.index}" selected="true">
+						${status.index}
+					</option>
+				</c:when>
+				<c:otherwise>
+					<option value="${status.index}">
+						${status.index}
+					</option>
+				</c:otherwise>
+			</c:choose>
+		</c:forEach>
+	</html:select>
+	<label for="miniViewResourceNumber">&nbsp;<fmt:message key="label.authoring.advance.mini.number.resources.view" /></label>
+	</div>
+	
+	<div class="checkbox">
+	<label for="allowAddUrls"><html:checkbox property="resource.allowAddUrls" styleId="allowAddUrls"/>
+	<fmt:message key="label.authoring.advance.allow.learner.add.urls" />
+	</label>
+	</div>
+	
+	<div class="checkbox">
+	<label for="allowAddFiles"><html:checkbox property="resource.allowAddFiles" styleId="allowAddFiles"/>
+	<fmt:message key="label.authoring.advance.allow.learner.add.files" />
+	</label>
+	</div>
 
-<div class="form-group">
-<html:select property="resource.miniViewResourceNumber" styleClass="form-control form-control-inline input-sm"
-	styleId="viewNumList" style="width:100px">
-	<c:forEach begin="1" end="${fn:length(resourceList)}"
-		varStatus="status">
-		<c:choose>
-			<c:when
-				test="${formBean.resource.miniViewResourceNumber == status.index}">
-				<option value="${status.index}" selected="true">
-					${status.index}
-				</option>
-			</c:when>
-			<c:otherwise>
-				<option value="${status.index}">
-					${status.index}
-				</option>
-			</c:otherwise>
-		</c:choose>
-	</c:forEach>
-</html:select>
-<label for="miniViewResourceNumber">&nbsp;<fmt:message key="label.authoring.advance.mini.number.resources.view" /></label>
-</div>
+</lams:SimplePanel>
 
-<div class="checkbox">
-<label for="allowAddUrls"><html:checkbox property="resource.allowAddUrls" styleId="allowAddUrls"/>
-<fmt:message key="label.authoring.advance.allow.learner.add.urls" />
-</label>
-</div>
+<lams:SimplePanel titleKey="label.notifications">
 
-<div class="checkbox">
-<label for="allowAddFiles"><html:checkbox property="resource.allowAddFiles" styleId="allowAddFiles"/>
-<fmt:message key="label.authoring.advance.allow.learner.add.files" />
-</label>
-</div>
+	<div class="checkbox">
+	<label for="notifyTeachersOnAssigmentSumbit">
+	<html:checkbox property="resource.notifyTeachersOnAssigmentSumbit" styleId="notifyTeachersOnAssigmentSumbit"/>
+	<fmt:message key="label.authoring.advanced.notify.onassigmentsubmit" />
+	</label>
+	</div>
+	
+	<div class="checkbox">
+	<label for="notifyTeachersOnFileUpload">
+	<html:checkbox property="resource.notifyTeachersOnFileUpload" styleId="notifyTeachersOnFileUpload"/>
+	<fmt:message key="label.authoring.advanced.notify.onfileupload" />
+	</label>
+	</div>
+	
+</lams:SimplePanel>
 
-<div class="checkbox">
-<label for="notifyTeachersOnAssigmentSumbit">
-<html:checkbox property="resource.notifyTeachersOnAssigmentSumbit" styleId="notifyTeachersOnAssigmentSumbit"/>
-<fmt:message key="label.authoring.advanced.notify.onassigmentsubmit" />
-</label>
-</div>
+<lams:SimplePanel titleKey="label.activity.completion">
 
-<div class="checkbox">
-<label for="notifyTeachersOnFileUpload">
-<html:checkbox property="resource.notifyTeachersOnFileUpload" styleId="notifyTeachersOnFileUpload"/>
-<fmt:message key="label.authoring.advanced.notify.onfileupload" />
-</label>
-</div>
+	<div class="checkbox">
+	<label for="lockWhenFinished"><html:checkbox property="resource.lockWhenFinished" styleId="lockWhenFinished" />
+	<fmt:message key="label.authoring.advance.lock.on.finished" /></label>
+	</div>
+	
+	<div class="checkbox">
+	<label for="reflectOn"><html:checkbox property="resource.reflectOnActivity" styleId="reflectOn"/>
+	<fmt:message key="label.authoring.advanced.reflectOnActivity" />
+	</label>
+	</div>
+	
+	<div class="form-group">
+	<html:textarea property="resource.reflectInstructions" styleClass="form-control" styleId="reflectInstructions" rows="3" />
+	</div>
+	
+</lams:SimplePanel>
 
-<div class="checkbox">
-<label for="reflectOn"><html:checkbox property="resource.reflectOnActivity" styleId="reflectOn"/>
-<fmt:message key="label.authoring.advanced.reflectOnActivity" />
-</label>
-</div>
-
-<div class="form-group">
-<html:textarea property="resource.reflectInstructions" styleClass="form-control" styleId="reflectInstructions" rows="3" />
-</div>
 <script type="text/javascript">
 <!--
 //automatically turn on refect option if there are text input in refect instruction area