Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r43109c0633b7699925623470abcf46421b624ff0
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 43109c0633b7699925623470abcf46421b624ff0)
@@ -287,6 +287,8 @@
 label.learning.submit  =Submit
 warn.mark.hedging.wrong.total  =In order to continue, all mark hedging questions should have all available marks assigned.
 label.incorrect.answer.nullifies.mark  =Assigns full mark only when the correct answers are selected.
-
-
+label.select.leader=Select Leader
+label.question.options=Question Options
+label.activity.completion=End of Activity
+label.notifications=Notifications
 #======= End labels: Exported 284 labels for en AU =====
Index: lams_tool_assessment/web/WEB-INF/tags/Arrow.tag
===================================================================
diff -u -r3a3e8d8da9a68a70d1e8c9d718346960d5d115a1 -r43109c0633b7699925623470abcf46421b624ff0
--- lams_tool_assessment/web/WEB-INF/tags/Arrow.tag	(.../Arrow.tag)	(revision 3a3e8d8da9a68a70d1e8c9d718346960d5d115a1)
+++ lams_tool_assessment/web/WEB-INF/tags/Arrow.tag	(.../Arrow.tag)	(revision 43109c0633b7699925623470abcf46421b624ff0)
@@ -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_assessment/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -r43109c0633b7699925623470abcf46421b624ff0
--- lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
+++ lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 43109c0633b7699925623470abcf46421b624ff0)
@@ -24,8 +24,8 @@
 	<c:set var="toolbarSet" value="Default" />
 </c:if>
 
-<c:if test="${fn:containsIgnoreCase(method,'replace')}">
-	<c:set var="toolbarSet">${toolbarSet}Replace</c:set>
+<c:if test="${fn:containsIgnoreCase(method,'Inline')}">
+	<c:set var="toolbarSet">${toolbarSet}Inline</c:set>
 </c:if>
 
 <c:if test="${empty displayExpanded}">
Index: lams_tool_assessment/web/WEB-INF/tags/Date.tag
===================================================================
diff -u -rb6718851271ad991d43a5a3158f8e10c9ccceaaa -r43109c0633b7699925623470abcf46421b624ff0
--- lams_tool_assessment/web/WEB-INF/tags/Date.tag	(.../Date.tag)	(revision b6718851271ad991d43a5a3158f8e10c9ccceaaa)
+++ lams_tool_assessment/web/WEB-INF/tags/Date.tag	(.../Date.tag)	(revision 43109c0633b7699925623470abcf46421b624ff0)
@@ -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_assessment/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -r43109c0633b7699925623470abcf46421b624ff0
--- lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
+++ lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 43109c0633b7699925623470abcf46421b624ff0)
@@ -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_assessment/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/SimplePanel.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/SimplePanel.tag	(revision 43109c0633b7699925623470abcf46421b624ff0)
@@ -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_assessment/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -r43109c0633b7699925623470abcf46421b624ff0
--- lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
+++ lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 43109c0633b7699925623470abcf46421b624ff0)
@@ -426,15 +426,15 @@
    	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
-   	</tag-file>
+   	</tag-file>   
    	<tag-file>
        <name>AuthoringRatingCriteria</name>
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>   	
+   	</tag-file>    		
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
@@ -467,10 +467,14 @@
        <name>AdvancedAccordian</name>
        <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
    	</tag-file>  
-   	<tag-file>   		
+   	<tag-file>
    		<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_assessment/web/pages/authoring/advance.jsp
===================================================================
diff -u -r926a6115d0705769bdff82c4f0fe78f83b2c6839 -r43109c0633b7699925623470abcf46421b624ff0
--- lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 926a6115d0705769bdff82c4f0fe78f83b2c6839)
+++ lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 43109c0633b7699925623470abcf46421b624ff0)
@@ -40,21 +40,23 @@
 </script>
 
 <!-- Advance Tab Content -->
+
+<lams:SimplePanel titleKey="label.select.leader">
 <div class="checkbox">
 	<label for="useSelectLeaderToolOuput">
 		<html:checkbox property="assessment.useSelectLeaderToolOuput" value="1" styleId="useSelectLeaderToolOuput"/>
 		<fmt:message key="label.use.select.leader.tool.output" />
 	</label>
 </div>
+</lams:SimplePanel>
 
-<div class="form-inline form-group">
-	<html:text property="assessment.timeLimit" size="3" styleId="timeLimit" styleClass="form-control input-sm"/>
-	<label for="timeLimit">
-		&nbsp;<fmt:message key="label.authoring.advance.time.limit" />
-	</label>
-</div>
+<lams:SimplePanel titleKey="label.question.options">
 
-<div class="form-inline form-group">
+<lams:SimplePanel panelBodyClass="panel-body-sm">
+
+<div class="form-inline">
+	<label for="assessment.questionsPerPage">
+		<fmt:message key="label.authoring.advance.questions.per.page" />&nbsp;
 	<html:select property="assessment.questionsPerPage" styleClass="form-control input-sm">
 		<html:option value="0"><fmt:message key="label.authoring.advance.all.in.one.page" /></html:option>
 		<html:option value="10">10</html:option>
