Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java
===================================================================
diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java	(.../VoteAppConstants.java)	(revision 5773f84ed608838de3521ecde87c52f3c72d478c)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java	(.../VoteAppConstants.java)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -40,6 +40,7 @@
      */
     public static final String LOAD = "load";
     public static final String LOAD_QUESTIONS = "load";
+    public static final String LOAD_NOMINATIONS = "loadNominations";
     public static final String LOAD_MONITORING = "refreshMonitoring";
     public static final String LOAD_STARTER = "starter";
     public static final String AUTHORING_STARTER = "starter";
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java
===================================================================
diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java	(.../VoteAction.java)	(revision 5773f84ed608838de3521ecde87c52f3c72d478c)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java	(.../VoteAction.java)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -493,7 +493,7 @@
 
 	request.getSession().setAttribute(httpSessionID, sessionMap);
 
-	return mapping.findForward(VoteAppConstants.LOAD_QUESTIONS);
+	return mapping.findForward(VoteAppConstants.LOAD_NOMINATIONS);
     }
 
     /**
@@ -608,7 +608,7 @@
 
 	request.getSession().setAttribute(httpSessionID, sessionMap);
 
-	return mapping.findForward(VoteAppConstants.LOAD_QUESTIONS);
+	return mapping.findForward(VoteAppConstants.LOAD_NOMINATIONS);
     }
 
     /**
Index: lams_tool_vote/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r81d3515d29fd57e3b9e08cc37481fd0becbd8b10 -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 81d3515d29fd57e3b9e08cc37481fd0becbd8b10)
+++ lams_tool_vote/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -93,6 +93,12 @@
 	        path="/authoring/AuthoringMaincontent.jsp"
 		    redirect="false"
 	      />
+
+	      <forward
+	        name="loadNominations"
+	        path="/authoring/itemlist.jsp"
+		    redirect="false"
+	      />
 	    
 	      <forward
 	        name="starter"
Index: lams_tool_vote/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/AdvancedAccordian.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/AdvancedAccordian.tag	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -0,0 +1,53 @@
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
+
+	/**
+	 * AdvancedAccordian.tag
+	 *	Author: Fiona Malikoff
+	 *	Description: Creates the show/hide entry for the Advanced Settings in Montoring.
+	 * Wiki: 
+	 */
+%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default" >
+        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
+          	${title}
+        	</a>
+      		</span>
+        </div>
+
+        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
+		<jsp:doBody />
+		</div>
+	</div>
+</div>
+		
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tags/Arrow.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/Arrow.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/Arrow.tag	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -0,0 +1,35 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%-- state = up: up arrow;  state = down: down arrow --%>
+<%@ attribute name="state" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="onclick" required="false" rtexprvalue="true"%>
+
+<c:choose>
+	<c:when test="${not empty title}">
+		<c:set var="fullTitle">title="${title}"</c:set>
+	</c:when>
+	<c:otherwise>
+		<c:set var="fullTitle" value=""/>
+	</c:otherwise>
+</c:choose>
+
+<c:choose>
+	<c:when test="${not empty onclick}">
+		<c:set var="fullOnclick">onclick="${onclick}"</c:set>
+	</c:when>
+	<c:otherwise>
+		<c:set var="fullOnclick" 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>
+	</c:when>
+	<c:otherwise>
+		<i class="fa fa-long-arrow-down fa-pull-right"  ${fullTitle} ${fullOnclick}></i>
+	</c:otherwise>
+</c:choose>
Index: lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -122,12 +122,12 @@
     	window.close();
     }  				
 </script>	
-<p id="saveCancelButtons" >
-		<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="button right-buttons space-left">
-			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
-		</html:link>
-		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button right-buttons space-left">
+<div id="saveCancelButtons" >
+		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="btn btn-primary pull-right">
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
 		</html:link>
