Index: lams_tool_task/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r9bde0c194f5868e0e9e1dd133aefd38416574b1b
--- lams_tool_task/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_task/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 9bde0c194f5868e0e9e1dd133aefd38416574b1b)
@@ -164,6 +164,6 @@
 monitor.summary.date.restriction.removed  =Deadline has been removed
 label.submit  =Finish
 label.download  =Download
-
-
+label.task.options=Task Options
+label.activity.completion=End of Activity
 #======= End labels: Exported 159 labels for en AU =====
Index: lams_tool_task/web/WEB-INF/tags/Arrow.tag
===================================================================
diff -u -rd6dcae53cbe27a85aedf62b8545ee3193ec55220 -r9bde0c194f5868e0e9e1dd133aefd38416574b1b
--- lams_tool_task/web/WEB-INF/tags/Arrow.tag	(.../Arrow.tag)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
+++ lams_tool_task/web/WEB-INF/tags/Arrow.tag	(.../Arrow.tag)	(revision 9bde0c194f5868e0e9e1dd133aefd38416574b1b)
@@ -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_task/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -rd6dcae53cbe27a85aedf62b8545ee3193ec55220 -r9bde0c194f5868e0e9e1dd133aefd38416574b1b
--- lams_tool_task/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
+++ lams_tool_task/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 9bde0c194f5868e0e9e1dd133aefd38416574b1b)
@@ -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_task/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rd6dcae53cbe27a85aedf62b8545ee3193ec55220 -r9bde0c194f5868e0e9e1dd133aefd38416574b1b
--- lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
+++ lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9bde0c194f5868e0e9e1dd133aefd38416574b1b)
@@ -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_task/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u
--- lams_tool_task/web/WEB-INF/tags/SimplePanel.tag	(revision 0)
+++ lams_tool_task/web/WEB-INF/tags/SimplePanel.tag	(revision 9bde0c194f5868e0e9e1dd133aefd38416574b1b)
@@ -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_task/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rd6dcae53cbe27a85aedf62b8545ee3193ec55220 -r9bde0c194f5868e0e9e1dd133aefd38416574b1b
--- lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
+++ lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 9bde0c194f5868e0e9e1dd133aefd38416574b1b)
@@ -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_task/web/pages/authoring/advance.jsp
===================================================================
diff -u -rd6dcae53cbe27a85aedf62b8545ee3193ec55220 -r9bde0c194f5868e0e9e1dd133aefd38416574b1b
--- lams_tool_task/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
+++ lams_tool_task/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 9bde0c194f5868e0e9e1dd133aefd38416574b1b)
@@ -3,72 +3,80 @@
 
 <!-- Advance Tab Content -->
 
-<div class="checkbox">
-	<label for="lockWhenFinished">
-	<html:checkbox property="taskList.lockWhenFinished"	styleId="lockWhenFinished" />
-	<fmt:message key="label.authoring.advance.lock.on.finished" />
-	</label>
-</div>
+<lams:SimplePanel titleKey="label.task.options">
+	
+	<div class="checkbox">
+		<label for="sequentialOrder">
+		<html:checkbox property="taskList.sequentialOrder" styleId="sequentialOrder"/>
+		<fmt:message key="label.authoring.advance.run.content.sequentialOrder" />
+		</label>
+	</div>
+	
+	<div class="form-group">
+		<c:set var="sessionMapID" value="${param.sessionMapID}" />
+		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+	
+		<html:select property="taskList.minimumNumberTasks"	styleId="minimumNumberTasks" styleClass="form-control form-control-inline input-sm">
+	<!-- 		<c:forEach begin="1" end="${fn:length(sessionMap.taskListList)}" varStatus="status">
+				<c:choose>
+					<c:when	test="${formBean.taskList.minimumNumberTasks == 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="minimumNumberTasks">
+			<fmt:message key="label.authoring.advance.minimum.number.tasks" />
+		</label>
+	</div>
+	
+	<div class="checkbox">
+		<label for="allowContributeTasks">
+		<html:checkbox property="taskList.allowContributeTasks" styleId="allowContributeTasks" />
+		<fmt:message key="label.authoring.advance.allow.contribute.tasks" />
+		</label>
+	</div>
+		
+	<div class="checkbox">
+		<label for="monitorVerificationRequired">
+		<html:checkbox property="taskList.monitorVerificationRequired" styleId="monitorVerificationRequired" />
+		<fmt:message key="label.authoring.advance.monitor.verification.required" />
+		</label>
+	</div>
 
-<div class="checkbox">
-	<label for="sequentialOrder">
-	<html:checkbox property="taskList.sequentialOrder" styleId="sequentialOrder"/>
-	<fmt:message key="label.authoring.advance.run.content.sequentialOrder" />
-	</label>
-</div>
+</lams:SimplePanel>
+	
+<lams:SimplePanel titleKey="label.activity.completion">
 
