Index: lams_tool_laqa/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r84f6a2003265dbadd4de5a08ebf0e158af1e331f -r097e25c6195a1a5f58821003b0fa332844dc6305
--- lams_tool_laqa/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 84f6a2003265dbadd4de5a08ebf0e158af1e331f)
+++ lams_tool_laqa/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 097e25c6195a1a5f58821003b0fa332844dc6305)
@@ -282,5 +282,8 @@
 label.posted.by  ={0} on {1}
 label.noredo.enabled  =Note: after answer these questions, no changes are allowed.
 label.allow.review.other.responses =Show other aswers after deadline
-
+label.select.leader=Select Leader
+label.question.options=Question Options
+label.activity.completion=End of Activity
+label.notifications=Notifications
 #======= End labels: Exported 280 labels for en AU =====
Index: lams_tool_laqa/web/WEB-INF/tags/Arrow.tag
===================================================================
diff -u -r320934945c495ab0832be6fb547d83812ac3152a -r097e25c6195a1a5f58821003b0fa332844dc6305
--- lams_tool_laqa/web/WEB-INF/tags/Arrow.tag	(.../Arrow.tag)	(revision 320934945c495ab0832be6fb547d83812ac3152a)
+++ lams_tool_laqa/web/WEB-INF/tags/Arrow.tag	(.../Arrow.tag)	(revision 097e25c6195a1a5f58821003b0fa332844dc6305)
@@ -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_laqa/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r320934945c495ab0832be6fb547d83812ac3152a -r097e25c6195a1a5f58821003b0fa332844dc6305
--- lams_tool_laqa/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 320934945c495ab0832be6fb547d83812ac3152a)
+++ lams_tool_laqa/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 097e25c6195a1a5f58821003b0fa332844dc6305)
@@ -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_laqa/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r320934945c495ab0832be6fb547d83812ac3152a -r097e25c6195a1a5f58821003b0fa332844dc6305
--- lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 320934945c495ab0832be6fb547d83812ac3152a)
+++ lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 097e25c6195a1a5f58821003b0fa332844dc6305)
@@ -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_laqa/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u
--- lams_tool_laqa/web/WEB-INF/tags/SimplePanel.tag	(revision 0)
+++ lams_tool_laqa/web/WEB-INF/tags/SimplePanel.tag	(revision 097e25c6195a1a5f58821003b0fa332844dc6305)
@@ -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_laqa/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r320934945c495ab0832be6fb547d83812ac3152a -r097e25c6195a1a5f58821003b0fa332844dc6305
--- lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 320934945c495ab0832be6fb547d83812ac3152a)
+++ lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 097e25c6195a1a5f58821003b0fa332844dc6305)
@@ -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_laqa/web/authoring/AdvancedContent.jsp
===================================================================
diff -u -r320934945c495ab0832be6fb547d83812ac3152a -r097e25c6195a1a5f58821003b0fa332844dc6305
--- lams_tool_laqa/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 320934945c495ab0832be6fb547d83812ac3152a)
+++ lams_tool_laqa/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 097e25c6195a1a5f58821003b0fa332844dc6305)
@@ -1,8 +1,11 @@
 <%@ include file="/common/taglibs.jsp"%>
 
