Index: lams_tool_lamc/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r9c21ce6391eb60f464a106f582c8935103ab61b0
--- lams_tool_lamc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_lamc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 9c21ce6391eb60f464a106f582c8935103ab61b0)
@@ -283,6 +283,7 @@
 label.info.use.select.leader.outputs  =Group leader's option is enabled
 label.monitoring.group.leader  =Group leader
 label.authoring.export.qti  =Export IMS QTI
-
-
+label.select.leader=Select Leader
+label.question.options=Question Options
+label.activity.completion=End of Activity
 #======= End labels: Exported 281 labels for en AU =====
Index: lams_tool_lamc/web/WEB-INF/tags/Arrow.tag
===================================================================
diff -u -r00937d78dacc0993260d5ed7b39e4376e432cf45 -r9c21ce6391eb60f464a106f582c8935103ab61b0
--- lams_tool_lamc/web/WEB-INF/tags/Arrow.tag	(.../Arrow.tag)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
+++ lams_tool_lamc/web/WEB-INF/tags/Arrow.tag	(.../Arrow.tag)	(revision 9c21ce6391eb60f464a106f582c8935103ab61b0)
@@ -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_lamc/web/WEB-INF/tags/Date.tag
===================================================================
diff -u -rb6718851271ad991d43a5a3158f8e10c9ccceaaa -r9c21ce6391eb60f464a106f582c8935103ab61b0
--- lams_tool_lamc/web/WEB-INF/tags/Date.tag	(.../Date.tag)	(revision b6718851271ad991d43a5a3158f8e10c9ccceaaa)
+++ lams_tool_lamc/web/WEB-INF/tags/Date.tag	(.../Date.tag)	(revision 9c21ce6391eb60f464a106f582c8935103ab61b0)
@@ -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_lamc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r00937d78dacc0993260d5ed7b39e4376e432cf45 -r9c21ce6391eb60f464a106f582c8935103ab61b0
--- lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
+++ lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9c21ce6391eb60f464a106f582c8935103ab61b0)
@@ -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_lamc/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/SimplePanel.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/SimplePanel.tag	(revision 9c21ce6391eb60f464a106f582c8935103ab61b0)
@@ -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_lamc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r00937d78dacc0993260d5ed7b39e4376e432cf45 -r9c21ce6391eb60f464a106f582c8935103ab61b0
--- lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
+++ lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 9c21ce6391eb60f464a106f582c8935103ab61b0)
@@ -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_lamc/web/authoring/AdvancedContent.jsp
===================================================================
diff -u -r00937d78dacc0993260d5ed7b39e4376e432cf45 -r9c21ce6391eb60f464a106f582c8935103ab61b0
--- lams_tool_lamc/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
+++ lams_tool_lamc/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 9c21ce6391eb60f464a106f582c8935103ab61b0)
@@ -1,91 +1,96 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<div class="checkbox">
-	<label for="useSelectLeaderToolOuput">
-	<html:checkbox property="useSelectLeaderToolOuput" value="1" styleId="useSelectLeaderToolOuput" onclick="clickSelectLeaderToolOuputHandler();"/>
-	<fmt:message key="label.use.select.leader.tool.output" />
-	</label>
-</div>
+<lams:SimplePanel titleKey="label.select.leader">
+	<div class="checkbox">
+		<label for="useSelectLeaderToolOuput">
+		<html:checkbox property="useSelectLeaderToolOuput" value="1" styleId="useSelectLeaderToolOuput" onclick="clickSelectLeaderToolOuputHandler();"/>
+		<fmt:message key="label.use.select.leader.tool.output" />
+		</label>
+	</div>
+</lams:SimplePanel>
 