-<div class="form-group">
-	<c:set var="sessionMapID" value="${param.sessionMapID}" />
-	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+	<div class="checkbox">
+		<label for="lockWhenFinished">
+		<html:checkbox property="taskList.lockWhenFinished"	styleId="lockWhenFinished" />
+		<fmt:message key="label.authoring.advance.lock.on.finished" />
+		</label>
+	</div>
 
-	<html:select property="taskList.minimumNumberTasks"	styleId="minimumNumberTasks" styleClass="form-control form-control-inline input-sm">
-<!-- 		<c:forEach begin="1" end="${fn:length(sessionMap.taskListList)}" varStatus="status">
-			<c:choose>
-				<c:when	test="${formBean.taskList.minimumNumberTasks == 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>
+	<div class="checkbox">
+		<label for="reflectOn">
+		<html:checkbox property="taskList.reflectOnActivity" styleId="reflectOn" />
+		<fmt:message key="label.authoring.advanced.reflectOnActivity" />
+		</label>
+	</div>
+	
+	<div class="form-group">
+		<html:textarea property="taskList.reflectInstructions"	styleId="reflectInstructions" styleClass="form-control" rows="3" />
+	</div>
 
-	<label for="minimumNumberTasks">
-		<fmt:message key="label.authoring.advance.minimum.number.tasks" />
-	</label>
-</div>
+</lams:SimplePanel>
 
-<div class="checkbox">
-	<label for="allowContributeTasks">
-	<html:checkbox property="taskList.allowContributeTasks" styleId="allowContributeTasks" />
-	<fmt:message key="label.authoring.advance.allow.contribute.tasks" />
-	</label>
-</div>
-
-<div class="checkbox">
-	<label for="monitorVerificationRequired">
-	<html:checkbox property="taskList.monitorVerificationRequired" styleId="monitorVerificationRequired" />
-	<fmt:message key="label.authoring.advance.monitor.verification.required" />
-	</label>
-</div>
-
-<div class="checkbox">
-	<label for="reflectOn">
-	<html:checkbox property="taskList.reflectOnActivity" styleId="reflectOn" />
-	<fmt:message key="label.authoring.advanced.reflectOnActivity" />
-	</label>
-</div>
-
-<div class="form-group">
-	<html:textarea property="taskList.reflectInstructions"	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
Index: lams_tool_task/web/pages/authoring/basic.jsp
===================================================================
diff -u -rd6dcae53cbe27a85aedf62b8545ee3193ec55220 -r9bde0c194f5868e0e9e1dd133aefd38416574b1b
--- lams_tool_task/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
+++ lams_tool_task/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 9bde0c194f5868e0e9e1dd133aefd38416574b1b)
@@ -39,7 +39,6 @@
 			var url = "<c:url value="/authoring/removeItem.do"/>?"+param;
 			deleteItemLoading();
 			$('#taskListListArea').load(url, function() {
-				debugger;
 	    		deleteItemComplete();
 			});
  		}
@@ -58,7 +57,6 @@
 		var url = "<c:url value="/authoring/upItem.do"/>?"+param;
 		deleteItemLoading();
 		$('#taskListListArea').load(url, function() {
-			debugger;
 			deleteItemComplete();
 		});
 	}
@@ -68,14 +66,12 @@
 		var url = "<c:url value="/authoring/downItem.do"/>?"+param;
 		deleteItemLoading();
 		$('#taskListListArea').load(url, function() {
-			debugger;
 			deleteItemComplete();
 		});
 	}
 	
 	//Packs additional elements and submits the question form
 	function submitTask(){
-		debugger;
 		refreshCKEditors();
 		var form = $('#taskListItemForm');
 		$('#taskListListArea').load(form.attr('action'), form.serialize());
Index: lams_tool_task/web/pages/learning/parts/notebook.jsp
===================================================================
diff -u -rd6dcae53cbe27a85aedf62b8545ee3193ec55220 -r9bde0c194f5868e0e9e1dd133aefd38416574b1b
--- lams_tool_task/web/pages/learning/parts/notebook.jsp	(.../notebook.jsp)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
+++ lams_tool_task/web/pages/learning/parts/notebook.jsp	(.../notebook.jsp)	(revision 9bde0c194f5868e0e9e1dd133aefd38416574b1b)
@@ -34,7 +34,7 @@
 				<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true" />
 			</p>
 
-			<html:textarea cols="60" styleId="notebookEntry" property="entryText" styleClass="form-control" />
+			<html:textarea cols="60" styleId="notebookEntry" property="entryText" styleClass="form-control" rows="5" />
 
 			<div class="voffset10">
 				<html:link href="#nogo" styleClass="btn btn-primary pull-right na" styleId="finishButton"