-</p>
+		<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="btn btn-default roffset5 pull-right">
+			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
+		</html:link>
+</div>
 <!-- end tab content -->
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -0,0 +1,349 @@
+<% 
+ /**
+  * AuthoringRatingCriteria.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+
+<!-- calculate whether isCommentsAllowed is true -->
+<c:set var="isCommentsEnabled" value="false"/>
+<c:set var="commentsMinWordsLimit" value="0"/>
+<c:forEach var="criteria" items="${criterias}" varStatus="status">
+	<c:if test="${criteria.commentsEnabled}">
+		<c:set var="isCommentsEnabled" value="true"/>
+		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
+	</c:if>
+</c:forEach>
+
+<!-- begin tab content -->
+<script type="text/javascript">
+$(document).ready(function() { 
+	
+	// find max orderId
+	<c:set var="maxOrderId" value="0"/>
+	<c:forEach var="criteria" items="${criterias}" varStatus="status">
+		<c:if test="${criteria.orderId > maxOrderId}">
+			<c:set var="maxOrderId" value="${criteria.orderId}"/>
+		</c:if>
+	</c:forEach>
+	var maxOrderId = ${maxOrderId};
+	
+	function addCriteria() {
+		//increase maxOrderId by 1
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		
+		jQuery('<tr/>').append(jQuery('<td/>', {
+			'class': 'criteria-info',
+		    html: '<input type="hidden" name="criteriaOrderId' + maxOrderId + '" value="' + maxOrderId + '">' + 
+		    		'<input type="text" name="criteriaTitle' + maxOrderId + '" value="" class="form-control">'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');
+		
+		reactivateArrows();
+	}
+	<c:if test="${empty criterias}">
+		addCriteria(); 
+		addCriteria();
+	</c:if>
+	reactivateArrows();
+	
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+	
+	//upCriteria
+	 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+		var currentRow = $(this).closest('tr');
+		var currentCriteriaTd = $( ".criteria-info", currentRow);
+		var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+		//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+		var prevRow = currentRow.prev();
+		var prevCriteriaTd = $( ".criteria-info", prevRow);
+		var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+		//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+		
+		//swap orderIds
+		var temp = currentOrderId.val();
+		currentOrderId.val(prevOrderId.val());
+		prevOrderId.val(temp);
+		
+		//swap elements
+		currentCriteriaTd.detach().prependTo(prevRow);
+		prevCriteriaTd.detach().prependTo(currentRow);
+		
+		reactivateArrows();
+	 } );
+	 
+	//downCriteria
+	 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+		var currentRow = $(this).closest('tr');
+		var currentCriteriaTd = $( ".criteria-info", currentRow);
+		var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+		//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+		var nextRow = currentRow.next();
+		var nextCriteriaTd = $( ".criteria-info", nextRow);
+		var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+		//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+		
+		//swap orderIds
+		var temp = currentOrderId.val();
+		currentOrderId.val(nextOrderId.val());
+		nextOrderId.val(temp);
+		
+		//swap elements
+		currentCriteriaTd.detach().prependTo(nextRow);
+		nextCriteriaTd.detach().prependTo(currentRow);
+		
+		reactivateArrows();
+	 });
+	 
+	 //deleteCriteria
+	 $( "body" ).on( "click", ".fa-times", function() {
+		var currentRow = $(this).closest('tr');
+		currentRow.remove();
+		
+		reactivateArrows();
+	});
+	 
+	 //addCriteria
+	 $( "body" ).on( "click", "#add-criteria", function() {
+		 addCriteria();
+	});
+	 
+ 	//spinner
+ 	var minimumWordsSpinner = $("#comments-min-words-limit").spinner({ 
+ 		min: 0,
+ 		disabled: ${!isCommentsEnabled}
+ 	});
+ 	$("#enable-comments").click(function() {
+ 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+ 			minimumWordsSpinner.spinner( "enable" );
+ 			$("#comments-min-words-limit-label").removeClass("gray-color");
+ 		} else {
+ 			minimumWordsSpinner.spinner( "disable" );
+ 			$("#comments-min-words-limit-label").addClass("gray-color");
+ 		}
+     });
+	 
+})
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum) {
+		var minRateDropDown = document.getElementById("minimum-rates");
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximum-rates");
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+	<div class="panel panel-default voffset5">
+		<div class="panel-heading panel-title">
+			<label><fmt:message key="${headerLabel}" /></label>
+		</div>
+	
+		<div class="form-group roffset10 loffset10">
+			<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+			<table class="table table-condensed table-no-border" id="criterias-table">
+		
+				<c:forEach var="criteria" items="${criterias}" varStatus="status">
+					<c:if test="${!criteria.commentsEnabled}">
+						<tr>
+							
+							<td class="criteria-info">
+								<input type="hidden" name="criteriaOrderId${criteria.orderId}" value="${criteria.orderId}">
+								<input type="text" name="criteriaTitle${criteria.orderId}" value="${criteria.title}" class="form-control">
+							</td>
+							
+							<td width="40px">
+								<div class="arrow-up" title="<fmt:message key="${upLabel}"/>"></div>
+								<div class="arrow-down" title="<fmt:message key="${downLabel}"/>"></div>
+							</td>
+			                
+							<td width="20px">
+								<i class="fa fa-times" title="<fmt:message key="${deleteLabel}" />"></i>
+							</td>
+						</tr>
+					</c:if>
+				</c:forEach>
+			</table>
+	
+			<div style="height: 25px; margin-top: -10px;">
+				<a href="#nogo" class="btn btn-default btn-xs pull-right" id="add-criteria">
+					<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+				</a>
+			</div>
+	
+			<c:if test="${hasRatingLimits}">
+				<div>
+					<label for="minimum-rates">
+						<fmt:message key="${minimumLabel}" />
+					</label>
+					<html:select property="${formContentPrefix}minimumRates" styleId="minimum-rates" onmouseup="validateRatingLimits(true);" 
+							styleClass="form-control form-control-inline">
+						<html:option value="0">
+							<fmt:message key="${noMinimumLabel}" />
+						</html:option>
+						<html:option value="1">1</html:option>
+						<html:option value="2">2</html:option>
+						<html:option value="3">3</html:option>
+						<html:option value="4">4</html:option>
+						<html:option value="5">5</html:option>
+						<html:option value="6">6</html:option>
+						<html:option value="7">7</html:option>
+						<html:option value="8">8</html:option>
+						<html:option value="9">9</html:option>
+						<html:option value="10">10</html:option>
+					</html:select>
+				
+					<label for="maximum-rates">
+						<fmt:message key="${maximumLabel}" />
+					</label>
+					<html:select property="${formContentPrefix}maximumRates" styleId="maximum-rates" onmouseup="validateRatingLimits(false);" 
+							styleClass="form-control form-control-inline">
+						<html:option value="0">
+							<fmt:message key="${noMaximumLabel}" />
+						</html:option>
+						<html:option value="1">1</html:option>
+						<html:option value="2">2</html:option>
+						<html:option value="3">3</html:option>
+						<html:option value="4">4</html:option>
+						<html:option value="5">5</html:option>
+						<html:option value="6">6</html:option>
+						<html:option value="7">7</html:option>
+						<html:option value="8">8</html:option>
+						<html:option value="9">9</html:option>
+						<html:option value="10">10</html:option>
+					</html:select>
+				</div>
+			</c:if>
+	
+			<div class="checkbox">
+				<label for="enable-comments">
+					<input type="checkbox" name="isCommentsEnabled" value="true" class="noBorder" id="enable-comments"
+						<c:if test="${isCommentsEnabled}">checked="checked"</c:if>
+					/>
+					<fmt:message key="${allowCommentsLabel}" />
+				</label>
+			</div>
+	
+			<div>
+				<label for="comments-min-words-limit" id="comments-min-words-limit-label"
+					<c:if test="${!isCommentsEnabled}">class="gray-color"</c:if>
+				>
+					<fmt:message key="${minNumberWordsLabel}" >
+						<fmt:param> </fmt:param>
+					</fmt:message>
+				</label>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+			</div>
+		</div>
+	</div>
+</div>
+<!-- end tab content -->
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdc884b8e6274ebbc664d1ee940e565803445bb26 -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
+++ lams_tool_vote/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -10,7 +10,12 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 <%@ attribute name="resizeParentFrameName" required="false" rtexprvalue="true"%>
+<%@ attribute name="method" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty method}">
+	<c:set var="method" value="inline" />
+</c:if>
+
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -19,6 +24,10 @@
 	<c:set var="toolbarSet" value="Default" />
 </c:if>
 
+<c:if test="${fn:containsIgnoreCase(method,'Inline')}">
+	<c:set var="toolbarSet">${toolbarSet}Inline</c:set>
+</c:if>
+
 <c:if test="${empty displayExpanded}">
 	<c:set var="displayExpanded" value="true" />
 </c:if>
@@ -33,10 +42,10 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
-	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
+	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
 </c:if>
 
@@ -59,10 +68,9 @@
 	    var editor = CKEDITOR.instances["${id}"];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.replace( "${id}", {
+		var instance = CKEDITOR.${method}( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
-				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_vote/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/Comments.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/Comments.tag	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -0,0 +1,47 @@
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
+<%@ attribute name="height" required="false" rtexprvalue="true"%>
+<%@ attribute name="width" required="false" rtexprvalue="true"%>
+<%@ attribute name="mode" required="false" rtexprvalue="true"%>
+<%@ attribute name="likeAndDislike" required="false" rtexprvalue="true"%>
+<%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
+<%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
+<%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+
+
+<c:if test="${empty width}">
+	<c:set var="width" value="100%" />
+</c:if>
+
+<c:if test="${empty height}">
+	<c:set var="height" value="auto" />
+</c:if>
+
+<c:set var="modeStr" value=""/>
+<c:if test="${!empty mode}">
+	<c:set var="modeStr">&mode=${mode}</c:set>
+</c:if>
+
+<c:if test="${empty likeAndDislike}">
+	<c:set var="likeAndDislike" value="false" />
+</c:if>
+
+<c:if test="${empty readOnly}">
+	<c:set var="readOnly" value="false" />
+</c:if>
+
+<c:if test="${empty sortBy}">
+	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
+</c:if>
+
+<div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+<script>
+$(document).ready(function(){
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$('#commentFrame').load(url);
+});
+</script>
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/CommentsAuthor.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/CommentsAuthor.tag	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -0,0 +1,51 @@
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+
+<%@ 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"%>
+
+<c:if test="${empty allowCommentsVariableName}">
+	<c:set var="allowCommentsVariableName" value="allowComments" />
+</c:if>
+<c:if test="${empty allowCommentLabelKey}">
+	<c:set var="allowCommentLabelKey" value="advanced.allow.comments" />
+</c:if>
+<c:if test="${empty likeDislikeVariableName}">
+	<c:set var="likeDislikeVariableName" value="commentsLikeAndDislike" />
+</c:if>
+<c:if test="${empty likeOnlyCommentLabelKey}">
+	<c:set var="likeOnlyCommentLabelKey" value="advanced.comments.like.only" />
+</c:if>
+<c:if test="${empty likeDislikeLabelKey}">
+	<c:set var="likeDislikeLabelKey" value="advanced.comments.like.and.dislike" />
+</c:if>
+
+<div class="checkbox">
+	<label>
+	<html:checkbox property="${allowCommentsVariableName}" value="1"
+		styleId="${allowCommentsVariableName}">
+	</html:checkbox>
+	<fmt:message key="${allowCommentLabelKey}"/>
+	</label>
+</div>
+<div class="loffset20" id="likedislike">
+		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
+		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
+</div>
+
+<script>
+jQuery( document ).ready(function( $ ) {
+	if (! $("#${allowCommentsVariableName}").is(':checked')) {
+		$("#likedislike").hide();
+	}
+	$("#${allowCommentsVariableName}").click(function() {
+		$("#likedislike").toggle('slow');
+	});
+});
+</script>
+
+
Index: lams_tool_vote/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r08acd0f92aee1558d18b43ee75b9d7031977d3e4 -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 08acd0f92aee1558d18b43ee75b9d7031977d3e4)
+++ lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -12,25 +12,38 @@
 <div class="row no-gutter">
 	<div class="col-xs-12">
 		<div class="container" id="content">
+		
+		<c:choose>
+		<c:when test='${type == "navbar"}'>
+			<jsp:doBody />
+		</c:when> 
+		<c:otherwise>
 			<div class="panel panel-default panel-${type}-page">
-				<div class="panel-heading">
-					<c:if test="${not empty title}">
+				<c:if test="${not empty title}">
+					<div class="panel-heading">
 						<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>
 							</c:if>
 						</div>
-					</c:if>
-					<c:if test="${not empty headingContent}">
-						<c:out value="${headingContent}" escapeXml="true" />
-					</c:if>
-				</div>
+						<c:if test="${not empty headingContent}">
+							<c:out value="${headingContent}" escapeXml="true" />
+						</c:if>
+					</div>
+				</c:if>
 				<div class="panel-body panel-${type}-body">
 					<jsp:doBody />
 				</div>
 			</div>
+		</c:otherwise>
+		</c:choose>
+			
 		</div>
 		<!-- End content container -->
 	</div>
 </div>
+
+
+		
+			
Index: lams_tool_vote/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/Rating.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/Rating.tag	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -0,0 +1,194 @@
+<% 
+ /**
+  * Rating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows rating stars widget
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="itemRatingDto" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.ItemRatingDTO" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="disabled" required="false" rtexprvalue="true" %>
+<%@ attribute name="isItemAuthoredByUser" required="false" rtexprvalue="true" %>
+<%@ attribute name="maxRates" required="false" rtexprvalue="true" %>
+<%@ attribute name="countRatedItems" required="false" rtexprvalue="true" %>
+<%@ attribute name="yourRatingLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty disabled}">
+	<c:set var="disabled" value="false" scope="request"/>
+</c:if>
+<c:if test="${empty isItemAuthoredByUser}">
+	<c:set var="isItemAuthoredByUser" value="false" scope="request"/>
+</c:if>
+<c:if test="${empty maxRates}">
+	<c:set var="maxRates" value="0" scope="request"/>
+</c:if>
+<c:if test="${empty countRatedItems}">
+	<c:set var="countRatedItems" value="0" scope="request"/>
+</c:if>
+<c:if test="${empty yourRatingLabel}">
+	<c:set var="yourRatingLabel" value="label.your.rating" scope="request"/>
+</c:if>
+<c:if test="${empty averageRatingLabel}">
+	<c:set var="averageRatingLabel" value="label.average.rating" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.comment.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty showComments}">
+	<c:set var="showComments" value="true" scope="request"/>
+</c:if>
+<c:set var="isCommentsEnabled" value="${itemRatingDto.commentsEnabled && showComments}"/>
+
+<c:if test="${isCommentsEnabled}">
+	<c:set var="userId"><lams:user property="userID" /></c:set>
+	<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
+		<c:if test="${comment.userId == userId}">
+			<c:set var="commentLeftByUser" value="${comment}"/>
+		</c:if>
+	</c:forEach>
+</c:if>
+
+<%--Rating stars area---------------------------------------%>
+
+<div class="extra-controls-inner">
+<div class="rating-stars-holder text-center center-block">
+
+	<c:set var="hasStartedRating" value="false"/>
+	<c:forEach var="criteriaDto" items="${itemRatingDto.criteriaDtos}">
+		<c:set var="hasStartedRating" value='${hasStartedRating || criteriaDto.userRating != ""}'/>
+	</c:forEach>
+	<c:set var="hasStartedRating" value='${hasStartedRating || not empty commentLeftByUser}'/>
+	
+	<c:forEach var="criteriaDto" items="${itemRatingDto.criteriaDtos}" varStatus="status">
+		<c:set var="objectId" value="${criteriaDto.ratingCriteria.ratingCriteriaId}-${itemRatingDto.itemId}"/>
+		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
+	
+		<c:choose>
+			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
+			</c:when>
+			<c:otherwise>
+				<c:set var="ratingStarsClass" value="rating-stars"/>
+			</c:otherwise>
+		</c:choose>
+			
+		<strong>
+			${criteriaDto.ratingCriteria.title}
+		</strong>
+			
+		<c:choose>
+			<c:when test='${isItemAuthoredByUser || not isCriteriaNotRatedByUser}'>
+				<c:set var="ratingDataAverage" value="${criteriaDto.averageRating}"/>
+			</c:when>
+			<c:otherwise>
+				<c:set var="ratingDataAverage" value="0"/>
+			</c:otherwise>
+		</c:choose>
+		
+		<div class="${ratingStarsClass} rating-stars-new" data-average="${ratingDataAverage}" data-id="${objectId}">
+		</div>
+			
+		<c:choose>
+			<c:when test="${isItemAuthoredByUser}">
+				<div class="rating-stars-caption">
+					<fmt:message key="${averageRatingLabel}" >
+						<fmt:param>
+							<fmt:formatNumber value="${criteriaDto.averageRating}" type="number" maxFractionDigits="1" />
+						</fmt:param>
+						<fmt:param>
+							${criteriaDto.numberOfVotes}
+						</fmt:param>
+					</fmt:message>
+				</div>
+			</c:when>
+				
+			<c:otherwise>
+				<div class="rating-stars-caption" id="rating-stars-caption-${objectId}"
+					<c:if test="${isCriteriaNotRatedByUser}">style="visibility: hidden;"</c:if>
+				>
+					<fmt:message key="${yourRatingLabel}" >
+						<fmt:param>
+							<span id="user-rating-${objectId}">
+								<fmt:formatNumber value="${criteriaDto.userRating}" type="number" maxFractionDigits="1" />
+							</span>
+						</fmt:param>			
+						<fmt:param>
+							<span id="average-rating-${objectId}">
+								<fmt:formatNumber value="${criteriaDto.averageRating}" type="number" maxFractionDigits="1" />
+							</span>
+						</fmt:param>
+						<fmt:param>
+							<span id="number-of-votes-${objectId}">${criteriaDto.numberOfVotes}</span>
+						</fmt:param>
+					</fmt:message>
+				</div>
+				
+			</c:otherwise>
+		</c:choose>
+			
+	</c:forEach>
+
+</div>
+
+</div>
+
+<%--Comments area---------------------------------------%>
+<c:if test="${isCommentsEnabled}">
+	<div id="comments-area-${itemRatingDto.itemId}">
+	
+		<c:choose>
+			<c:when test='${isItemAuthoredByUser}'>
+				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
+					<div class="rating-comment">
+						<c:out value="${comment.comment}" escapeXml="false" />
+					</div>
+				</c:forEach>
+			</c:when>
+			
+			<c:when test='${not empty commentLeftByUser}'>
+				<div class="rating-comment">
+					<c:out value="${commentLeftByUser.comment}" escapeXml="false" />
+				</div>
+			</c:when>
+			
+			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
+				<div id="add-comment-area-${itemRatingDto.itemId}">
+			
+					<!-- Comment min words limit -->
+					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
+					
+						<lams:Alert type="info" id="comment-limit-${itemRatingDto.itemId}" close="false">
+							<fmt:message key="${minNumberWordsLabel}">
+								: <fmt:param value="${itemRatingDto.commentsMinWordsLimit}"/>
+							</fmt:message>
+						</lams:Alert>
+					</c:if>		
+				
+					<div class="no-gutter">
+						<div class="col-xs-12 col-sm-11 ">
+						<textarea name="comment" rows="2" id="comment-textarea-${itemRatingDto.itemId}" onfocus="if(this.value==this.defaultValue)this.value='';" 
+								onblur="if(this.value=='')this.value=this.defaultValue;" 
+								class="form-control"><fmt:message key="label.comment.textarea.tip"/></textarea>
+						</div>
+						<div class="button add-comment add-comment-new col-xs-12 col-sm-1 " data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}">
+						</div>
+					</div>		
+				</div>			
+			</c:when>
+		</c:choose>
+			
+	</div>	
+</c:if>
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -0,0 +1,54 @@
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
+
+	/**
+	 * AdvancedAccordian.tag
+	 *	Author: Fiona Malikoff
+	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
+	 * Wiki: 
+	 */
+%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default" >
+        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
+          	${title}
+        	</a>
+      		</span>
+        </div>
+
+
+		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
+		<jsp:doBody />
+		</div>
+	</div>
+</div>
+		
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tags/TSTable.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/TSTable.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/TSTable.tag	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -0,0 +1,53 @@
+<%-- Tablesorter Table and Pager --%>
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+
+<%@ attribute name="numColumns" required="true" rtexprvalue="true"%>
+<%@ attribute name="dataId" required="false" rtexprvalue="true"%>
+<%@ attribute name="tableClass" required="false" rtexprvalue="true"%>
+<%@ attribute name="pagerClass" required="false" rtexprvalue="true"%>
+<%@ attribute name="test" required="false" rtexprvalue="true"%>
+
+<c:if test="${empty tableClass}">
+	<c:set var="tableClass" value="tablesorter" />
+</c:if>
+
+<c:if test="${empty pagerClass}">
+	<c:set var="pagerClass" value="ts-pager" />
+</c:if>
+
+<c:if test="${empty dataId}">
+	<c:set var="dataId" value="" />
+</c:if>
+
+<table class="${tableClass}" ${dataId}>
+	<thead>
+		<tr>
+			<jsp:doBody />
+		</tr>
+	</thead>
+	<tfoot>
+		<tr>
+	    	<th colspan="${numColumns}" class="${pagerClass} form-horizontal">
+	        <button type="button" class="btn btn-xs first"><i class="fa fa-step-backward"></i></button>
+	        <button type="button" class="btn btn-xs prev"><i class="fa fa-backward"></i></button>
+	        <span class="pagedisplay"></span> <!-- this can be any element, including an input -->
+	        <button type="button" class="btn btn-xs next"><i class="fa fa-forward"></i></button>
+	        <button type="button" class="btn btn-xs last"><i class="fa fa-step-forward"></i></button>
+	        <select class="pagesize" title="Select page size">
+	      		<c:if test="${not empty test}"><option value="2">2</option></c:if>
+	      		<option selected="selected" value="10">10</option>
+	      		<option value="20">20</option>
+	      		<option value="30">30</option>
+	      		<option value="40">40</option>
+	      		<option value="50">50</option>
+	      		<option value="100">100</option>
+	        </select>
+	      </th>
+	    </tr>
+	</tfoot>
+	<tbody>
+	</tbody>
+</table>
+
+	
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -rac6c077d83ef253fa3f07a515edc49077317029a -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision ac6c077d83ef253fa3f07a515edc49077317029a)
+++ lams_tool_vote/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -1,85 +1,89 @@
-<%
-	 /****************************************************************
-	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-	 * =============================================================
-	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
-	 * 
-	 * This program is free software; you can redistribute it and/or modify
-	 * it under the terms of the GNU General Public License version 2.0
-	 * as published by the Free Software Foundation.
-	 * 
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 * 
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-	 * USA
-	 * 
-	 * http://www.gnu.org/licenses/gpl.txt
-	 * ****************************************************************
-	 */
-
-	/**
-	 * Tab.tag
-	 *	Author: Mitchell Seaton
-	 *	Description: Creates a tab element.
-	 * Wiki: 
-	 */
-%>
-<%@ tag body-content="empty"%>
-<%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="value" required="false" rtexprvalue="true"%>
-<%@ attribute name="key" required="false" rtexprvalue="true"%>
-<%@ attribute name="inactive" required="false" rtexprvalue="true"%>
-<%@ attribute name="methodCall" required="false" rtexprvalue="true"%>
-
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
-<%@ taglib uri="tags-lams" prefix="lams"%>
-
-<%-- Check if  bundle is set --%>
-<c:if test="${not empty bundle}">
-	<fmt:setBundle basename="${bundle}"/>
-</c:if>
-
-<c:set var="lams">
-	<lams:LAMSURL />
-</c:set>
-
-<c:set var="tabTitle" value="${value}" />
-
-<%--
-	Usually methodCall is selectTab, but the calling code can override methodCall if desired.
-	this is handy if the page needs different logic on initialisation and user switching tabs
---%>
-
-<c:if test="${methodCall == null}">
-	<c:choose>
-		<c:when test="${dControl}">
-			<c:set var="methodCall" value="doSelectTab" />
-		</c:when>
-		<c:otherwise>
-			<c:set var="methodCall" value="selectTab" />
-		</c:otherwise>
-	</c:choose>
-</c:if>
-
-<c:if test="${key != null && value == null}">
-	<c:set var="tabTitle">
-		<fmt:message key="${key}" />
-	</c:set>
-</c:if>
-
-<div class="nav-box">
-	<div class="tab-left" id="tab-left-${id}"></div>
-	<div class="tab-middle" id="tab-middle-${id}">
-		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#"
-			onclick="${methodCall}(${id});return false;">
-			${tabTitle}
-		</a>
-	</div>
-	<div class="tab-right" id="tab-right-${id}"></div>
-</div>
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
+
+	/**
+	 * Tab.tag
+	 *	Author: Fiona Malikoff
+	 *	Description: Creates a tab element within the Hybrid Tab Header.
+	 * Wiki: 
+	 */
+%>
+<%@ tag body-content="empty"%>
+<%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="value" required="false" rtexprvalue="true"%>
+<%@ attribute name="key" required="false" rtexprvalue="true"%>
+<%@ attribute name="inactive" required="false" rtexprvalue="true"%>
+<%@ attribute name="methodCall" required="false" rtexprvalue="true"%>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%-- Check if  bundle is set --%>
+<c:if test="${not empty bundle}">
+	<fmt:setBundle basename="${bundle}"/>
+</c:if>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+
+<c:set var="tabTitle" value="${value}" />
+
+<%--
+	Usually methodCall is selectTab, but the calling code can override methodCall if desired.
+	this is handy if the page needs different logic on initialisation and user switching tabs
+	
+	-- 			onclick="${methodCall}(${id});return false;">
+	
+--%>
+
+<c:if test="${methodCall == null}">
+	<c:choose>
+		<c:when test="${dControl}">
+			<c:set var="methodCall" value="doSelectTab" />
+		</c:when>
+		<c:otherwise>
+			<c:set var="methodCall" value="selectTab" />
+		</c:otherwise>
+	</c:choose>
+</c:if>
+
+<c:if test="${key != null && value == null}">
+	<c:set var="tabTitle">
+		<fmt:message key="${key}" />
+	</c:set>
+</c:if>
+
+<c:set var="class" value=""/>
+<c:if test="${id == 1}">
+	<c:set var="class">class="active"</c:set>
+</c:if>
+	
+<c:set var="disabled" value=""/>
+<c:if test="${inactive}">
+	<c:set var="class">class="disabled"</c:set>
+</c:if>
+
+<li role="presentation" ${class}><a href="#t${id}" aria-controls="t${id}" role="tab" onclick="${methodCall}(${id});return false;">${tabTitle}</a></li>
Index: lams_tool_vote/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_tool_vote/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -1,52 +1,44 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-/**
- * TabBody.tag
- *	Author: Mitchell Seaton
- *	Description: Creates the body container for a tab element
- * Wiki: 
- */
-
-		%>
-<%@ tag body-content="scriptless"%>
-<%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="page" required="false" rtexprvalue="true"%>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
-
-<!-- begin tab content -->
-<div class="box" id="tabbody${id}">
-	<c:choose>
-		<c:when test="${page != null}">
-			<jsp:include page="${page}" />
-		</c:when>
-		<c:otherwise>
-			<jsp:doBody />
-		</c:otherwise>
-	</c:choose>
-
-</div>
-<!-- end tab content -->
+<%/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * TabBody.tag
+ *	Author: Mitchell Seaton
+ *	Description: Creates the body container for a tab element
+ * Wiki: 
+ */
+
+%>
+<%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="page" required="false" rtexprvalue="true"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+
+<c:set var="class" value=""/>
+<c:if test="${id == 1}">
+	<c:set var="class">active</c:set>
+</c:if>
+
+<div role="tabpanel" class="tab-pane ${class}" id="t${id}"><jsp:include page="${page}"/></div>
Index: lams_tool_vote/web/WEB-INF/tags/TabBodyArea.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/TabBodyArea.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/TabBodyArea.tag	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -0,0 +1,39 @@
+<%/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * TabBodyArea.tag
+ *	Author: Fiona Malikoff
+ *	Description: Creates the panel body area for a nav bar screen
+ * Wiki: 
+ */
+
+%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+
+<div class="panel-body panel-monitor-body">
+	 <jsp:doBody />
+</div>
+
+</div> <!--  close tab opened in TabHeader -->
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tags/TabBodys.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/TabBodys.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/TabBodys.tag	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -0,0 +1,37 @@
+<%/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * TabBodys.tag
+ *	Author: Fiona Malikoff
+ *	Description: Create a tabbody list from nested TabBody tags.
+ * Wiki: 
+ */
+
+		%>
+<%@ tag body-content="scriptless"%>
+
+<!-- tab body holder table -->
+<div class="tab-content">
+	<jsp:doBody />
+</div>
Index: lams_tool_vote/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
+++ lams_tool_vote/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -1,59 +1,59 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-/**
- * TabName Tag
- *	Author: Mitchell Seaton
- *	Description: Shortens name that are too long to fit inside a tab
- */
-
-		%>
-<%@ tag body-content="scriptless" %>
-
-<%@ attribute name="url" required="true" rtexprvalue="true"%>
-<%@ attribute name="highlight" required="false" rtexprvalue="true" %>
-
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-function" prefix="fn"%>
-
-<c:set var="limit">12</c:set>
-<c:set var="fullname"><jsp:doBody/></c:set>
-<c:set var="titleValue" value=""/>
-
-<c:choose>
-	<c:when test="${fn:length(fullname) > limit}">
-			<c:set var="titleValue" value="${fullname}"/>
-			<c:set var="tabname" value="${fn:substring(fullname, 0, limit-2)}..."/>
-	</c:when>
-	<c:otherwise>
-		<c:set var="tabname" value="${fullname}"/>
-	</c:otherwise>
-</c:choose>
-
-<c:if test="${highlight eq true}">
-	<c:set var="classVar" value="tab-link-highlight" />
-</c:if>
-
-<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
-	<c:out value="${tabname}" escapeXml="false"/>	
+<%/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * TabName Tag
+ *	Author: Mitchell Seaton
+ *	Description: Shortens name that are too long to fit inside a tab
+ */
+
+		%>
+<%@ tag body-content="scriptless" %>
+
+<%@ attribute name="url" required="true" rtexprvalue="true"%>
+<%@ attribute name="highlight" required="false" rtexprvalue="true" %>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-function" prefix="fn"%>
+
+<c:set var="limit">12</c:set>
+<c:set var="fullname"><jsp:doBody/></c:set>
+<c:set var="titleValue" value=""/>
+
+<c:choose>
+	<c:when test="${fn:length(fullname) > limit}">
+			<c:set var="titleValue" value="${fullname}"/>
+			<c:set var="tabname" value="${fn:substring(fullname, 0, limit-2)}..."/>
+	</c:when>
+	<c:otherwise>
+		<c:set var="tabname" value="${fullname}"/>
+	</c:otherwise>
+</c:choose>
+
+<c:if test="${highlight eq true}">
+	<c:set var="classVar" value="tab-link-highlight" />
+</c:if>
+
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
+	<c:out value="${tabname}" escapeXml="false"/>	
 </a>
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tags/Tabs.tag
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_tool_vote/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -1,69 +1,92 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-/**
- * Tabs.tag
- *	Author: Mitchell Seaton
- *	Description: Create a tab list from a input collection or nested Tab tags.
- * Wiki: 
- */
-
-		%>
-<%@ tag body-content="scriptless"%>
-<%@ attribute name="collection" type="java.util.Collection" required="false" rtexprvalue="true"%>
-<%@ attribute name="control" required="false" rtexprvalue="true"%>
-<%@ attribute name="useKey" required="false" rtexprvalue="true"%>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-lams" prefix="lams"%>
-<c:set var="dControl" value="false" scope="request" />
-<c:if test="${control}">
-	<c:set var="dControl" value="${control}" scope="request" />
-</c:if>
-
-<c:set var="dUseKey" value="false" scope="request" />
-<c:if test="${useKey}">
-	<c:set var="dUseKey" value="${useKey}" scope="request" />
-</c:if>
-
-<!-- tab holder table -->
-<div id="nav">
-	<c:choose>
-		<c:when test="${collection != null}">
-			<c:set var="count" value="0" />
-			<c:forEach var="tab" begin="0" items="${collection}">
-				<c:set var="count" value="${count+1}" />
-				<c:choose>
-					<c:when test="${dUseKey}">
-						<lams:Tab id="${count}" key="${tab}" />
-					</c:when>
-					<c:otherwise>
-						<lams:Tab id="${count}" value="${tab}" />
-					</c:otherwise>
-				</c:choose>
-			</c:forEach>
-		</c:when>
-		<c:otherwise>
-			<jsp:doBody />
-		</c:otherwise>
-	</c:choose>
-</div>
+<%/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * Tabs.tag
+ *	Author: Fiona Malikoff
+ *	Description: Create a hybrid panel header that contains a nav bar that acts like tabs.
+ */
+
+%>
+<%@ attribute name="control" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refreshOnClickAction" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpModule" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<c:set var="useActions" value="false" scope="request" />
+<c:if test="${not empty helpToolSignature or not empty helpModule or not empty refreshOnClickAction or not empty extraControl}">
+	<c:set var="useActions" value="true" scope="request" />
+</c:if>
+
+<c:set var="dControl" value="false" scope="request" />
+<c:if test="${control}">
+	<c:set var="dControl" value="${control}" scope="request" />
+</c:if>
+
+<!-- navbar combined with tabs -->
+<div class="panel panel-default panel-monitor-page">
+<div class="panel-heading navbar-heading">
+
+ 	<nav class="navbar navbar-default navbar-heading">
+	<div class="container-fluid">
+    	<!-- Brand and toggle get grouped for better mobile display -->
+		<div class="navbar-header">
+	      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1" aria-expanded="false">
+	        <span class="sr-only">Toggle navigation</span>
+	        <span class="icon-bar"></span>
+	        <span class="icon-bar"></span>
+	        <span class="icon-bar"></span>
+	      </button>
+	      <span class="navbar-brand">${title}</span>
+		</div>
+		<div class="collapse navbar-collapse" id="navbar-collapse-1" role="navigation">
+         <ul class="nav navbar-nav" id="page-tabs">
+	         <li role="separator" class="divider"></li>
+	          <jsp:doBody />
+         </ul>
+         <c:if test="${useActions}">
+         <ul class="nav navbar-nav navbar-right" id="page-actions">
+		     <li role="separator" class="divider"></li>
+		     <c:if test="${not empty refreshOnClickAction}">
+             <li class="navbar-text" ><span onclick="${refreshOnClickAction}"><i class="fa fa-refresh"></i></span></li>
+             </c:if>
+             <c:if test="${not empty helpToolSignature or not empty helpModule}">
+             <li class="navbar-text" ><lams:help toolSignature="${helpToolSignature}" module="${helpModule}" style="small"/></li>
+             </c:if>
+             <c:if test="${not empty extraControl}">
+             <li class="navbar-text" >${extraControl}</li>
+             </c:if>
+         </ul>
+         </c:if>
+ 	    
+ 		</div>
+	 </div>
+     </nav>
+     <!-- /top nav -->
+</div>
+<!-- panel div closed by TabBodyArea -->
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -r613f0d0d76eb497ed58d7e6836eda34a245425a9 -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 613f0d0d76eb497ed58d7e6836eda34a245425a9)
+++ lams_tool_vote/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -41,7 +41,9 @@
 	<lams:WebAppURL />
 </c:set>
 
