Index: lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -red5aa531a1b645392cb8fcb2fad507065ddb0227
--- lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision ed5aa531a1b645392cb8fcb2fad507065ddb0227)
@@ -149,5 +149,7 @@
 button.submit  =Finish
 label.monitoring.file.delete  =Delete
 label.search  =Search...
-
+label.file.options=File Options
+label.activity.completion=End of Activity
+label.notifications=Notifications
 #======= End labels: Exported 142 labels for en AU =====
Index: lams_tool_sbmt/web/WEB-INF/tags/Arrow.tag
===================================================================
diff -u -r6bed0e62245e6c9ce454d4bc54920a0b41dac9bc -red5aa531a1b645392cb8fcb2fad507065ddb0227
--- lams_tool_sbmt/web/WEB-INF/tags/Arrow.tag	(.../Arrow.tag)	(revision 6bed0e62245e6c9ce454d4bc54920a0b41dac9bc)
+++ lams_tool_sbmt/web/WEB-INF/tags/Arrow.tag	(.../Arrow.tag)	(revision ed5aa531a1b645392cb8fcb2fad507065ddb0227)
@@ -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_sbmt/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r6bed0e62245e6c9ce454d4bc54920a0b41dac9bc -red5aa531a1b645392cb8fcb2fad507065ddb0227
--- lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 6bed0e62245e6c9ce454d4bc54920a0b41dac9bc)
+++ lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision ed5aa531a1b645392cb8fcb2fad507065ddb0227)
@@ -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_sbmt/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u
--- lams_tool_sbmt/web/WEB-INF/tags/SimplePanel.tag	(revision 0)
+++ lams_tool_sbmt/web/WEB-INF/tags/SimplePanel.tag	(revision ed5aa531a1b645392cb8fcb2fad507065ddb0227)
@@ -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_sbmt/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rd41150b5c329af3aa1823fdcc9cc89b0c9a54416 -red5aa531a1b645392cb8fcb2fad507065ddb0227
--- lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision d41150b5c329af3aa1823fdcc9cc89b0c9a54416)
+++ lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision ed5aa531a1b645392cb8fcb2fad507065ddb0227)
@@ -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_sbmt/web/authoring/advance.jsp
===================================================================
diff -u -r6bed0e62245e6c9ce454d4bc54920a0b41dac9bc -red5aa531a1b645392cb8fcb2fad507065ddb0227
--- lams_tool_sbmt/web/authoring/advance.jsp	(.../advance.jsp)	(revision 6bed0e62245e6c9ce454d4bc54920a0b41dac9bc)
+++ lams_tool_sbmt/web/authoring/advance.jsp	(.../advance.jsp)	(revision ed5aa531a1b645392cb8fcb2fad507065ddb0227)
@@ -17,28 +17,24 @@
 	});
 </script>
 
+<lams:SimplePanel titleKey="label.file.options">
 <div class="checkbox">
-	<label for="lockOnFinished">
-		<html:checkbox property="lockOnFinished" styleId="lockOnFinished" />
-		<fmt:message key="label.authoring.advance.lock.on.finished" />
-	</label>
-</div>
-
-<div class="checkbox">
 	<label for="limitUpload">
 		<html:checkbox property="limitUpload" styleId="limitUpload" />
 		<fmt:message key="label.limit.number.upload" />
 	</label>
+
+	<html:select property="limitUploadNumber" styleId="limitUploadNumber" styleClass="loffset5 form-control form-control-inline">
+		<html:option value="1">1</html:option>
+		<html:option value="2">2</html:option>
+		<html:option value="3">3</html:option>
+		<html:option value="4">4</html:option>
+		<html:option value="5">5</html:option>
+	</html:select>
 </div>
+</lams:SimplePanel>
 
-<html:select property="limitUploadNumber" styleId="limitUploadNumber" styleClass="roffset5 form-control">
-	<html:option value="1">1</html:option>
-	<html:option value="2">2</html:option>
-	<html:option value="3">3</html:option>
-	<html:option value="4">4</html:option>
-	<html:option value="5">5</html:option>
-</html:select>
-
+<lams:SimplePanel titleKey="label.notifications">
 <div class="checkbox">
 	<label for="notifyLearnersOnMarkRelease">
 		<html:checkbox property="notifyLearnersOnMarkRelease" styleId="notifyLearnersOnMarkRelease" />
@@ -60,7 +56,17 @@
 	</label>
 </div>
 
+</lams:SimplePanel>
+
+<lams:SimplePanel titleKey="label.activity.completion">
 <div class="checkbox">
+	<label for="lockOnFinished">
+		<html:checkbox property="lockOnFinished" styleId="lockOnFinished" />
+		<fmt:message key="label.authoring.advance.lock.on.finished" />
+	</label>
+</div>
+
+<div class="checkbox">
 	<label for="reflectOnActivity">
 		<html:checkbox property="reflectOnActivity" styleId="reflectOnActivity" />
 		<fmt:message key="label.authoring.advanced.reflectOnActivity" />
@@ -69,4 +75,6 @@
 
 <div class="form-group">
 	<html:textarea property="reflectInstructions" styleId="reflectInstructions" styleClass="form-control" cols="50" rows="4" />
-</div>
\ No newline at end of file
+</div>
+</lams:SimplePanel>
+