@@ -68,8 +70,6 @@
 		<html:option value="2">2</html:option>
 		<html:option value="1">1</html:option>
 	</html:select>
-	<label for="assessment.questionsPerPage">
-		&nbsp;<fmt:message key="label.authoring.advance.questions.per.page" />
 	</label>
 </div>
 
@@ -87,6 +87,16 @@
 	</label>
 </div>
 
+</lams:SimplePanel>
+
+<lams:SimplePanel panelBodyClass="panel-body-sm">
+
+<div class="form-inline">
+	<label for="timeLimit"><fmt:message key="label.authoring.advance.time.limit" />&nbsp;
+	<html:text property="assessment.timeLimit" size="3" styleId="timeLimit" styleClass="form-control input-sm"/>
+	</label>
+</div>
+
 <fmt:message key="label.authoring.advance.choose.restriction" />
 	
 <div class="loffset20">
@@ -122,6 +132,10 @@
 	
 </div>
 
+</lams:SimplePanel>
+
+<lams:SimplePanel panelBodyClass="panel-body-sm">
+
 <div class="checkbox">
 	<label for="display-summary">
 		<html:checkbox property="assessment.displaySummary" styleId="display-summary"/>
@@ -174,14 +188,30 @@
 		<fmt:message key="label.authoring.advance.allow.students.grades" />
 	</label>
 </div>
+</lams:SimplePanel>
 
+</lams:SimplePanel>
+
+<lams:SimplePanel titleKey="label.notifications">
 <div class="checkbox">
 	<label for="notifyTeachersOnAttemptCompletion">
 		<html:checkbox property="assessment.notifyTeachersOnAttemptCompletion" styleId="notifyTeachersOnAttemptCompletion"/>
 		<fmt:message key="label.authoring.advanced.notify.on.attempt.completion" />
 	</label>
 </div>
+</lams:SimplePanel>
 
+<!-- Overall feedback -->
+<lams:SimplePanel titleKey="label.authoring.advance.overall.feedback">
+
+<input type="hidden" name="overallFeedbackList" id="overallFeedbackList" />
+<iframe id="advancedInputArea" name="advancedInputArea" style="width:650px;height:100%;border:0px;display:block;" 
+		frameborder="no" scrolling="no" src="<c:url value='/authoring/initOverallFeedback.do'/>?sessionMapID=${formBean.sessionMapID}">
+</iframe>
+</lams:SimplePanel>
+
+<lams:SimplePanel titleKey="label.activity.completion">
+
 <div class="checkbox">
 	<label for="reflectOnActivity">
 		<html:checkbox property="assessment.reflectOnActivity" styleId="reflectOnActivity"/>
@@ -192,15 +222,8 @@
 <div class="form-group">
 	<html:textarea property="assessment.reflectInstructions" rows="3" styleId="reflectInstructions" styleClass="form-control"/>
 </div>
+</lams:SimplePanel>
 
-<!-- Overall feedback -->
-<input type="hidden" name="overallFeedbackList" id="overallFeedbackList" />
-<p>
-	<iframe id="advancedInputArea" name="advancedInputArea" style="width:650px;height:100%;border:0px;display:block;" 
-			frameborder="no" scrolling="no" src="<c:url value='/authoring/initOverallFeedback.do'/>?sessionMapID=${formBean.sessionMapID}">
-	</iframe>
-</p>
-
 <script type="text/javascript">
 	//automatically turn on refect option if there are text input in refect instruction area
 	var ra = document.getElementById("reflectInstructions");
@@ -217,3 +240,4 @@
 	
 	ra.onkeyup=turnOnRefect;
 </script>
+
Index: lams_tool_assessment/web/pages/authoring/parts/overallfeedbacklist.jsp
===================================================================
diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -r43109c0633b7699925623470abcf46421b624ff0
--- lams_tool_assessment/web/pages/authoring/parts/overallfeedbacklist.jsp	(.../overallfeedbacklist.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
+++ lams_tool_assessment/web/pages/authoring/parts/overallfeedbacklist.jsp	(.../overallfeedbacklist.jsp)	(revision 43109c0633b7699925623470abcf46421b624ff0)
@@ -21,12 +21,8 @@
 <div id="overallFeedbackArea">
 	<form id="overallFeedbackForm">
 		<input type="hidden" name="overallFeedbackCount" id="overallFeedbackCount" value="${overallFeedbackListSize}">
-
-		<h5>
-			<fmt:message key="label.authoring.advance.overall.feedback" />
-			<img src="${ctxPath}/includes/images/indicator.gif"	style="display:none;" id="overallFeedbackArea_Busy" />			
-		</h5>
-
+		<img src="${ctxPath}/includes/images/indicator.gif"	style="display:none;" id="overallFeedbackArea_Busy" />			
+		
 		<table class="table table-condensed">
 			<tr>
 				<td style="text-align:right;">
@@ -90,7 +86,7 @@
 	if (!obj) {
 		obj = window.top.document.getElementById('advancedInputArea');
 	}
-	obj.style.height = eval(125 + ${overallFeedbackListSize}*90) + 'px';
+	obj.style.height = eval(75 + ${overallFeedbackListSize}*90) + 'px';
 </script>	
 	
 </body>