+<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+
 <script type="text/javascript">
 	
 	$(document).ready(function() {
+		
 		$("#useSelectLeaderToolOuput").click(function() {
 			if (document.QaAuthoringForm.useSelectLeaderToolOuput.checked) {
 				//uncheck checkboxes
@@ -46,85 +49,95 @@
 	});
 </script>
 
-<div class="checkbox">
-	<label for="useSelectLeaderToolOuput">
-		<html:checkbox property="useSelectLeaderToolOuput" styleId="useSelectLeaderToolOuput" value="1" />
-		<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" styleId="useSelectLeaderToolOuput" value="1" />
+			<fmt:message key="label.use.select.leader.tool.output" />
+		</label>
+	</div>
+</lams:SimplePanel>
 
-<div class="checkbox">
-	<label for="showOtherAnswers">
-		<html:checkbox property="showOtherAnswers" styleId="showOtherAnswers" value="1" disabled="${formBean.useSelectLeaderToolOuput}"/>
-		<fmt:message key="label.learner.answer" />
-	</label>
-</div>
+<lams:SimplePanel titleKey="label.question.options">
 
-
-
-<div class="loffset20" id="show-other-answers-options">
 	<div class="checkbox">
-		<label for="usernameVisible">
-			<html:checkbox property="usernameVisible" styleId="usernameVisible" value="1" />
-			<fmt:message key="label.show.names" />
+		<label for="questionsSequenced">
+			<html:checkbox property="questionsSequenced" styleId="questionsSequenced" value="1" />
+			<fmt:message key="radiobox.questionsSequenced" />
 		</label>
 	</div>
 	
 	<div class="checkbox">
-		<label for="allowRateAnswers">
-			<html:checkbox property="allowRateAnswers" styleId="allowRateAnswers" value="1" />
-			<fmt:message key="label.authoring.allow.rate.answers" />
+		<label for="allowRichEditor">
+			<html:checkbox property="allowRichEditor" styleId="allowRichEditor" value="1" />
+			<fmt:message key="label.allowRichEditor" />
 		</label>
 	</div>
+	
+	<div class="checkbox">
+		<label for="noReeditAllowed">
+			<html:checkbox property="noReeditAllowed" styleId="noReeditAllowed" value="1" />
+			<fmt:message key="label.no.reedit.allowed" />
+		</label>
+	</div>
 
-	<div class="loffset20">
-		<lams:AuthoringRatingCriteria criterias="${sessionMap.ratingCriterias}" hasRatingLimits="true"
-			upLabel="label.authoring.up" downLabel="label.authoring.down" />
+	<div class="checkbox">
+		<label for="showOtherAnswers">
+			<html:checkbox property="showOtherAnswers" styleId="showOtherAnswers" value="1" disabled="${formBean.useSelectLeaderToolOuput}"/>
+			<fmt:message key="label.learner.answer" />
+		</label>
 	</div>
-</div>
 
-<div class="checkbox">
-	<label for="notifyTeachersOnResponseSubmit">
-		<html:checkbox property="notifyTeachersOnResponseSubmit" styleId="notifyTeachersOnResponseSubmit" value="1" />
-		<fmt:message key="label.notify.teachers.on.response.submit" />
-	</label>
-</div>
+	<div class="loffset20" id="show-other-answers-options">
+		<div class="checkbox">
+			<label for="usernameVisible">
+				<html:checkbox property="usernameVisible" styleId="usernameVisible" value="1" />
+				<fmt:message key="label.show.names" />
+			</label>
+		</div>
+		
+		<div class="checkbox">
+			<label for="allowRateAnswers">
+				<html:checkbox property="allowRateAnswers" styleId="allowRateAnswers" value="1" />
+				<fmt:message key="label.authoring.allow.rate.answers" />
+			</label>
+		</div>
+	
+		<div class="loffset20">
+			<lams:AuthoringRatingCriteria criterias="${sessionMap.ratingCriterias}" hasRatingLimits="true"
+				upLabel="label.authoring.up" downLabel="label.authoring.down" />
+		</div>
+	</div>
+	
+</lams:SimplePanel>
+	
+<lams:SimplePanel titleKey="label.notifications">
 
-<div class="checkbox">
-	<label for="reflect">
-		<html:checkbox property="reflect" styleId="reflect" value="1" />
-		<fmt:message key="label.reflect" />
-	</label>
-</div>
+	<div class="checkbox">
+		<label for="notifyTeachersOnResponseSubmit">
+			<html:checkbox property="notifyTeachersOnResponseSubmit" styleId="notifyTeachersOnResponseSubmit" value="1" />
+			<fmt:message key="label.notify.teachers.on.response.submit" />
+		</label>
+	</div>
+	
+</lams:SimplePanel>
 
-<div class="form-group">
-	<html:textarea property="reflectionSubject" styleId="reflectionSubject" styleClass="form-control" cols="30" rows="3"	/>
-</div>
+<lams:SimplePanel titleKey="label.activity.completion">
+	<div class="checkbox">
+		<label for="lockWhenFinished">
+			<html:checkbox property="lockWhenFinished" styleId="lockWhenFinished" value="1" disabled="${formBean.noReeditAllowed == 1}"/>
+			<fmt:message key="label.lockWhenFinished" />
+		</label>
+	</div>
 
-<div class="checkbox">
-	<label for="questionsSequenced">
-		<html:checkbox property="questionsSequenced" styleId="questionsSequenced" value="1" />
-		<fmt:message key="radiobox.questionsSequenced" />
-	</label>
-</div>
-
-<div class="checkbox">
-	<label for="noReeditAllowed">
-		<html:checkbox property="noReeditAllowed" styleId="noReeditAllowed" value="1" />
-		<fmt:message key="label.no.reedit.allowed" />
-	</label>
-</div>
-
-<div class="checkbox">
-	<label for="lockWhenFinished">
-		<html:checkbox property="lockWhenFinished" styleId="lockWhenFinished" value="1" disabled="${formBean.noReeditAllowed == 1}"/>
-		<fmt:message key="label.lockWhenFinished" />
-	</label>
-</div>
-
-<div class="checkbox">
-	<label for="allowRichEditor">
-		<html:checkbox property="allowRichEditor" styleId="allowRichEditor" value="1" />
-		<fmt:message key="label.allowRichEditor" />
-	</label>
-</div>
\ No newline at end of file
+	<div class="checkbox">
+		<label for="reflect">
+			<html:checkbox property="reflect" styleId="reflect" value="1" />
+			<fmt:message key="label.reflect" />
+		</label>
+	</div>
+	
+	<div class="form-group">
+		<html:textarea property="reflectionSubject" styleId="reflectionSubject" styleClass="form-control" cols="30" rows="3"	/>
+	</div>
+</lams:SimplePanel>