-<lams:css style="main"/>
+<lams:css/>
 
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
Index: lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f940a9f66e9fc53d5c13d69fc716c4e7675a19e -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f940a9f66e9fc53d5c13d69fc716c4e7675a19e)
+++ lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -178,7 +178,7 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+      
       <attribute>
          <description>Output stylesheet based on the user preferences.</description>
          <name>style</name>
@@ -408,18 +408,34 @@
        <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>TabName</name>
        <path>/WEB-INF/tags/TabName.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>CKEditor</name>
        <path>/WEB-INF/tags/CKEditor.tag</path>
    	</tag-file>
    	<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>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
@@ -438,8 +454,24 @@
    	<tag-file>
 	    <name>Page</name>
 		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>
+   	<tag-file>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>    
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
    	</tag-file>  
    	<tag-file>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
@@ -481,5 +513,13 @@
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
 	</tag-file>
+   	<tag-file>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+   	</tag-file>
 
 </taglib>
Index: lams_tool_vote/web/authoring/AdvancedContent.jsp
===================================================================
diff -u -r96866054a8598fbe1b6719c40ea9a5ed898f5daf -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 96866054a8598fbe1b6719c40ea9a5ed898f5daf)
+++ lams_tool_vote/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -7,75 +7,73 @@
 	<lams:WebAppURL />
 </c:set>
 