+<lams:SimplePanel titleKey="label.question.options">
+	<div class="checkbox">
+		<label for="prefixAnswersWithLetters">
+		<html:checkbox property="prefixAnswersWithLetters" value="1" styleId="prefixAnswersWithLetters"/>
+		<fmt:message key="label.prefix.sequential.letters.for.each.answer" />
+		</label>
+	</div>
+	
+	
+	<div class="checkbox">
+		<label for="questionsSequenced">
+		<html:checkbox property="questionsSequenced" value="1" styleId="questionsSequenced"/>
+		<fmt:message key="radiobox.onepq" />
+		</label>
+	</div>
+	
+	
+	<div class="checkbox">
+		<label for="showMarks">
+		<html:checkbox property="showMarks" value="1" styleId="showMarks"/>
+		<fmt:message key="label.showMarks" />
+		</label>
+	</div>
+	
+	
+	<div class="checkbox">
+		<label for="randomize">
+		<html:checkbox property="randomize" value="1" styleId="randomize"/>
+		<fmt:message key="label.randomize" />
+		</label>
+	</div>
+	
+	<div class="checkbox">
+		<label for="displayAnswers">
+		<html:checkbox property="displayAnswers" value="1" styleId="displayAnswers"/>
+		<fmt:message key="label.displayAnswers" />
+		</label>
+	</div>
+	
+	
+	<div class="checkbox">
+		<label for="retries">
+		<html:checkbox property="retries" value="1" styleId="retries"
+			onclick="javascript:updatePass(this); submitMethod('updateMarksList');"/>
+		<fmt:message key="radiobox.retries" />		
+		</label>
+	</div>
+	
+	<div class="form-inline loffset20">
+		<div class="form-group">
+		<select name="passmark"  class="form-control input-sm">
+			<c:forEach var="passmarkEntry"
+				items="${mcGeneralAuthoringDTO.passMarksMap}">
+				<c:set var="SELECTED_PASS" scope="request" value="" />
+				<c:if
+					test="${passmarkEntry.value == mcGeneralAuthoringDTO.passMarkValue}">
+					<c:set var="SELECTED_PASS" scope="request" value="SELECTED" />
+				</c:if>
+		
+				<option value="<c:out value="${passmarkEntry.value}"/>"
+					<c:out value="${SELECTED_PASS}"/>>
+					<c:out value="${passmarkEntry.value}" />
+				</option>
+			</c:forEach>
+		</select>
+		<fmt:message key="radiobox.passmark" />
+		</div>
+	</div>
+</lams:SimplePanel>
 
-<div class="checkbox">
-	<label for="prefixAnswersWithLetters">
-	<html:checkbox property="prefixAnswersWithLetters" value="1" styleId="prefixAnswersWithLetters"/>
-	<fmt:message key="label.prefix.sequential.letters.for.each.answer" />
-	</label>
-</div>
-
-
-<div class="checkbox">
-	<label for="questionsSequenced">
-	<html:checkbox property="questionsSequenced" value="1" styleId="questionsSequenced"/>
-	<fmt:message key="radiobox.onepq" />
-	</label>
-</div>
-
-
-<div class="checkbox">
-	<label for="showMarks">
-	<html:checkbox property="showMarks" value="1" styleId="showMarks"/>
-	<fmt:message key="label.showMarks" />
-	</label>
-</div>
-
-
-<div class="checkbox">
-	<label for="randomize">
-	<html:checkbox property="randomize" value="1" styleId="randomize"/>
-	<fmt:message key="label.randomize" />
-	</label>
-</div>
-
-<div class="checkbox">
-	<label for="displayAnswers">
-	<html:checkbox property="displayAnswers" value="1" styleId="displayAnswers"/>
-	<fmt:message key="label.displayAnswers" />
-	</label>
-</div>
-
-
-<div class="checkbox">
-	<label for="retries">
-	<html:checkbox property="retries" value="1" styleId="retries"
-		onclick="javascript:updatePass(this); submitMethod('updateMarksList');"/>
-	<fmt:message key="radiobox.retries" />		
-	</label>
-</div>
-
-<div class="form-inline loffset20">
+<lams:SimplePanel titleKey="label.activity.completion">
+	<div class="checkbox">
+		<label for="reflect">
+		<html:checkbox property="reflect" value="1" styleClass="noBorder" styleId="reflect"/>
+		<fmt:message key="label.reflect" />
+		</label>
+	</div>
 	<div class="form-group">
-	<select name="passmark"  class="form-control input-sm">
-		<c:forEach var="passmarkEntry"
-			items="${mcGeneralAuthoringDTO.passMarksMap}">
-			<c:set var="SELECTED_PASS" scope="request" value="" />
-			<c:if
-				test="${passmarkEntry.value == mcGeneralAuthoringDTO.passMarkValue}">
-				<c:set var="SELECTED_PASS" scope="request" value="SELECTED" />
-			</c:if>
-	
-			<option value="<c:out value="${passmarkEntry.value}"/>"
-				<c:out value="${SELECTED_PASS}"/>>
-				<c:out value="${passmarkEntry.value}" />
-			</option>
-		</c:forEach>
-	</select>
-	<fmt:message key="radiobox.passmark" />
+	<html:textarea property="reflectionSubject" styleId="reflectInstructions"  styleClass="form-control" rows="3"/>
 	</div>
-</div>
+</lams:SimplePanel>
 
-<div class="checkbox">
-	<label for="reflect">
-	<html:checkbox property="reflect" value="1" styleClass="noBorder" styleId="reflect"/>
-	<fmt:message key="label.reflect" />
-	</label>
-</div>
-<div class="form-group">
-<html:textarea property="reflectionSubject" styleId="reflectInstructions"  styleClass="form-control" rows="3"/>
-</div>
-
 <script type="text/javascript">
 <!--
 //automatically turn on refect option if there are text input in refect instruction area