Index: lams_tool_vote/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rd7b8dfc74b0f786d93eb97ff3a351a96be451acf
--- lams_tool_vote/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_vote/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision d7b8dfc74b0f786d93eb97ff3a351a96be451acf)
@@ -159,6 +159,8 @@
 msg.data.flow.clear.nominations  =You have chosen to use input from an external tool. All defined nomitations will be deleted after save. Do you want to proceed?
 label.advanced.data.flow.limit  =Limit number of students the input will be taken from:
 label.advanced.data.flow.limit.none  =No limit
-
-
+label.select.leader=Select Leader
+label.voting.options=Voting Options
+label.activity.completion=End of Activity
+js.error.validate.number=There is an error with the minimum and/or maximum number of votes. Please check and try again.
 #======= End labels: Exported 158 labels for en AU =====
Index: lams_tool_vote/web/WEB-INF/tags/Arrow.tag
===================================================================
diff -u -rff7583ba24a271222b91ab3ecc460b931fe20e37 -rd7b8dfc74b0f786d93eb97ff3a351a96be451acf
--- lams_tool_vote/web/WEB-INF/tags/Arrow.tag	(.../Arrow.tag)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
+++ lams_tool_vote/web/WEB-INF/tags/Arrow.tag	(.../Arrow.tag)	(revision d7b8dfc74b0f786d93eb97ff3a351a96be451acf)
@@ -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_vote/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -rff7583ba24a271222b91ab3ecc460b931fe20e37 -rd7b8dfc74b0f786d93eb97ff3a351a96be451acf
--- lams_tool_vote/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
+++ lams_tool_vote/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision d7b8dfc74b0f786d93eb97ff3a351a96be451acf)
@@ -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_vote/web/WEB-INF/tags/Date.tag
===================================================================
diff -u -rb6718851271ad991d43a5a3158f8e10c9ccceaaa -rd7b8dfc74b0f786d93eb97ff3a351a96be451acf
--- lams_tool_vote/web/WEB-INF/tags/Date.tag	(.../Date.tag)	(revision b6718851271ad991d43a5a3158f8e10c9ccceaaa)
+++ lams_tool_vote/web/WEB-INF/tags/Date.tag	(.../Date.tag)	(revision d7b8dfc74b0f786d93eb97ff3a351a96be451acf)
@@ -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_vote/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rff7583ba24a271222b91ab3ecc460b931fe20e37 -rd7b8dfc74b0f786d93eb97ff3a351a96be451acf
--- lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
+++ lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d7b8dfc74b0f786d93eb97ff3a351a96be451acf)
@@ -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_vote/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/SimplePanel.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/SimplePanel.tag	(revision d7b8dfc74b0f786d93eb97ff3a351a96be451acf)
@@ -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_vote/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rff7583ba24a271222b91ab3ecc460b931fe20e37 -rd7b8dfc74b0f786d93eb97ff3a351a96be451acf
--- lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
+++ lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision d7b8dfc74b0f786d93eb97ff3a351a96be451acf)
@@ -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_vote/web/authoring/AdvancedContent.jsp
===================================================================
diff -u -rff7583ba24a271222b91ab3ecc460b931fe20e37 -rd7b8dfc74b0f786d93eb97ff3a351a96be451acf
--- lams_tool_vote/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
+++ lams_tool_vote/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision d7b8dfc74b0f786d93eb97ff3a351a96be451acf)
@@ -7,74 +7,86 @@
 	<lams:WebAppURL />
 </c:set>
 
-<div class="checkbox">
-	<label for="useSelectLeaderToolOuput">
-	<html:checkbox property="useSelectLeaderToolOuput" value="1" styleId="useSelectLeaderToolOuput">
-	</html:checkbox>
-	<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">
+		</html:checkbox>
+		<fmt:message key="label.use.select.leader.tool.output" />
+		</label>
+	</div>
+	
+</lams:SimplePanel>
 
-<div class="checkbox">
-	<label for="lockOnFinish">
-	<html:checkbox property="lockOnFinish" value="1" styleId="lockOnFinish">
-	</html:checkbox>
-	<fmt:message key="label.vote.lockedOnFinish" />
-	</label>
-</div>
+<lams:SimplePanel titleKey="label.voting.options">
 