-<p>
-	<html:checkbox property="useSelectLeaderToolOuput" value="1" styleId="useSelectLeaderToolOuput" styleClass="noBorder">
-	</html:checkbox>
+<div class="checkbox">
 	<label for="useSelectLeaderToolOuput">
-		<fmt:message key="label.use.select.leader.tool.output" />
+	<html:checkbox property="useSelectLeaderToolOuput" value="1" styleId="useSelectLeaderToolOuput">
+	</html:checkbox>
+	<fmt:message key="label.use.select.leader.tool.output" />
 	</label>
-</p>
+</div>
 
-<p>
-	<html:checkbox property="lockOnFinish" value="1" styleClass="noBorder" styleId="lockOnFinish">
-	</html:checkbox>
+<div class="checkbox">
 	<label for="lockOnFinish">
-		<fmt:message key="label.vote.lockedOnFinish" />
+	<html:checkbox property="lockOnFinish" value="1" styleId="lockOnFinish">
+	</html:checkbox>
+	<fmt:message key="label.vote.lockedOnFinish" />
 	</label>
-</p>
+</div>
 
-<p>
-	<html:checkbox property="allowText" value="1" styleClass="noBorder" styleId="allowText" onchange="changeMinMaxVotes(-1, -1);">
-	</html:checkbox>
+<div class="checkbox">
 	<label for="allowText">
-		<fmt:message key="label.allowText" />
+	<html:checkbox property="allowText" value="1" styleId="allowText" onchange="changeMinMaxVotes(-1, -1);">
+	</html:checkbox>
+	<fmt:message key="label.allowText" />
 	</label>
-</p>
+</div>
 
-<p>
-	<fmt:message key="label.maxNomCount" />&nbsp;
-	<html:select property="maxNominationCount" styleId="maxNominationCount">
-	</html:select>	
-</p>
+<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>
 
-<p>
-	<fmt:message key="label.minNomCount" />&nbsp;&nbsp;
-	<html:select property="minNominationCount" styleId="minNominationCount">
-	</html:select>	
-</p>
+<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>
 
 <c:if test="${not empty voteGeneralAuthoringDTO.dataFlowObjectNames}">
-	<p>
-		<label for="maxInputs">
-		<fmt:message key="label.advanced.data.flow.limit" /></label>
-		<html:select property="maxInputs" styleId="maxInputs">
+	<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>
-	</p>
+		<label for="maxInputs">
+		<fmt:message key="label.advanced.data.flow.limit" /></label>
+	</div>
 </c:if>
 
-<p>
-	<html:checkbox property="showResults" value="1" styleClass="noBorder" styleId="showResults">
-	</html:checkbox>
+<div class="checkbox">
 	<label for="showResults">
-		<fmt:message key="label.show.results" />
+	<html:checkbox property="showResults" value="1" styleId="showResults">
+	</html:checkbox>
+	<fmt:message key="label.show.results" />
 	</label>
-</p>
+</div>
 
-<p>
-	<html:checkbox property="reflect" value="1" styleClass="noBorder" styleId="reflect">
-	</html:checkbox>
+<div class="checkbox">
 	<label for="reflect">
-		<fmt:message key="label.reflect" />
+	<html:checkbox property="reflect" value="1" styleId="reflect">
+	</html:checkbox>
+	<fmt:message key="label.reflect" />
 	</label>
-</p>
-<p>
-	<html:textarea cols="30" rows="3" property="reflectionSubject" styleId="reflectInstructions"></html:textarea>
-</p>
+</div>
+<div class="form-group">
+	<html:textarea rows="3" property="reflectionSubject" styleId="reflectInstructions" styleClass="form-control"></html:textarea> 
+</div>
 
 <script type="text/javascript">
 <!--
Index: lams_tool_vote/web/authoring/AuthoringMaincontent.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/authoring/AuthoringMaincontent.jsp	(.../AuthoringMaincontent.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_vote/web/authoring/AuthoringMaincontent.jsp	(.../AuthoringMaincontent.jsp)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -7,22 +7,13 @@
 <%@ page import="java.util.Set" %>
 <%@ page import="org.lamsfoundation.lams.tool.vote.VoteAppConstants"%>
 
-    <% 
-		Set tabs = new LinkedHashSet();
-		tabs.add("label.basic");
-		tabs.add("label.advanced");
-		pageContext.setAttribute("tabs", tabs);
-	%>
-
 	<lams:html>
 	<lams:head>
-	<title> <fmt:message key="activity.title"/>  </title>
+		<title> <fmt:message key="activity.title"/>  </title>
+		<lams:headItems/>
 
-	<%@ include file="/common/tabbedheader.jsp"%>
-	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
-
 	<script type="text/javascript">
-		var noneDataFlowSelectedPreviously = null;
+ 		var noneDataFlowSelectedPreviously = null;
 		
         function init(){
 	    	var tag = document.getElementById("currentTab");
@@ -111,51 +102,54 @@
 			document.VoteAuthoringForm.uuid.value=uuid; 
 			submitMethod(actionMethod);
 		}
-
+ 
 	</script>
 	
 </lams:head>
-<body class="stripes" onLoad="init();">
+<body class="stripes" ><!-- onLoad="init();" -->
 
-<div id="page">
-	<h1> <fmt:message key="label.authoring.vote"/> </h1>
-	
-	<div id="header">			
-		<lams:Tabs collection="${tabs}" useKey="true" control="true"/>								
-	</div>
-	
-	<div id="content">	
-		<html:form  styleId="authoringForm" action="/authoring?validate=false" enctype="multipart/form-data" method="POST" target="_self">
+	<html:form  styleId="authoringForm" action="/authoring?validate=false" enctype="multipart/form-data" method="POST" target="_self">
 		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 		<html:hidden property="dispatch" value="submitAllContent"/>
 		<html:hidden property="toolContentID"/>
 		<html:hidden property="currentTab" styleId="currentTab" />
 		<html:hidden property="httpSessionID"/>									
 		<html:hidden property="contentFolderID"/>
 		<input type="hidden" name="mode" value="${mode}">
+
+
+		<c:set var="title"><fmt:message key="activity.title" /></c:set>
+		<lams:Page title="${title}" type="navbar">
 		
-		<%@ include file="/common/messages.jsp"%>
-		
-		<lams:help toolSignature="<%= VoteAppConstants.MY_SIGNATURE %>" module="authoring"/>
-					
-			<lams:TabBody id="1" titleKey="label.basic" page="BasicContent.jsp"/>
-			      
-			<lams:TabBody id="2" titleKey="label.advanced" page="AdvancedContent.jsp" />
+			 <lams:Tabs control="true" title="${title}" helpToolSignature="<%= VoteAppConstants.MY_SIGNATURE %>" helpModule="authoring">
+                  <lams:Tab id="1" key="label.basic" />
+                  <lams:Tab id="2" key="label.advanced" />
+	         </lams:Tabs>   
 
-			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lavote11" 
+			<lams:TabBodyArea>
+				<%@ include file="/common/messages.jsp"%>
+              
+                <!--  Set up tabs  -->
+                 <lams:TabBodys>
+    				<lams:TabBody id="1" titleKey="label.basic" page="BasicContent.jsp"/>
+					<lams:TabBody id="2" titleKey="label.advanced" page="AdvancedContent.jsp" />
+                </lams:TabBodys>
+  	
+  				<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lavote11" 
 				cancelButtonLabelKey="label.cancel" saveButtonLabelKey="label.save" toolContentID="${formBean.toolContentID}" 
 				contentFolderID="${formBean.contentFolderID}" accessMode="${mode}" defineLater="${mode=='teacher'}"/>
+			</lams:TabBodyArea>
 			
-		</html:form>
-	</div>
+			<div id="footer"></div>
 
-	<div id="footer"></div>
-	</div>
+		</lams:Page>
 
+	</html:form>
+
 	<script type="text/javascript">
 		<c:if test="${ not empty formBean.maxNominationCount }"> 			
 			changeMinMaxVotes(${formBean.maxNominationCount}, ${formBean.minNominationCount});
-		</c:if>
+		</c:if> 
 	</script>
 
 </body>
Index: lams_tool_vote/web/authoring/BasicContent.jsp
===================================================================
diff -u -rfb9d13eb115f5281b03ab1624ec10a22ba3b81b7 -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision fb9d13eb115f5281b03ab1624ec10a22ba3b81b7)
+++ lams_tool_vote/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -9,33 +9,16 @@
 
 <script type="text/javascript">
 <!-- Common Javascript functions for LAMS -->
-	/**
-	 * Launches the popup window for the instruction files
-	 */
-	function showMessage(url) {
-		var area=document.getElementById("messageArea");
-		if(area != null){
-			area.style.width="100%";
-			area.src=url;
-			area.style.display="block";
-		}
-		var elem = document.getElementById("saveCancelButtons");
-		if (elem != null) {
-			elem.style.display="none";
-		}
-		location.hash = "messageArea";		
+
+ 	function showMessage(url) {
+		$("#messageArea").load(url, function() {
+			$(this).show();
+			$("#saveCancelButtons").hide();
+		});
 	}
 	function hideMessage(){
-		var area=document.getElementById("messageArea");
-		if(area != null){
-			area.style.width="0px";
-			area.style.height="0px";
-			area.style.display="none";
-		}
-		var elem = document.getElementById("saveCancelButtons");
-		if (elem != null) {
-			elem.style.display="block";
-		}
+		$("#messageArea").hide();
+		$("#saveCancelButtons").show();
 	}
 
 	function removeNomination(questionIndex){
@@ -61,48 +44,29 @@
 			}
 			noneDataFlowSelectedPreviously = document.getElementById("dataFlowNoneOption").selected;
 		}
-	}
+	} 
 
-	function resizeOnMessageFrameLoad(){
-		var messageAreaFrame = document.getElementById("messageArea");
-		messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
-	}
-
 </script>
 
 <html:hidden property="questionIndex" />
 
-<table cellpadding="0">
+<div class="form-group">
+    <label for="title"><fmt:message key="label.authoring.title.col"/></label>
+    <html:text property="title" styleClass="form-control"></html:text>
+</div>
+<div class="form-group">
+    <label for="instructions"><fmt:message key="label.authoring.instructions.col" /></label>
+	<lams:CKEditor id="instructions" value="${voteGeneralAuthoringDTO.activityInstructions}"
+		contentFolderID="${voteGeneralAuthoringDTO.contentFolderID}"></lams:CKEditor>
+</div>
 
-	<tr>
-		<td colspan="2">
-			<div class="field-name">
-				<fmt:message key="label.authoring.title.col"></fmt:message>
-			</div>
-			<html:text property="title" style="width: 100%;"></html:text>
-		</td>
-	</tr>
-
-
-	<tr>
-		<td colspan="2">
-			<div class="field-name">
-				<fmt:message key="label.authoring.instructions.col"></fmt:message>
-			</div>
-			<lams:CKEditor id="instructions"
-				value="${voteGeneralAuthoringDTO.activityInstructions}"
-				contentFolderID="${voteGeneralAuthoringDTO.contentFolderID}"></lams:CKEditor>
-		</td>
-	</tr>
-</table>
-
 <div id="resourceListArea">
 	<%@ include file="/authoring/itemlist.jsp"%>
 </div>
 
 <p>
 	<a href="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newNominationBox&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&minNominationCount=${voteGeneralAuthoringDTO.minNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}"/>');"
-			class="button-add-item"> 
+			class="btn btn-default btn-sm"><i class="fa fa-plus"></i>&nbsp;
 		<fmt:message key="label.add.new.nomination" /> 
 	</a>
 	
@@ -117,11 +81,4 @@
 	</c:if>
 </p>
 
-<p>
-	<iframe
-		onload="javascript:resizeOnMessageFrameLoad()"
-		id="messageArea" name="messageArea"
-		style="width:0px;height:0px;border:0px;display:none" frameborder="no"
-		scrolling="no">
-	</iframe>
-</p>
+<div id="messageArea" name="messageArea" class="voffset10"></div>
Index: lams_tool_vote/web/authoring/editNominationBox.jsp
===================================================================
diff -u -r613f0d0d76eb497ed58d7e6836eda34a245425a9 -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/authoring/editNominationBox.jsp	(.../editNominationBox.jsp)	(revision 613f0d0d76eb497ed58d7e6836eda34a245425a9)
+++ lams_tool_vote/web/authoring/editNominationBox.jsp	(.../editNominationBox.jsp)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -2,23 +2,18 @@
 <lams:html>
 	<lams:head>
 		<%@ include file="/common/header.jsp"%>
-		<lams:css style="main" />
-		
-		<script type="text/javascript">			
-			$(function() {
-				//change size of an iframe on ckeditor's autogrow 
-				CKEDITOR.instances.newNomination.on("instanceReady", function(e) {
-				    e.editor.on('resize', function(reEvent){
-				    	var iframe = window.parent.document.getElementById("messageArea");
-				    	iframe.style.height = eval(iframe.contentWindow.document.body.scrollHeight) + 'px';
-				    });
-				});
-			});
-		</script>
+		<script type="text/javascript" src="${tool}includes/javascript/authoring.js"></script>
 	</lams:head>
 
 	<body>
 
+		<div class="panel panel-default add-file">
+		<div class="panel-heading panel-title">
+			<fmt:message key="label.edit.nomination"></fmt:message>
+		</div>
+		
+		<div class="panel-body">
+
 		<html:form action="/authoring?validate=false" styleId="newNominationForm" enctype="multipart/form-data" method="POST">
 
 			<html:hidden property="dispatch" value="saveSingleNomination" />
@@ -29,27 +24,23 @@
 			<html:hidden property="editableNominationIndex" />
 			<html:hidden property="editNominationBoxRequest" value="true" />
 
-			<div class="field-name">
-				<fmt:message key="label.edit.nomination"></fmt:message>
+			<div class="form-group">
+				<lams:CKEditor id="newNomination"
+					value="${voteGeneralAuthoringDTO.editableNominationText}"   
+					contentFolderID="${voteGeneralAuthoringDTO.contentFolderID}">
+				</lams:CKEditor>
 			</div>
-
-			<lams:CKEditor id="newNomination"
-				value="${voteGeneralAuthoringDTO.editableNominationText}"   
-                height="370px" width="99%"
-				contentFolderID="${voteGeneralAuthoringDTO.contentFolderID}"
-				resizeParentFrameName="messageArea">
-			</lams:CKEditor>
 			
-			<lams:ImgButtonWrapper>
-				<a href="#" onclick="getElementById('newNominationForm').submit();"
-					class="button-add-item"> <fmt:message
-						key="label.save.nomination" /> </a>
-
-				<a href="#" onclick="javascript:window.parent.hideMessage()"
-					class="button space-left"> <fmt:message key="label.cancel" /> </a>
-			</lams:ImgButtonWrapper>
-			
+			<div class="voffset5">
+				<a href="#" onclick="javascript:submitNomination()" class="btn btn-default btn-sm">
+					<i class="fa fa-plus"></i>&nbsp; <fmt:message key="label.save.nomination" /> </a>
+				<a href="#" onclick="javascript:hideMessage()"
+				class="btn btn-default btn-sm"> <fmt:message key="label.cancel" /></a>
+			</div>
+					
 		</html:form>
+		</div>
+		</div>
 
 	</body>
 </lams:html>
Index: lams_tool_vote/web/authoring/itemlist.jsp
===================================================================
diff -u -r21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59 -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59)
+++ lams_tool_vote/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -1,13 +1,16 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
+
 <div id="itemList">
-	<h2 class="spacer-left">
+
+<div class="panel panel-default voffset5">
+	<div class="panel-heading panel-title">
 		<fmt:message key="label.vote.nominations" />
-		<img src="${ctxPath}/images/indicator.gif" style="display:none" id="resourceListArea_Busy" />
-	</h2>
+		<i class="fa fa-spinner" style="display: none" id="resourceListArea_Busy"></i>
+	</div>
 
 	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-	<table id="itemTable" class="alternative-color" cellspacing="0">
+
+	<table class="table table-striped table-condensed" id="itemTable">
 		<c:set var="queIndex" scope="request" value="0" />
 
 		<c:forEach items="${listQuestionDTO}" var="currentDTO" varStatus="status">
@@ -19,80 +22,45 @@
 			</c:if>
 			
 			<tr>
-				<td width="10%" class="field-name align-right">
-					<fmt:message key="label.nomination" />
-				</td>
-
-				<td width="60%" align="left">
+				<td>
 					<c:out value="${question}" escapeXml="false" />
 				</td>
 
-				<td width="10%" class="align-right">
+				<td class="arrows" style="width:5%">
 					<c:if test="${fn:length(listQuestionDTO) != 1}">
-
-						<c:if test="${queIndex == 1}">
-							<img src="<c:out value="${tool}"/>images/down.gif" border="0"
-								title="<fmt:message key='label.tip.moveNominationDown'/>"
-								onclick="javascript:submitModifyAuthoringNomination('<c:out value="${queIndex}"/>','moveNominationDown');">
-							<img src="<c:out value="${tool}"/>images/up_disabled.gif"
-								border="0">
+						<c:if test="${queIndex != 1}">
+							<lams:Arrow state="up" title="<fmt:message key='label.tip.moveNominationUp'/>" 
+								onclick="javascript:submitModifyAuthoringNomination('${queIndex}','moveNominationUp');"/>
 						</c:if>
 
-						<c:if test="${queIndex == fn:length(listQuestionDTO)}">
-							<img src="<c:out value="${tool}"/>images/down_disabled.gif"
-								border="0">
-							<img src="<c:out value="${tool}"/>images/up.gif" border="0"
-								title="<fmt:message key='label.tip.moveNominationUp'/>"
-								onclick="javascript:submitModifyAuthoringNomination('<c:out value="${queIndex}"/>','moveNominationUp');">
-						</c:if>
-
-						<c:if
-							test="${(queIndex != 1)  && (queIndex != fn:length(listQuestionDTO))}">
-							<img src="<c:out value="${tool}"/>images/down.gif" border="0"
-								title="<fmt:message key='label.tip.moveNominationDown'/>"
-								onclick="javascript:submitModifyAuthoringNomination('<c:out value="${queIndex}"/>','moveNominationDown');">
-							<img src="<c:out value="${tool}"/>images/up.gif" border="0"
-								title="<fmt:message key='label.tip.moveNominationUp'/>"
-								onclick="javascript:submitModifyAuthoringNomination('<c:out value="${queIndex}"/>','moveNominationUp');">
-						</c:if>
-
+						<c:if test="${queIndex != fn:length(listQuestionDTO)}">
+							<lams:Arrow state="down" title="<fmt:message key='label.tip.moveNominationDown'/>" 
+								onclick="javascript:submitModifyAuthoringNomination('${queIndex}','moveNominationDown');"/>						
+						</c:if>							
 					</c:if>
 				</td>
 
-				<td width="10%" class="align-right">
-					<img src="<c:out value="${tool}"/>images/edit.gif" border="0"
-						title="<fmt:message key='label.tip.editNomination'/>"
+				<td align="center" style="width:5%"><i class="fa fa-pencil"	title="<fmt:message key="label.tip.editNomination" />"
 						onclick="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newEditableNominationBox&questionIndex=${queIndex}&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&minNominationCount=${voteGeneralAuthoringDTO.minNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}"/>');">
+						</i>
 				</td>
 
-				<td width="10%" class="align-right">
-					<img src="<c:out value="${tool}"/>images/delete.gif" border="0"
-						title="<fmt:message key='label.tip.deleteNomination'/>"
-						onclick="removeNomination(${queIndex});">
+				<td  align="center" style="width:5%"><i class="fa fa-times"	title="<fmt:message key="label.tip.deleteNomination" />"
+						onclick="removeNomination(${queIndex});"></i>
 				</td>
+
 			</tr>
 		</c:forEach>
 
 	</table>
 </div>
-<%-- This script will works when a new resoruce item submit in order to refresh "Resource List" panel. --%>
-<script lang="javascript">
-	var win = null;
-	try {
-		if (window.parent && window.parent.hideMessage) {
-			win = window.parent;
-		} else if (window.top && window.top.hideMessage) {
-			win = window.top;
-		}
-	} catch(err) {
-		// mute cross-domain iframe access errors
-	}
-	if (win) {
-		win.hideMessage();
-		var obj = win.document.getElementById('resourceListArea');
-		obj.innerHTML= document.getElementById("itemList").innerHTML;
-        
-        win.changeMinMaxVotes(-1, -1);
-	}
-</script>
 
+</div> 
+
+<%-- This script will works when a new resource item submit in order to refresh "Resource List" panel. --%>
+<script lang="javascript">
+	hideMessage();
+	var obj = document.getElementById('resourceListArea');
+	obj.innerHTML= document.getElementById("itemList").innerHTML;
+   	changeMinMaxVotes(-1, -1);
+</script>
\ No newline at end of file
Index: lams_tool_vote/web/authoring/newNominationBox.jsp
===================================================================
diff -u -r613f0d0d76eb497ed58d7e6836eda34a245425a9 -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/authoring/newNominationBox.jsp	(.../newNominationBox.jsp)	(revision 613f0d0d76eb497ed58d7e6836eda34a245425a9)
+++ lams_tool_vote/web/authoring/newNominationBox.jsp	(.../newNominationBox.jsp)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -4,22 +4,18 @@
 <lams:html>
 	<lams:head>
 		<%@ include file="/common/header.jsp"%>
-		<lams:css style="main" />
-		
-		<script type="text/javascript">			
-			$(function() {
-				//change size of an iframe on ckeditor's autogrow 
-				CKEDITOR.instances.newNomination.on("instanceReady", function(e) {
-				    e.editor.on('resize', function(reEvent){
-				    	var iframe = window.parent.document.getElementById("messageArea");
-				    	iframe.style.height = eval(iframe.contentWindow.document.body.scrollHeight) + 'px';
-				    });
-				});
-			});
-		</script>
+		<script type="text/javascript" src="${tool}includes/javascript/authoring.js"></script>
 	</lams:head>
 
 	<body>
+	
+		<div class="panel panel-default add-file">
+		<div class="panel-heading panel-title">
+			<fmt:message key="label.add.new.nomination"></fmt:message>
+		</div>
+		
+		<div class="panel-body">
+
 		<html:form action="/authoring?validate=false" styleId="newNominationForm" enctype="multipart/form-data" method="POST">
 			<html:hidden property="dispatch" value="addSingleNomination" />
 			<html:hidden property="toolContentID" />
@@ -28,26 +24,24 @@
 			<html:hidden property="contentFolderID" />
 			<html:hidden property="editNominationBoxRequest" value="false" />
 
-			<div class="field-name">
-				<fmt:message key="label.add.new.nomination"></fmt:message>
+			<div class='form-group'>
+				<lams:CKEditor id="newNomination"
+					value="${voteGeneralAuthoringDTO.editableNominationText}"
+					contentFolderID="${voteGeneralAuthoringDTO.contentFolderID}">
+				</lams:CKEditor>
 			</div>
-			<lams:CKEditor id="newNomination"
-				value="${voteGeneralAuthoringDTO.editableNominationText}"
-				contentFolderID="${voteGeneralAuthoringDTO.contentFolderID}"
-                height="370px" width="99%"
-				resizeParentFrameName="messageArea">
-			</lams:CKEditor>
 			
-			<lams:ImgButtonWrapper>
-				<a href="#" onclick="document.getElementById('newNominationForm').submit();"
-					class="button-add-item"> <fmt:message
-						key="label.save.nomination" /> </a>
-
-				<a href="#" onclick="javascript:window.parent.hideMessage()"
-					class="button space-left"> <fmt:message key="label.cancel" />
-				</a>
-			</lams:ImgButtonWrapper>
-
+			<div class="voffset5">
+				<a href="#" onclick="javascript:submitNomination()" class="btn btn-default btn-sm">
+					<i class="fa fa-plus"></i>&nbsp; <fmt:message key="label.save.nomination" /> </a>
+				<a href="#" onclick="javascript:hideMessage()"
+				class="btn btn-default btn-sm"> <fmt:message key="label.cancel" /></a>
+			</div>
+			
 		</html:form>
+		
+		</div>
+		</div>
+		
 	</body>
 </lams:html>
Index: lams_tool_vote/web/common/header.jsp
===================================================================
diff -u -r5f940a9f66e9fc53d5c13d69fc716c4e7675a19e -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/common/header.jsp	(.../header.jsp)	(revision 5f940a9f66e9fc53d5c13d69fc716c4e7675a19e)
+++ lams_tool_vote/web/common/header.jsp	(.../header.jsp)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -7,12 +7,9 @@
 </c:set>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
 