-<div class="checkbox">
-	<label for="allowText">
-	<html:checkbox property="allowText" value="1" styleId="allowText" onchange="changeMinMaxVotes(-1, -1);">
-	</html:checkbox>
-	<fmt:message key="label.allowText" />
-	</label>
-</div>
+	<div class="checkbox">
+		<label for="allowText">
+		<html:checkbox property="allowText" value="1" styleId="allowText" onchange="changeMinMaxVotes(-1, -1);">
+		</html:checkbox>
+		<fmt:message key="label.allowText" />
+		</label>
+	</div>
+	
+	<div class="form-group">
+		<html:select property="minNominationCount" styleId="minNominationCount" styleClass="form-control form-control-inline input-sm" onchange="validateNominationCount(true);">
+		</html:select>&nbsp;<fmt:message key="label.minNomCount" />
+	</div>
+	
+	<div class="form-group">
+		<html:select property="maxNominationCount" styleId="maxNominationCount" styleClass="form-control form-control-inline input-sm" onchange="validateNominationCount(false);">
+		</html:select>&nbsp;<fmt:message key="label.maxNomCount" />
+	</div>
+	
+	<c:if test="${not empty voteGeneralAuthoringDTO.dataFlowObjectNames}">
+		<div class="form-group">
+			<html:select property="maxInputs" styleId="maxInputs"  styleClass="form-control input-sm">
+				<html:option value="0" styleId="dataFlowLimitNoneOption">
+					<fmt:message key="label.advanced.data.flow.limit.none" />
+				</html:option>
+				<c:forEach begin="1" end="50" var="index">
+					<html:option value="${index}">${index}</html:option>
+				</c:forEach>
+			</html:select>
+			<label for="maxInputs">
+			<fmt:message key="label.advanced.data.flow.limit" /></label>
+		</div>
+	</c:if>
+	
+	<div class="checkbox">
+		<label for="showResults">
+		<html:checkbox property="showResults" value="1" styleId="showResults">
+		</html:checkbox>
+		<fmt:message key="label.show.results" />
+		</label>
+	</div>
 
-<div class="form-group">
-	<html:select property="maxNominationCount" styleId="maxNominationCount" styleClass="form-control form-control-inline input-sm">
-	</html:select>&nbsp;<fmt:message key="label.maxNomCount" />
-</div>
+</lams:SimplePanel>
 
-<div class="form-group">
-	<html:select property="minNominationCount" styleId="minNominationCount" styleClass="form-control form-control-inline input-sm">
-	</html:select>&nbsp;<fmt:message key="label.minNomCount" />
-</div>
+<lams:SimplePanel titleKey="label.activity.completion">
 
-<c:if test="${not empty voteGeneralAuthoringDTO.dataFlowObjectNames}">
+	<div class="checkbox">
+		<label for="lockOnFinish">
+		<html:checkbox property="lockOnFinish" value="1" styleId="lockOnFinish">
+		</html:checkbox>
+		<fmt:message key="label.vote.lockedOnFinish" />
+		</label>
+	</div>
+
+	<div class="checkbox">
+		<label for="reflect">
+		<html:checkbox property="reflect" value="1" styleId="reflect">
+		</html:checkbox>
+		<fmt:message key="label.reflect" />
+		</label>
+	</div>
 	<div class="form-group">
-		<html:select property="maxInputs" styleId="maxInputs"  styleClass="form-control input-sm">
-			<html:option value="0" styleId="dataFlowLimitNoneOption">
-				<fmt:message key="label.advanced.data.flow.limit.none" />
-			</html:option>
-			<c:forEach begin="1" end="50" var="index">
-				<html:option value="${index}">${index}</html:option>
-			</c:forEach>
-		</html:select>
-		<label for="maxInputs">
-		<fmt:message key="label.advanced.data.flow.limit" /></label>
+		<html:textarea rows="3" property="reflectionSubject" styleId="reflectInstructions" styleClass="form-control"></html:textarea> 
 	</div>
-</c:if>
 
-<div class="checkbox">
-	<label for="showResults">
-	<html:checkbox property="showResults" value="1" styleId="showResults">
-	</html:checkbox>
-	<fmt:message key="label.show.results" />
-	</label>
-</div>
+</lams:SimplePanel>
 
-<div class="checkbox">
-	<label for="reflect">
-	<html:checkbox property="reflect" value="1" styleId="reflect">
-	</html:checkbox>
-	<fmt:message key="label.reflect" />
-	</label>
-</div>
-<div class="form-group">
-	<html:textarea rows="3" property="reflectionSubject" styleId="reflectInstructions" styleClass="form-control"></html:textarea> 
-</div>
-
 <script type="text/javascript">
 <!--
 //automatically turn on refect option if there are text input in refect instruction area
@@ -91,5 +103,26 @@
 	}
 
 	ra.onkeyup=turnOnRefect;
+	
+	function validateNominationCount(isMinimunDropdownUsed) {
+		var minDropDown = document.getElementById("minNominationCount");
+		var min = parseInt(minNominationCount.options[minNominationCount.selectedIndex].value);
+		var maxDropDown = document.getElementById("maxNominationCount");
+		var max = parseInt(maxNominationCount.options[maxNominationCount.selectedIndex].value);
+
+		if (min > max) {
+			if (isMinimunDropdownUsed) {
+				maxDropDown.selectedIndex = minDropDown.selectedIndex;
+				if ( max > 1) {
+					alert('<fmt:message key="js.error.validate.number"/>');
+				}
+			} else {
+				minDropDown.selectedIndex = maxDropDown.selectedIndex;
+				alert('<fmt:message key="js.error.validate.number"/>');
+			} 
+		}
+	}
+
+
 //-->
 </script>