-<lams:css />
+<lams:css/>
 
 <!-- ********************  javascript ********************** -->
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
 
 
Index: lams_tool_vote/web/common/monitorheader.jsp
===================================================================
diff -u -r81d3515d29fd57e3b9e08cc37481fd0becbd8b10 -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/common/monitorheader.jsp	(.../monitorheader.jsp)	(revision 81d3515d29fd57e3b9e08cc37481fd0becbd8b10)
+++ lams_tool_vote/web/common/monitorheader.jsp	(.../monitorheader.jsp)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -8,23 +8,27 @@
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
 
 <!-- ********************  CSS ********************** -->
-<c:choose>
-	<c:when test="${not empty localLinkPath}">
-		<lams:css localLinkPath="${localLinkPath}"/>
-	</c:when>
-	<c:otherwise>
-		<lams:css />
-	</c:otherwise>
-</c:choose>
+<lams:css />
 
 <!-- ********************  javascript ********************** -->
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-
-<link type="text/css" href="${lams}css/jquery.tablesorter.theme-blue.css" rel="stylesheet">
-<link type="text/css" href="${lams}css/jquery.tablesorter.pager.css" rel="stylesheet">
 <script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-widgets.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-pager.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.timepicker.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>  
+<script type="text/javascript" src="${lams}includes/javascript/d3.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/chart.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
 
+<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap.css">
+<link type="text/css" href="${lams}css/jquery.tablesorter.pager.css" rel="stylesheet">
+
+<link type="text/css" href="${lams}/css/jquery-ui-smoothness-theme.css" rel="stylesheet">
+<link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet">
+<link type="text/css" href="${lams}/css/chart.css" rel="stylesheet">
+
+
Index: lams_tool_vote/web/common/tabbedheader.jsp
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_tool_vote/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -7,8 +7,7 @@
 </c:set>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
 
-<lams:css  style="main"/>
+<lams:css/>
 
 <!-- ********************  javascript ********************** -->
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
Index: lams_tool_vote/web/includes/javascript/authoring.js
===================================================================
diff -u
--- lams_tool_vote/web/includes/javascript/authoring.js	(revision 0)
+++ lams_tool_vote/web/includes/javascript/authoring.js	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -0,0 +1,16 @@
+	function submitNomination(){
+		for (var i in CKEDITOR.instances) {
+       		CKEDITOR.instances[i].updateElement();
+		}
+		// after submit, it direct to itemlist.jsp, 
+		// then refresh "basic tab" resource list and close this window.
+	    $.ajax({ // create an AJAX call...
+			data: $("#newNominationForm").serialize(), 
+           	type: $("#newNominationForm").attr('method'),
+			url: $("#newNominationForm").attr('action'),
+			success: function(data) {
+               $('#messageArea').html(data);
+			}
+	    });
+	    
+	}
\ No newline at end of file
Index: lams_tool_vote/web/monitoring/AdvanceOptions.jsp
===================================================================
diff -u -r43437f9c52f60b4fe545162b3ed72e6ddf911777 -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/monitoring/AdvanceOptions.jsp	(.../AdvanceOptions.jsp)	(revision 43437f9c52f60b4fe545162b3ed72e6ddf911777)
+++ lams_tool_vote/web/monitoring/AdvanceOptions.jsp	(.../AdvanceOptions.jsp)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -1,15 +1,8 @@
-<h1 style="padding-bottom: 10px;">
-	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />
+<c:set var="adTitle"><fmt:message key="monitor.summary.th.advancedSettings" /></c:set>
+<lams:AdvancedAccordian title="${adTitle}">
+             
+<table class="table table-striped table-condensed">
 
-	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'),'<lams:LAMSURL/>');" >
-		<fmt:message key="monitor.summary.th.advancedSettings" />
-	</a>
-</h1>
-<br />
-
-<div class="monitoring-advanced" id="advancedDiv" style="display:none">
-<table class="alternative-color">
-
 	<tr>
 		<td>
 			<fmt:message key="label.use.select.leader.tool.output" />
@@ -122,4 +115,5 @@
 		</c:when>
 	</c:choose>
 </table>
-</div>
+
+</lams:AdvancedAccordian>
\ No newline at end of file
Index: lams_tool_vote/web/monitoring/AllSessionsSummary.jsp
===================================================================
diff -u -r81d3515d29fd57e3b9e08cc37481fd0becbd8b10 -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/monitoring/AllSessionsSummary.jsp	(.../AllSessionsSummary.jsp)	(revision 81d3515d29fd57e3b9e08cc37481fd0becbd8b10)
+++ lams_tool_vote/web/monitoring/AllSessionsSummary.jsp	(.../AllSessionsSummary.jsp)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -3,30 +3,51 @@
 <c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
 <c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
 
-<c:if test="${empty sessionDTOs}">
-	<h3><fmt:message key="error.noLearnerActivity"/></h3>
-</c:if>
+<div class="panel-group" id="accordionSessions" role="tablist" aria-multiselectable="false"> 
 
-<c:forEach var="sessionDto" items="${sessionDTOs}">
+<c:forEach var="sessionDto" items="${sessionDTOs}" varStatus="status">
 	<c:set var="sessionUid" value="${sessionDto.sessionUid}"/>
 	
-	<div class="space-bottom-top">
-	
 	<c:if test="${reflect && sessionUid ne 0}">			
 		<c:set var="viewReflectionsURL">
 			<lams:WebAppURL/>/monitoring/ReflectionViewer.jsp?sessionUid=${sessionUid}
 		</c:set>
 	</c:if>
 
-	<c:if test="${isGroupedActivity}">
-		<h1>
-			<c:out value="${sessionDto.sessionName}"/>
-		</h1>
-		<br>
-	</c:if>
-						
-	<table cellspacing="0" class="alternative-color">							
+	<c:set var="buttonbar">
+		<div class="pull-right">
+			<c:if test="${not empty viewReflectionsURL}">
+				<html:link href="javascript:launchPopup('${viewReflectionsURL}')" styleClass="btn btn-default btn-sm">
+					<fmt:message key="label.notebook.entries" />
+				</html:link>
+			</c:if>			
+			&nbsp;
+			<c:set var="chartURL" value="${tool}chartGenerator.do?currentSessionId=${sessionDto.toolSessionId}&toolContentID=${toolContentID}" />
+			<img src='<c:out value="${tool}"/>images/piechart.gif' 
+				title="<fmt:message key='label.tip.displayPieChart'/>"
+				style="cursor: pointer;" height="30" border="0"
+				onclick="javascript:drawChart('pie', 'chartDiv${sessionDto.toolSessionId}', '${chartURL}')">
+			&nbsp;
+			<img src='<c:out value="${tool}"/>images/columnchart.gif'
+				title="<fmt:message key='label.tip.displayBarChart'/>" 
+				style="cursor: pointer;" height="30" border="0"
+				onclick="javascript:drawChart('bar', 'chartDiv${sessionDto.toolSessionId}', '${chartURL}')">
+		</div>
+	</c:set>						
+		
+	<div class="panel panel-default" >
+       <div class="panel-heading " id="heading${sessionUid}">
+  	    	<span class="panel-title  collapsable-icon-left">
+  	    	<a class="${status.first ? '' : 'collapsed'}" role="button" data-toggle="collapse" href="#collapse${sessionUid}" 
+				aria-expanded="${status.first ? 'false' : 'true'}" aria-controls="collapse${sessionUid}" >
+		<c:out value="${sessionDto.sessionName}"/></a>
+		</span>  ${buttonbar}
+       </div>
+       
+       <div id="collapse${sessionUid}" class="panel-collapse collapse ${status.first ? 'in' : ''}" role="tabpanel" aria-labelledby="heading${sessionUid}">
 
+	<table class="table table-condensed table-striped">							
+
 		<tr>
 			<th><fmt:message key="label.nomination"/></th>
 			<th style="width: 90px;"><fmt:message key="label.total.votes"/></th>
@@ -36,7 +57,8 @@
 			<c:set var="questionUid" scope="request" value="${currentNomination.questionUid}"/>
 			<tr>
 				<td  valign=top class="align-left">
-					<c:out value="${currentNomination.nomination}" escapeXml="true"/>
+					<!-- Cannot escape as it was entered in a CKeditor -->
+					${currentNomination.nomination}
 				</td>
 						
 				<td  valign=top class="align-left">				  	 		
@@ -46,7 +68,7 @@
 					<a href="javascript:launchInstructionsPopup('<c:out value='${viewVotesURL}' escapeXml='false'/>')">
 						<c:out value="${currentNomination.numberOfVotes}"/>  
 					</a>
-					&nbsp(<fmt:formatNumber type="number" maxFractionDigits="2" value="${currentNomination.percentageOfVotes}" /><fmt:message key="label.percent"/>) 
+					&nbsp;(<fmt:formatNumber type="number" maxFractionDigits="2" value="${currentNomination.percentageOfVotes}" /><fmt:message key="label.percent"/>) 
 				</td>			
 			</tr>	
 		</c:forEach>	
@@ -70,31 +92,13 @@
 		</c:if>
 	</table>
 
-	<p class="float-right " style="margin-right: 8%;">
-
-		<c:set var="chartURL" value="${tool}chartGenerator.do?currentSessionId=${sessionDto.toolSessionId}&toolContentID=${toolContentID}" />
-		<img src='<c:out value="${tool}"/>images/piechart.gif' width="30"
-			title="<fmt:message key='label.tip.displayPieChart'/>"
-			style="cursor: pointer; height: 30px; border: none"
-			onclick="javascript:drawChart('pie', 'chartDiv${sessionDto.toolSessionId}', '${chartURL}')">
-
-		<img src='<c:out value="${tool}"/>images/columnchart.gif' width="30"
-			title="<fmt:message key='label.tip.displayBarChart'/>" 
-			style="cursor: pointer;" height="30" border="0"
-			onclick="javascript:drawChart('bar', 'chartDiv${sessionDto.toolSessionId}', '${chartURL}')">
+ 	<p id="chartDiv${sessionDto.toolSessionId}" style="height: 220px; display: none;"></p>
+ 
+	</div> <!-- end collapse area  -->
+	</div> <!-- end collapse panel  -->
+ 	${ ! status.last ? '<div class="voffset5">&nbsp;</div>' :  ''}
 	
-	<p class="float-right">
-		<c:if test="${not empty viewReflectionsURL}">
-			<html:link href="javascript:launchPopup('${viewReflectionsURL}')" styleClass="button">
-				<fmt:message key="label.notebook.entries" />
-			</html:link>
-		</c:if>			
-	</p>
-						
-	<p id="chartDiv${sessionDto.toolSessionId}" style="height: 220px; display: none;" class="space-bottom"></p>
-
-
-	</div>
-	
 </c:forEach>				
 
+</div> <!--  end panel group -->
+
Index: lams_tool_vote/web/monitoring/Edit.jsp
===================================================================
diff -u -r5cc196ca4ae3e17a6af1a633059f740562377cee -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/monitoring/Edit.jsp	(.../Edit.jsp)	(revision 5cc196ca4ae3e17a6af1a633059f740562377cee)
+++ lams_tool_vote/web/monitoring/Edit.jsp	(.../Edit.jsp)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -1,78 +1,35 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
 <c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 
-<table cellpadding="0">
-
+<table class="table table-condensed">
 	<tr>
-		<td colspan="2">
-			<div class="field-name">
-				<fmt:message key="label.authoring.title.col"></fmt:message>
-			</div>
-			<c:out value="${voteGeneralAuthoringDTO.activityTitle}" escapeXml="true"/> 								
-		</td>
+		<td width="15%"><fmt:message key="label.authoring.title.col"></fmt:message></td>
+		<td><c:out value="${voteGeneralAuthoringDTO.activityTitle}" escapeXml="true"/></td>
 	</tr>
 						
 	<tr>
-		<td colspan="2">
-			<div class="field-name">
-				<fmt:message key="label.authoring.instructions.col"></fmt:message>
-			</div>
-			<c:out value="${voteGeneralAuthoringDTO.activityInstructions}" escapeXml="false"/> 																	
-		</td>
+		<td><fmt:message key="label.authoring.instructions.col"></fmt:message></td>
+		<td><c:out value="${voteGeneralAuthoringDTO.activityInstructions}" escapeXml="false"/></td>
 	</tr>
 	
+<c:forEach items="${listQuestionDTO}" var="currentDTO" varStatus="status">
 	<tr>
-		<td colspan="2">
-			<div id="resourceListArea">
-			<div id="itemList">
-				<h2><fmt:message key="label.vote.nominations" />
-				<img src="${ctxPath}/images/indicator.gif" style="display:none" id="resourceListArea_Busy" /></h2>
-			
-				<table id="itemTable" style="align:left;width:650px" >
-				    <c:set var="queIndex" scope="request" value="0"/>
-				    
-				    <c:forEach items="${listQuestionDTO}" var="currentDTO" varStatus="status">
-						<c:set var="queIndex" scope="request" value="${queIndex +1}"/>
-						<c:set var="question" scope="request" value="${currentDTO.question}"/>
-						<c:set var="displayOrder" scope="request" value="${currentDTO.displayOrder}"/>	
-					
-						<tr>
-							<td width="10%" class="field-name align-right">
-								<fmt:message key="label.nomination" />:
-							</td>
-					
-							<td width="60%" align="left">
-								<c:out value="${question}" escapeXml="false"/> 
-							</td>
-					
-							<td width="10%" class="align-right">
-							</td>
-							
-							<td width="10%" class="align-right">
-							</td>
-					
-							<td width="10%" class="align-right">
-							</td>
-						</tr>
-					</c:forEach>
-				
-				</table>
-			</div>								
-			</div>
+		<td>
+			<fmt:message key="label.nomination" />:
 		</td>
-	</tr>
-
-	<tr>
-		<td colspan=2 class="align-right">
-			<c:url  var="authoringUrl" value="/authoringStarter.do">
-				<c:param name="toolContentID" value="${formBean.toolContentID}" />
-				<c:param name="contentFolderID" value="${formBean.contentFolderID}" />
-				<c:param name="mode" value="teacher" />
-			</c:url>
-			<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="button">
-				<fmt:message key="label.edit"/>
-			</html:link>
+		<td>
+			<c:out value="${currentDTO.question}" escapeXml="false"/> 
 		</td>
 	</tr>
+</c:forEach>
+
 </table>
+
+<c:url  var="authoringUrl" value="/authoringStarter.do">
+	<c:param name="toolContentID" value="${formBean.toolContentID}" />
+	<c:param name="contentFolderID" value="${formBean.contentFolderID}" />
+	<c:param name="mode" value="teacher" />
+</c:url>
+<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default">
+	<fmt:message key="label.edit"/>
+</html:link> 
Index: lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -r81d3515d29fd57e3b9e08cc37481fd0becbd8b10 -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 81d3515d29fd57e3b9e08cc37481fd0becbd8b10)
+++ lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -6,22 +6,12 @@
 <%@ page import="java.util.Set" %>
 <%@ page import="org.lamsfoundation.lams.tool.vote.VoteAppConstants"%>
 
-    <% 
-		Set tabs = new LinkedHashSet();
-		tabs.add("label.summary");
-		tabs.add("label.editActivity");
-		tabs.add("label.stats");
-		pageContext.setAttribute("tabs", tabs);
-	%>
-
-	<lams:html>
+<lams:html>
 	<lams:head>
-
+	
 	<title> <fmt:message key="label.monitoring"/> </title>
+	<%@ include file="/common/monitorheader.jsp"%>
 
-	<%@ include file="/common/tabbedheader.jsp"%>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-
 	<script type="text/javascript">
 	
 	   	var imgRoot="${lams}images/";
@@ -107,34 +97,37 @@
 </lams:head>
 <body class="stripes" onLoad="init();">
 
-	<div id="page">
-			<h1> <fmt:message key="label.monitoring"/> </h1>
-
-	<div id="header">
-		<lams:Tabs collection="${tabs}" useKey="true" control="true"/>
-	</div>	
-
-	<div id="content">						
-	    <html:form  action="/monitoring?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
+    <html:form  action="/monitoring?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
 		<html:hidden property="dispatch"/>
 		<html:hidden property="toolContentID"/>
 		<html:hidden property="httpSessionID"/>		
 		<html:hidden property="currentTab" styleId="currentTab" />
 		<html:hidden property="contentFolderID"/>
 		<html:hidden property="responseId"/>	 
 		<html:hidden property="currentUid"/>
-		
-		<lams:help toolSignature="<%= VoteAppConstants.MY_SIGNATURE %>" module="monitoring"/>
-		
-			<lams:TabBody id="1" titleKey="label.summary" page="SummaryContent.jsp"/>
-			<lams:TabBody id="2" titleKey="label.editActivity" page="Edit.jsp" />
-			<lams:TabBody id="3" titleKey="label.stats" page="Stats.jsp" />
-		</html:form>
-	</div>	
 
-	<div id="footer"></div>
+        <c:set var="title"><fmt:message key="activity.title" /></c:set>
+        <lams:Page title="${title}" type="navbar">
 
-	</div>
+         <lams:Tabs control="true" title="${title}" helpToolSignature="<%= VoteAppConstants.MY_SIGNATURE %>" helpModule="monitoring">
+            <lams:Tab id="1" key="label.summary" />
+            <lams:Tab id="2" key="label.editActivity" />
+            <lams:Tab id="3" key="label.stats" />
+         </lams:Tabs>
+   
+        <lams:TabBodyArea>
+        <lams:TabBodys>
+            <lams:TabBody id="1" titleKey="label.summary" page="SummaryContent.jsp"/>
+	 		<lams:TabBody id="2" titleKey="label.editActivity" page="Edit.jsp" />
+			<lams:TabBody id="3" titleKey="label.stats" page="Stats.jsp" />
+        </lams:TabBodys>
+        </lams:TabBodyArea>
+       
+        <div id="footer"></div>
+       
+        </lams:Page>
+            		
+	</html:form>
 	
 </body>
 </lams:html>
Index: lams_tool_vote/web/monitoring/OtherTextNominationViewer.jsp
===================================================================
diff -u -r81d3515d29fd57e3b9e08cc37481fd0becbd8b10 -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/monitoring/OtherTextNominationViewer.jsp	(.../OtherTextNominationViewer.jsp)	(revision 81d3515d29fd57e3b9e08cc37481fd0becbd8b10)
+++ lams_tool_vote/web/monitoring/OtherTextNominationViewer.jsp	(.../OtherTextNominationViewer.jsp)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -43,10 +43,11 @@
 			$(document).ready(function(){
 	    
 			$(".tablesorter").tablesorter({
-				theme: 'blue',
+				theme: 'bootstrap',
 			    sortInitialOrder: 'desc',
 	            sortList: [[0]],
-	            widgets: [ "resizable", "filter" ],
+	            headerTemplate : '{content} {icon}',
+	            widgets: [ "uitheme", "resizable", "filter" ],
 	            headers: { 2: { filter: false}, 3: { filter: false} }, 
 	            widgetOptions: {
 	            	resizable: true,
@@ -60,7 +61,12 @@
 		$(".tablesorter").each(function() {
 			$(this).tablesorterPager({
 				savePages: false,
-				<c:choose>
+	            container: $(this).find(".ts-pager"),
+	            output: '{startRow} to {endRow} ({totalRows})',
+	            cssPageDisplay: '.pagedisplay',
+	            cssPageSize: '.pagesize',
+	            cssDisabled: 'disabled',
+	            <c:choose>
 				<c:when test="${not empty param.sessionUid}">
 				ajaxUrl : "<lams:WebAppURL/>monitoring.do?dispatch=getOpenTextNominationsJSON&page={page}&size={size}&{sortList:column}&{filterList:fcol}&sessionUid=${param.sessionUid}&toolContentUID=${param.toolContentUID}",
 				</c:when><c:otherwise>
@@ -105,72 +111,34 @@
 						json.rows = $(rows);
 						return json;
 			    	}
-				},					
-			    container: $(this).next(".pager"),
-			    output: '{startRow} to {endRow} ({totalRows})',
-			    // css class names of pager arrows
-			    cssNext: '.tablesorter-next', // next page arrow
-				cssPrev: '.tablesorter-prev', // previous page arrow
-				cssFirst: '.tablesorter-first', // go to first page arrow
-				cssLast: '.tablesorter-last', // go to last page arrow
-				cssGoto: '.gotoPage', // select dropdown to allow choosing a page
-				cssPageDisplay: '.pagedisplay', // location of where the "output" is displayed
-				cssPageSize: '.pagesize', // page size selector - select dropdown that sets the "size" option
-				// class added to arrows when at the extremes (i.e. prev/first arrows are "disabled" when on the first page)
-				cssDisabled: 'disabled' // Note there is no period "." in front of this class name
+				}					
 			})
 		});
   	})
 </script>	
 	</lams:head>
 <body class="stripes">
 
-	<div id="content">
-	
-		<h2><fmt:message key="label.learnersVoted"/>: <fmt:message key="label.openVotes"/></h2>
-		    
-   		<div class="tablesorter-holder">
-   		
-   		<c:choose>
+	<c:set var="title"><fmt:message key="label.openVotes"/></c:set>
+	<lams:Page type="learner" title="${title}">
+		
+		<c:choose>
 		<c:when test="${not empty param.sessionUid}">
-		<table id="entryTable" class="tablesorter" data-session-id="${param.sessionUid}">
+			<c:set var="dsi">data-session-id='${param.sessionUid}'</c:set>
 		</c:when><c:otherwise>
-		<table id="entryTable" class="tablesorter" data-session-id="${param.toolContentUID}">
+			<c:set var="dsi">data-session-id='${param.toolContentUID}'</c:set>
 		</c:otherwise>
 		</c:choose>
-			<thead>
-				<tr>
-					<th><fmt:message key="label.vote"/></th>
-					<th> <fmt:message key="label.user"/></th>
-					<th> <fmt:message key="label.attemptTime"/></th>
-					<th style="width: 70px;"> <fmt:message key="label.visible"/></th>								  						 
-				</tr>
-			</thead>
-			<tbody>
-			</tbody>
-		</table>
+	
+		<lams:TSTable numColumns="4" dataId="${dsi}">
+			<th><fmt:message key="label.vote"/></th>
+			<th> <fmt:message key="label.user"/></th>
+			<th> <fmt:message key="label.attemptTime"/></th>
+			<th style="width: 70px;"> <fmt:message key="label.visible"/></th>								  						 
+	     </lams:TSTable>
 		
-		<!-- pager -->
-		<div class="pager">
-			<form>
-				<img class="tablesorter-first"/>
-				<img class="tablesorter-prev"/>
-				<span class="pagedisplay"></span> <!-- this can be any element, including an input -->
-				<img class="tablesorter-next"/>
-				<img class="tablesorter-last"/>
-				<select class="pagesize">
-					<option selected="selected" value="10">10</option>
-					<option value="20">20</option>
-					<option value="30">30</option>
-					<option value="40">40</option>
-					<option value="50">50</option>
-					<option value="100">100</option>
-				</select>
-			</form>
-		</div>
-		</div>
-		
-	</div>
 	<div id="footer"></div>
+	</lams:Page>
+
 </body>
 </lams:html>
Index: lams_tool_vote/web/monitoring/ReflectionViewer.jsp
===================================================================
diff -u -r81d3515d29fd57e3b9e08cc37481fd0becbd8b10 -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/monitoring/ReflectionViewer.jsp	(.../ReflectionViewer.jsp)	(revision 81d3515d29fd57e3b9e08cc37481fd0becbd8b10)
+++ lams_tool_vote/web/monitoring/ReflectionViewer.jsp	(.../ReflectionViewer.jsp)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -13,10 +13,11 @@
 			$(document).ready(function(){
 	    
 			$(".tablesorter").tablesorter({
-				theme: 'blue',
+				theme: 'bootstrap',
 			    sortInitialOrder: 'desc',
 	            sortList: [[0]],
-	            widgets: [ "resizable", "filter" ],
+	            headerTemplate : '{content} {icon}',
+	            widgets: [ "uitheme", "resizable", "filter" ],
 	            headers: { 1: { filter: false, sorter: false} }, 
 	            widgetOptions: {
 	            	resizable: true,
@@ -30,7 +31,12 @@
 		$(".tablesorter").each(function() {
 			$(this).tablesorterPager({
 				savePages: false,
-				ajaxUrl : "<lams:WebAppURL/>monitoring.do?dispatch=getReflectionsJSON&page={page}&size={size}&{sortList:column}&{filterList:fcol}&sessionUid=" + $(this).attr('data-session-id'),
+	            container: $(this).find(".ts-pager"),
+	            output: '{startRow} to {endRow} ({totalRows})',
+	            cssPageDisplay: '.pagedisplay',
+	            cssPageSize: '.pagesize',
+	            cssDisabled: 'disabled',
+	            ajaxUrl : "<lams:WebAppURL/>monitoring.do?dispatch=getReflectionsJSON&page={page}&size={size}&{sortList:column}&{filterList:fcol}&sessionUid=" + $(this).attr('data-session-id'),
 				ajaxProcessing: function (data, table) {
 					if (data && data.hasOwnProperty('rows')) {
 			    		var rows = [],
@@ -60,63 +66,24 @@
 						return json;
 			            
 			    	}
-				},					
-			    container: $(this).next(".pager"),
-			    output: '{startRow} to {endRow} ({totalRows})',
-			    // css class names of pager arrows
-			    cssNext: '.tablesorter-next', // next page arrow
-				cssPrev: '.tablesorter-prev', // previous page arrow
-				cssFirst: '.tablesorter-first', // go to first page arrow
-				cssLast: '.tablesorter-last', // go to last page arrow
-				cssGoto: '.gotoPage', // select dropdown to allow choosing a page
-				cssPageDisplay: '.pagedisplay', // location of where the "output" is displayed
-				cssPageSize: '.pagesize', // page size selector - select dropdown that sets the "size" option
-				// class added to arrows when at the extremes (i.e. prev/first arrows are "disabled" when on the first page)
-				cssDisabled: 'disabled' // Note there is no period "." in front of this class name
+				}				
 			})
 		});
   	})
 </script>	
 	</lams:head>
 <body class="stripes">
 
-	<div id="content">
-	
-		<h1><fmt:message key="label.notebook.entries" /></h1>
-
-		<div class="tablesorter-holder">
-		<table class="tablesorter" data-session-id="${param.sessionUid}">
-			<thead>
-				<tr>
-					<th><fmt:message key="label.user"/></th>
-					<th><fmt:message key="label.reflection" /></th>
-				</tr>
-			</thead>
-			<tbody>
-			</tbody>
-		</table>
+	<c:set var="title"><fmt:message key="label.notebook.entries" /></c:set>
+	<lams:Page type="learner" title="${title}">
 		
-		<!-- pager -->
-		<div class="pager">
-			<form>
-				<img class="tablesorter-first"/>
-				<img class="tablesorter-prev"/>
-				<span class="pagedisplay"></span> <!-- this can be any element, including an input -->
-				<img class="tablesorter-next"/>
-				<img class="tablesorter-last"/>
-				<select class="pagesize">
-					<option selected="selected" value="10">10</option>
-					<option value="20">20</option>
-					<option value="30">30</option>
-					<option value="40">40</option>
-					<option value="50">50</option>
-					<option value="100">100</option>
-				</select>
-			</form>
-		</div>
-		</div>
-				
-	</div>
+		<lams:TSTable numColumns="2" dataId="data-session-id='${param.sessionUid}'">
+	       <th><fmt:message key="label.user"/></td>
+			<th><fmt:message key="label.reflection" /></th>
+	     </lams:TSTable>
+		
 	<div id="footer"></div>
+	</lams:Page>
+
 </body>
 </lams:html>
Index: lams_tool_vote/web/monitoring/StatsPart.jsp
===================================================================
diff -u -r81d3515d29fd57e3b9e08cc37481fd0becbd8b10 -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/monitoring/StatsPart.jsp	(.../StatsPart.jsp)	(revision 81d3515d29fd57e3b9e08cc37481fd0becbd8b10)
+++ lams_tool_vote/web/monitoring/StatsPart.jsp	(.../StatsPart.jsp)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -1,17 +1,30 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <c:if test="${empty voteStatsDTO}">
-	<fmt:message key="error.noLearnerActivity"/>
+	<lams:Alert type="info" id="no-session-summary" close="false">
+		<fmt:message key="error.noLearnerActivity"/>
+	</lams:Alert>
 </c:if>
-
+ 
 <c:forEach var="stats" items="${voteStatsDTO}">
 
-	<c:if test="${isGroupedActivity}">
-		<h1>${stats.sessionName}</h1>
+	<c:if test="${isGroupedActivity}">	
+	    <div class="panel panel-default" >
+        <div class="panel-heading">
+			<span class="panel-title">
+				${stats.sessionName}
+			</span>
+        </div>
+
+        <div class="panel-body">
 	</c:if>
 
-	<p><fmt:message key="label.total.completed.students"/> ${stats.countUsersComplete}<BR/>
-	<fmt:message key="label.total.students"/> ${stats.countAllUsers}</p>
-	
+	<p><fmt:message key="label.total.completed.students"/>&nbsp;${stats.countUsersComplete}</p>
+	<p><fmt:message key="label.total.students"/>&nbsp;${stats.countAllUsers}</p>
+
+	<c:if test="${isGroupedActivity}">	
+		</div>
+		</div>
+	</c:if>	
 </c:forEach>
 
Index: lams_tool_vote/web/monitoring/SummaryContent.jsp
===================================================================
diff -u -r81d3515d29fd57e3b9e08cc37481fd0becbd8b10 -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 81d3515d29fd57e3b9e08cc37481fd0becbd8b10)
+++ lams_tool_vote/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -2,17 +2,6 @@
 <c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
 <c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
 
-<link type="text/css" href="${lams}/css/jquery-ui-smoothness-theme.css" rel="stylesheet">
-<link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet">
-<link type="text/css" href="${lams}/css/chart.css" rel="stylesheet">
-
-<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.timepicker.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>  
-<script type="text/javascript" src="${lams}includes/javascript/d3.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/chart.js"></script>
-
 <script type="text/javascript">
 	$(window).load(function(){
 		<c:forEach var="currentDto" items="${voteGeneralMonitoringDTO.sessionDTOs}">
@@ -33,24 +22,32 @@
 	};
 </script>
 <script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
-
-<h1>
-	<c:out value="${voteGeneralMonitoringDTO.activityTitle}" escapeXml="true"/>
-</h1>
-
-<div class="instructions small-space-top">
-	<c:out value="${voteGeneralMonitoringDTO.activityInstructions}" escapeXml="false"/>
-</div>
-<br/>
-
-<c:if test="${useSelectLeaderToolOuput}">
-	<div class="info space-bottom">
-		<fmt:message key="label.info.use.select.leader.outputs" />
+ 
+<div class="panel">
+	<h4>
+	    <c:out value="${voteGeneralMonitoringDTO.activityTitle}" escapeXml="true"/>
+	</h4>
+	<div class="instructions voffset5">
+	    <c:out value="${voteGeneralMonitoringDTO.activityInstructions}" escapeXml="false"/>
 	</div>
-</c:if>
-
+	
+	<c:if test="${useSelectLeaderToolOuput}">
+		<lams:Alert type="info" id="use-leader" close="false">
+			<fmt:message key="label.info.use.select.leader.outputs" />
+		</lams:Alert>
+	</c:if>
+	
+	<c:if test="${empty sessionDTOs}">
+		<lams:Alert type="info" id="no-session-summary" close="false">
+			<fmt:message key="error.noLearnerActivity"/>
+		</lams:Alert>
+	</c:if>
+	
+ </div>
+ 
 <jsp:include page="/monitoring/AllSessionsSummary.jsp" />
-		
+ 
 <%@include file="AdvanceOptions.jsp"%>
-
+ 
 <%@include file="daterestriction.jsp"%>
+ 
\ No newline at end of file
Index: lams_tool_vote/web/monitoring/VoteNominationViewer.jsp
===================================================================
diff -u -r81d3515d29fd57e3b9e08cc37481fd0becbd8b10 -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/monitoring/VoteNominationViewer.jsp	(.../VoteNominationViewer.jsp)	(revision 81d3515d29fd57e3b9e08cc37481fd0becbd8b10)
+++ lams_tool_vote/web/monitoring/VoteNominationViewer.jsp	(.../VoteNominationViewer.jsp)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -13,10 +13,11 @@
 			$(document).ready(function(){
 	    
 			$(".tablesorter").tablesorter({
-				theme: 'blue',
+				theme: 'bootstrap',
 			    sortInitialOrder: 'desc',
 	            sortList: [[0]],
-	            widgets: [ "resizable", "filter" ],
+	            headerTemplate : '{content} {icon}',
+	            widgets: [ "uitheme", "resizable", "filter" ],
 	            headers: { 1: { filter: false} }, 
 	            widgetOptions: {
 	            	resizable: true,
@@ -30,6 +31,11 @@
 		$(".tablesorter").each(function() {
 			$(this).tablesorterPager({
 				savePages: false,
+	            container: $(this).find(".ts-pager"),
+	            output: '{startRow} to {endRow} ({totalRows})',
+	            cssPageDisplay: '.pagedisplay',
+	            cssPageSize: '.pagesize',
+	            cssDisabled: 'disabled',
 				ajaxUrl : "<lams:WebAppURL/>monitoring.do?dispatch=getVoteNominationsJSON&page={page}&size={size}&{sortList:column}&{filterList:fcol}&questionUid=${questionUid}&sessionUid=" + $(this).attr('data-session-id'),
 				ajaxProcessing: function (data, table) {
 					if (data && data.hasOwnProperty('rows')) {
@@ -56,63 +62,24 @@
 						return json;
 			            
 			    	}
-				},					
-			    container: $(this).next(".pager"),
-			    output: '{startRow} to {endRow} ({totalRows})',
-			    // css class names of pager arrows
-			    cssNext: '.tablesorter-next', // next page arrow
-				cssPrev: '.tablesorter-prev', // previous page arrow
-				cssFirst: '.tablesorter-first', // go to first page arrow
-				cssLast: '.tablesorter-last', // go to last page arrow
-				cssGoto: '.gotoPage', // select dropdown to allow choosing a page
-				cssPageDisplay: '.pagedisplay', // location of where the "output" is displayed
-				cssPageSize: '.pagesize', // page size selector - select dropdown that sets the "size" option
-				// class added to arrows when at the extremes (i.e. prev/first arrows are "disabled" when on the first page)
-				cssDisabled: 'disabled' // Note there is no period "." in front of this class name
+				}				
 			})
 		});
   	})
 </script>	
 	</lams:head>
 <body class="stripes">
+	<c:set var="title"><fmt:message key="label.learnersVoted"/></c:set>
+	<lams:Page type="learner" title="${title}">
+		
+		<h4><fmt:message key="label.learnersVoted"/>: ${nominationText}</h4>
 
-	<div id="content">
-	
-		<h2><fmt:message key="label.learnersVoted"/>: <c:out value="${nominationText}" escapeXml="true"/></h2>
-
-		<div class="tablesorter-holder">
-		<table class="tablesorter" data-session-id="${sessionUid}">
-			<thead>
-				<tr>
-			       <th><fmt:message key="label.user"/></td>
-			       <th><fmt:message key="label.attemptTime"/></td>
-				</tr>
-			</thead>
-			<tbody>
-			</tbody>
-		</table>
+		<lams:TSTable numColumns="2" dataId="data-session-id='${sessionUid}'">
+	       <th><fmt:message key="label.user"/></td>
+	       <th><fmt:message key="label.attemptTime"/></td>
+	     </lams:TSTable>
 		
-		<!-- pager -->
-		<div class="pager">
-			<form>
-				<img class="tablesorter-first"/>
-				<img class="tablesorter-prev"/>
-				<span class="pagedisplay"></span> <!-- this can be any element, including an input -->
-				<img class="tablesorter-next"/>
-				<img class="tablesorter-last"/>
-				<select class="pagesize">
-					<option selected="selected" value="10">10</option>
-					<option value="20">20</option>
-					<option value="30">30</option>
-					<option value="40">40</option>
-					<option value="50">50</option>
-					<option value="100">100</option>
-				</select>
-			</form>
-		</div>
-		</div>
-		
-	</div>
 	<div id="footer"></div>
+	</lams:Page>
 </body>
 </lams:html>
Index: lams_tool_vote/web/monitoring/daterestriction.jsp
===================================================================
diff -u -r57a242c8553eeec5781c2106493aa9f34efa5489 -rff7583ba24a271222b91ab3ecc460b931fe20e37
--- lams_tool_vote/web/monitoring/daterestriction.jsp	(.../daterestriction.jsp)	(revision 57a242c8553eeec5781c2106493aa9f34efa5489)
+++ lams_tool_vote/web/monitoring/daterestriction.jsp	(.../daterestriction.jsp)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
@@ -1,43 +1,29 @@
 <%@include file="/common/taglibs.jsp"%>
 
-<h1 style="padding-bottom: 10px;">
-	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="restrictUsageTreeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('restrictUsageDiv'), document.getElementById('restrictUsageTreeIcon'), '<lams:LAMSURL/>');" />
+<c:set var="ddTitle"><fmt:message key="monitor.summary.date.restriction" /></c:set>
+<lams:RestrictedUsageAccordian title="${ddTitle}">
 
-	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('restrictUsageDiv'), document.getElementById('restrictUsageTreeIcon'),'<lams:LAMSURL/>');" >
-		<fmt:message key="monitor.summary.date.restriction" />
-	</a>
-</h1>
-<br />
-
-<div class="monitoring-advanced" id="restrictUsageDiv" style="display:none; ">
-
-	<div>
-		<fmt:message key="monitor.summary.when.date.restriction.is.set" />
-	</div>
+	<p><fmt:message key="monitor.summary.when.date.restriction.is.set" /></p>
 		
 	<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
-		<span>
-			<fmt:message key="monitor.summary.after.date" />
-		</span>
-		
-		<input type="text" name="datetime" id="datetime" value=""/>
-				
-		<html:link	href="javascript:setSubmissionDeadline();" styleClass="button">
+		<div class="form-group">
+		<label for="datetime"><fmt:message key="monitor.summary.after.date" />&nbsp;
+		<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline"/>
+		</label>							
+		<html:link	href="javascript:setSubmissionDeadline();" styleClass="btn btn-default">
 			<fmt:message key="monitor.summary.set.restriction" />
 		</html:link>
+		</div>
 	</div>
 
 	<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
-		<span>
-			<fmt:message key="monitor.summary.after.date" />
-		</span>
-		
+		<label><fmt:message key="monitor.summary.after.date" /></span>
 		<span id="dateInfo">
 		</span>
-				
-		<html:link	href="javascript:removeSubmissionDeadline();" styleClass="button">
+		</label>
+		<html:link	href="javascript:removeSubmissionDeadline();" styleClass="btn btn-default">
 			<fmt:message key="monitor.summary.unset.restriction" />
 		</html:link>
 	</div>
 
-</div>
\ No newline at end of file
+</lams:RestrictedUsageAccordian>
\ No newline at end of file