Index: lams_tool_vote/web/WEB-INF/tags/Alert.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/Alert.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/Alert.tag	(revision 5f940a9f66e9fc53d5c13d69fc716c4e7675a19e)
@@ -0,0 +1,46 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+
+<%@ attribute name="close" required="false" rtexprvalue="true"%>
+<%@ attribute name="id" required="false" rtexprvalue="true"%>
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+
+<c:set var="idName" value="alert-${type}" />
+<c:if test="${not empty id}">
+	<c:set var="idName" value="${id}" />
+</c:if>
+
+<c:set var="alertType" value="info" />
+<c:set var="iconType" value="info-circle" />
+<c:choose>
+	<c:when test="${type == 'danger'}">
+		<c:set var="alertType" value="danger" />
+		<c:set var="iconType" value="times-circle" />
+	</c:when>
+	<c:when test="${type == 'success'}">
+		<c:set var="alertType" value="success" />
+		<c:set var="iconType" value="check-circle" />
+	</c:when>
+	<c:when test="${type == 'warning'}">
+		<c:set var="alertType" value="warning" />
+		<c:set var="iconType" value="exclamation-circle" />
+	</c:when>
+</c:choose>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-${alertType}" style="margin-bottom: 10px; padding: 8px">
+			<div class="media">
+				<div class="media-left">
+					<i class="fa fa-lg fa-${iconType} text-muted"></i>
+				</div>
+				<div class="media-body">
+					<c:if test="${close}">
+							<a href="#" class="close pull-right" data-dismiss="alert" aria-label="close">&times;</a>
+					</c:if>
+					<jsp:doBody />
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
Index: lams_tool_vote/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rfef442a88ab05c91db8a551081c4abc060d4da5e -r5f940a9f66e9fc53d5c13d69fc716c4e7675a19e
--- lams_tool_vote/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision fef442a88ab05c91db8a551081c4abc060d4da5e)
+++ lams_tool_vote/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f940a9f66e9fc53d5c13d69fc716c4e7675a19e)
@@ -1,6 +1,6 @@
 
 <%
-	 /****************************************************************
+	/****************************************************************
 	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 	 * =============================================================
 	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
@@ -49,10 +49,18 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<p>
-	<fmt:message key="${defineLaterMessageKey}" />
-</p>
-<div align="right" class="space-bottom-top">
-	<a href="javascript:location.reload(true);" class="button"><fmt:message
-			key="${buttonTryAgainKey}" /> </a>
+<div class="row no-gutter">
+	<div
+		class="col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
+		<div class="alert alert-info">
+			<fmt:message key="${defineLaterMessageKey}" />
+		</div>
+	</div>
 </div>
+<div class="row no-gutter">
+	<div class="col-xs-12">
+		<a href="javascript:location.reload(true);"
+			class="btn btn-primary pull-right voffset5"><fmt:message
+				key="${buttonTryAgainKey}" /></a>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tags/Page.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/Page.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/Page.tag	(revision 5f940a9f66e9fc53d5c13d69fc716c4e7675a19e)
@@ -0,0 +1,36 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+
+<%@ attribute name="type" required="true" rtexprvalue="true"%>
+<%@ attribute name="style" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+
+
+
+<div class="row no-gutter">
+	<div class="col-xs-12">
+		<div class="container" id="content">
+			<div class="panel panel-default panel-${type}-page">
+				<div class="panel-heading">
+					<c:if test="${not empty title}">
+						<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>
+				<div class="panel-body panel-${type}-body">
+					<jsp:doBody />
+				</div>
+			</div>
+		</div>
+		<! -- End content container -->
+	</div>
+</div>
Index: lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -r5f940a9f66e9fc53d5c13d69fc716c4e7675a19e
--- lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f940a9f66e9fc53d5c13d69fc716c4e7675a19e)
@@ -432,6 +432,14 @@
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
Index: lams_tool_vote/web/common/header.jsp
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -r5f940a9f66e9fc53d5c13d69fc716c4e7675a19e
--- lams_tool_vote/web/common/header.jsp	(.../header.jsp)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_tool_vote/web/common/header.jsp	(.../header.jsp)	(revision 5f940a9f66e9fc53d5c13d69fc716c4e7675a19e)
@@ -13,5 +13,6 @@
 <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/messages.jsp
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -r5f940a9f66e9fc53d5c13d69fc716c4e7675a19e
--- lams_tool_vote/web/common/messages.jsp	(.../messages.jsp)	(revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/web/common/messages.jsp	(.../messages.jsp)	(revision 5f940a9f66e9fc53d5c13d69fc716c4e7675a19e)
@@ -1,20 +1,17 @@
 <%-- Error Messages --%>
 <logic:messagesPresent>
-    <div class="error" id="errorMessages">
-        <html:messages id="error">
-            &nbsp&nbsp <html:img page="/images/iconWarning.gif" 
-               styleClass="icon"/>
-            &nbsp&nbsp <c:out value="${error}" escapeXml="false"/><br/>
-        </html:messages>
-    </div>
+	<lams:Alert id="error" close="false" type="danger">
+		<html:messages id="error">
+			<c:out value="${error}" escapeXml="false" />
+		</html:messages>
+	</lams:Alert>
 </logic:messagesPresent>
 
 <%-- Success Messages --%>
 <logic:messagesPresent message="true">
-    <div class="message" id="successMessages">
-        <html:messages id="message" message="true">
-            &nbsp&nbsp <html:img page="/images/iconInformation.gif" styleClass="icon"/>
-            &nbsp&nbsp <c:out value="${message}" escapeXml="false"/><br/>
-        </html:messages>
-    </div>
+	<lams:Alert id="message" close="false" type="info">
+		<html:messages id="message" message="true">
+			<c:out value="${message}" escapeXml="false" />
+		</html:messages>
+	</lams:Alert>
 </logic:messagesPresent>
\ No newline at end of file
Index: lams_tool_vote/web/learning/AllNominations.jsp
===================================================================
diff -u -r1eadfd07c1afcebfb2b87c43a11c92041698ee3c -r5f940a9f66e9fc53d5c13d69fc716c4e7675a19e
--- lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision 1eadfd07c1afcebfb2b87c43a11c92041698ee3c)
+++ lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision 5f940a9f66e9fc53d5c13d69fc716c4e7675a19e)
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-
 <%@ include file="/common/taglibs.jsp"%>
 
 <c:set scope="request" var="lams">
@@ -14,102 +13,91 @@
 	<html:base />
 	<lams:css />
 	<link type="text/css" href="${lams}/css/chart.css" rel="stylesheet" />
-	
+
 	<title><fmt:message key="activity.title" /></title>
-	
+
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/d3.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/chart.js"></script>
-	
+
 	<script type="text/javascript">
 		function submitMethod(actionMethod) {
 			if (actionMethod == 'learnerFinished') {
 				document.getElementById("finishButton").disabled = true;
 			}
-			document.VoteLearningForm.action += "&dispatch=" + actionMethod; 
+			document.VoteLearningForm.action += "&dispatch=" + actionMethod;
 			document.VoteLearningForm.submit();
 		}
 	</script>
 </lams:head>
 
 <body class="stripes">
 
-	<div id="content">
-		<h1>
-			<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="true" />
-		</h1>
+	<html:form action="/learning?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)%>" />
+		<c:set var="isUserLeader" value="${formBean.userLeader}" />
+		<c:set var="isLeadershipEnabled" value="${formBean.useSelectLeaderToolOuput}" />
+		<c:set var="hasEditRight" value="${!isLeadershipEnabled || isLeadershipEnabled && isUserLeader}" />
 
-		<html:form action="/learning?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)%>" />
-			<c:set var="isUserLeader" value="${formBean.userLeader}" />
-			<c:set var="isLeadershipEnabled" value="${formBean.useSelectLeaderToolOuput}" />
-			<c:set var="hasEditRight" value="${!isLeadershipEnabled || isLeadershipEnabled && isUserLeader}" />
-			
-			<html:hidden property="toolSessionID" />
-			<html:hidden property="userID" />
-			<html:hidden property="revisitingUser" />
-			<html:hidden property="previewOnly" />
-			<html:hidden property="maxNominationCount" />
-			<html:hidden property="minNominationCount" />
-			<html:hidden property="allowTextEntry" />
-			<html:hidden property="lockOnFinish" />
-			<html:hidden property="reportViewOnly" />
-			<html:hidden property="userEntry" />
-			<html:hidden property="showResults" />
-			<html:hidden property="userLeader" />
-			<html:hidden property="groupLeaderName" />
-			<html:hidden property="useSelectLeaderToolOuput" />
-			
+		<html:hidden property="toolSessionID" />
+		<html:hidden property="userID" />
+		<html:hidden property="revisitingUser" />
+		<html:hidden property="previewOnly" />
+		<html:hidden property="maxNominationCount" />
+		<html:hidden property="minNominationCount" />
+		<html:hidden property="allowTextEntry" />
+		<html:hidden property="lockOnFinish" />
+		<html:hidden property="reportViewOnly" />
+		<html:hidden property="userEntry" />
+		<html:hidden property="showResults" />
+		<html:hidden property="userLeader" />
+		<html:hidden property="groupLeaderName" />
+		<html:hidden property="useSelectLeaderToolOuput" />
+
+		<lams:Page type="learner" title="${voteGeneralLearnerFlowDTO.activityTitle}">
+
+
+
 			<c:if test="${isLeadershipEnabled}">
-				<h4>
-					<fmt:message key="label.group.leader" >
+				<lams:Alert type="info" id="leaderEnabled" close="false">
+					<fmt:message key="label.group.leader">
 						<fmt:param>${formBean.groupLeaderName}</fmt:param>
 					</fmt:message>
-				</h4>
+				</lams:Alert>
 			</c:if>
 
-			<h2>
+			<h4>
 				<fmt:message key="label.progressiveResults" />
-			</h2>
+			</h4>
 
 			<!--present  a mini summary table here -->
 
-			<table cellspacing="0" class="alternative-color">
+			<table class="table table-condensed table-hover">
 				<tr>
-					<th>
-						<fmt:message key="label.nomination" />
-					</th>
-					<th>
-						<fmt:message key="label.total.votes" />
-					</th>
+					<th><fmt:message key="label.nomination" /></th>
+					<th class="text-center"><fmt:message key="label.total.votes" /></th>
 				</tr>
 
-				<c:forEach var="currentNomination"	items="${voteGeneralLearnerFlowDTO.mapStandardNominationsHTMLedContent}">
+				<c:forEach var="currentNomination" items="${voteGeneralLearnerFlowDTO.mapStandardNominationsHTMLedContent}">
 					<c:set var="currentNominationKey" scope="request" value="${currentNomination.key}" />
 					<tr>
-						<td class="space">
-							<c:out value="${currentNomination.value}" escapeXml="false" />
-						</td>
+						<td class="text-left"><c:out value="${currentNomination.value}" escapeXml="false" /></td>
 
-						<td>
-							<c:forEach var="currentUserCount" items="${voteGeneralLearnerFlowDTO.mapStandardUserCount}">
-								<c:set var="currentUserKey" scope="request"	value="${currentUserCount.key}" />
+						<td class="text-center"><c:forEach var="currentUserCount"
+								items="${voteGeneralLearnerFlowDTO.mapStandardUserCount}">
+								<c:set var="currentUserKey" scope="request" value="${currentUserCount.key}" />
 								<c:if test="${currentNominationKey == currentUserKey}">
 
 									<c:if test="${currentUserCount.value != '0' }">
-										<c:forEach var="currentQuestionUid"
-											items="${voteGeneralLearnerFlowDTO.mapStandardQuestionUid}">
-											<c:set var="currentQuestionUidKey" scope="request"
-												value="${currentQuestionUid.key}" />
+										<c:forEach var="currentQuestionUid" items="${voteGeneralLearnerFlowDTO.mapStandardQuestionUid}">
+											<c:set var="currentQuestionUidKey" scope="request" value="${currentQuestionUid.key}" />
 											<c:if test="${currentQuestionUidKey == currentUserKey}">
 
-												<c:forEach var="currentSessionUid"
-													items="${voteGeneralLearnerFlowDTO.mapStandardToolSessionUid}">
-													<c:set var="currentSessionUidKey" scope="request"
-														value="${currentSessionUid.key}" />
-													<c:if
-														test="${currentSessionUidKey == currentQuestionUidKey}">
+												<c:forEach var="currentSessionUid" items="${voteGeneralLearnerFlowDTO.mapStandardToolSessionUid}">
+													<c:set var="currentSessionUidKey" scope="request" value="${currentSessionUid.key}" />
+													<c:if test="${currentSessionUidKey == currentQuestionUidKey}">
 
 														<c:if test="${currentNomination.value != 'Open Vote'}">
 															<c:set scope="request" var="viewURL">
@@ -133,39 +121,39 @@
 									</c:if>
 
 								</c:if>
-							</c:forEach>
-
-							<c:forEach var="currentRate" items="${voteGeneralLearnerFlowDTO.mapStandardRatesContent}">
+							</c:forEach> <c:forEach var="currentRate" items="${voteGeneralLearnerFlowDTO.mapStandardRatesContent}">
 								<c:set var="currentRateKey" scope="request" value="${currentRate.key}" />
 								<c:if test="${currentNominationKey == currentRateKey}"> 				
 									&nbsp(<fmt:formatNumber type="number" maxFractionDigits="2" value="${currentRate.value}" />
 									<fmt:message key="label.percent" />) 
 								</c:if>
-							</c:forEach>
-						</td>
+							</c:forEach></td>
 					</tr>
 				</c:forEach>
 
 			</table>
 
-			<div>
-				<div class="float-right">
-					<c:set var="chartURL" value="${tool}chartGenerator.do?currentSessionId=${formBean.toolSessionID}" />
-					<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', '${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', '${chartURL}')">
-				</div>
-				
+
+			<div class="pull-right">
+				<c:set var="chartURL" value="${tool}chartGenerator.do?currentSessionId=${formBean.toolSessionID}" />
+				<a title="<fmt:message key='label.tip.displayPieChart'/>"
+					class="fa fa-pie-chart text-primary btn btn-md btn-primary"
+					onclick="javascript:drawChart('pie', 'chartDiv', '${chartURL}')"></a> <a
+					title="<fmt:message key='label.tip.displayBarChart'/>" class="fa fa-bar-chart text-primary btn btn-md btn-primary"
+					onclick="javascript:drawChart('bar', 'chartDiv', '${chartURL}')"></a>
+			</div>
+
+			<div id="textEntries">
 				<c:if test="${VoteLearningForm.allowTextEntry}">
-					<strong> <fmt:message key="label.open.votes"/> </strong>
-					
+					<strong><fmt:message key="label.open.votes" /> </strong>
+
 					<c:forEach var="vote" items="${requestScope.listUserEntriesContent}">
-						<div>
+						<c:if test="${vote.userEntry != ''}">
+							<div class="media">
+								<div class="media-left">
+									<i class="fa fa-xs fa-check text-success"></i>
+								</div>
+								<div class="media-body">
 						<c:choose>
 						<c:when test="${vote.visible}">
 							<c:out value="${vote.userEntry}" escapeXml="true" />
@@ -174,90 +162,97 @@
 							<em>(<fmt:message key="label.hidden"/>)</em>
 						</c:otherwise>
 						</c:choose>
-						</div>
+								</div>
+							</div>
+						</c:if>
 					</c:forEach>
-					<div>&nbsp;</div>
 				</c:if>
-
+			</div>
+			<div id="nominations">
 				<c:choose>
 					<c:when test="${fn:length(requestScope.listGeneralCheckedOptionsContent) > 1}">
-                    	<strong><fmt:message key="label.learner.nominations" />  </strong>
+						<strong><fmt:message key="label.learner.nominations" /> </strong>
 					</c:when>
-                	<c:otherwise>
-						<strong><fmt:message key="label.learner.nomination" />  </strong>
+					<c:otherwise>
+						<strong><fmt:message key="label.learner.nomination" /> </strong>
 					</c:otherwise>
 				</c:choose>
+				<c:forEach var="entry" items="${requestScope.listGeneralCheckedOptionsContent}">
+					<div class="media">
+						<div class="media-left">
+							<i class="fa fa-xs fa-check text-success"></i>
+						</div>
+						<div class="media-body">
+							<c:out value="${entry}" escapeXml="false" />
+						</div>
+					</div>
+				</c:forEach>
 
+				<c:if test="${not empty VoteLearningForm.userEntry}">
+					<div class="media">
+						<div class="media-left">
+							<i class="fa fa-xs fa-check text-success"></i>
+						</div>
+						<div class="media-body">
+							<c:out value="${VoteLearningForm.userEntry}" escapeXml="true" />
+						</div>
+					</div>
+				</c:if>
 			</div>
 
-			<c:forEach var="entry" items="${requestScope.listGeneralCheckedOptionsContent}">
-				<div>
-					<c:out value="${entry}" escapeXml="false" />
+			<c:if test="${voteGeneralLearnerFlowDTO.notebookEntry != null && voteGeneralLearnerFlowDTO.notebookEntry != ''}">
+				<div class="panel panel-default">
+					<div class="panel-heading panel-title"></div>
+					<div class="panel-body">
+						<fmt:message key="label.notebook.entries" />
+						<div class="panel">
+							<lams:out value="${voteGeneralLearnerFlowDTO.notebookEntry}" escapeHtml="true" />
+						</div>
+					</div>
 				</div>
-			</c:forEach>
+			</c:if>
 
-			<div>
-				<c:out value="${VoteLearningForm.userEntry}" escapeXml="true"/>
-			</div>
+			<div id="chartDiv" style="height: 220px; display: none;"></div>
 
-			<c:if test="${voteGeneralLearnerFlowDTO.notebookEntry != null && voteGeneralLearnerFlowDTO.notebookEntry != ''}">
-	
-				<h2>
-					<fmt:message key="label.notebook.entries" />
-				</h2>
-	
-				<p>
-					<lams:out value="${voteGeneralLearnerFlowDTO.notebookEntry}" escapeHtml="true" />
-				</p>
-			</c:if>							
 
-			<div id="chartDiv" style="height: 220px; display: none;"></div>
+			<c:if test="${voteGeneralLearnerFlowDTO.reportViewOnly != 'true' }">
+				<html:submit property="refreshVotes" styleClass="btn btn-sm btn-default voffset10 pull-left"
+					onclick="submitMethod('viewAllResults');">
+					<fmt:message key="label.refresh" />
+				</html:submit>
 
-			<div class="space-bottom-top">
-				<c:if test="${voteGeneralLearnerFlowDTO.reportViewOnly != 'true' }">
-					<html:submit property="refreshVotes" styleClass="button"
-						onclick="submitMethod('viewAllResults');">
-						<fmt:message key="label.refresh" />
+				<c:if test="${VoteLearningForm.lockOnFinish != 'true' && hasEditRight}">
+					<html:submit property="redoQuestionsOk" styleClass="btn btn-sm btn-default voffset10 pull-left "
+						onclick="submitMethod('redoQuestionsOk');">
+						<fmt:message key="label.retake" />
 					</html:submit>
+				</c:if>
 
-					<c:if test="${VoteLearningForm.lockOnFinish != 'true' && hasEditRight}">
-						<html:submit property="redoQuestionsOk" styleClass="button"
-							onclick="submitMethod('redoQuestionsOk');">
-							<fmt:message key="label.retake" />
-						</html:submit>
-					</c:if>
+				<c:if test="${voteGeneralLearnerFlowDTO.reflection != 'true' || !hasEditRight}">
+					<html:link href="#" property="learnerFinished" onclick="javascript:submitMethod('learnerFinished');return false"
+						styleClass="btn btn-primary pull-right voffset10 na" styleId="finishButton">
+						<c:choose>
+							<c:when test="${activityPosition.last}">
+								<fmt:message key="button.submitActivity" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="button.endLearning" />
+							</c:otherwise>
+						</c:choose>
+					</html:link>
+				</c:if>
 
-					<c:if test="${voteGeneralLearnerFlowDTO.reflection != 'true' || !hasEditRight}">
-						<html:link href="#" property="learnerFinished"
-							onclick="javascript:submitMethod('learnerFinished');return false"
-							styleClass="button big-space-top" style="float:right" styleId="finishButton">
-							<span class="nextActivity">
-								<c:choose>
-									<c:when test="${activityPosition.last}">
-										<fmt:message key="button.submitActivity" />
-									</c:when>
-									<c:otherwise>
-										<fmt:message key="button.endLearning" />
-									</c:otherwise>
-								</c:choose>
-							</span>
-						</html:link>
-					</c:if>
-
-					<c:if test="${voteGeneralLearnerFlowDTO.reflection == 'true' && hasEditRight}">
-						<html:submit property="forwardtoReflection"
-							onclick="javascript:submitMethod('forwardtoReflection');"
-							styleClass="button">
-							<fmt:message key="label.continue" />
-						</html:submit>
-					</c:if>
+				<c:if test="${voteGeneralLearnerFlowDTO.reflection == 'true' && hasEditRight}">
+					<html:submit property="forwardtoReflection" onclick="javascript:submitMethod('forwardtoReflection');"
+						styleClass="btn btn-primary pull-right voffset10">
+						<fmt:message key="label.continue" />
+					</html:submit>
 				</c:if>
+			</c:if>
 			</div>
+			<div id="footer"></div>
+		</lams:Page>
+	</html:form>
 
-		</html:form>
-	</div>
-
-	<div id="footer"></div>
-
 </body>
 </lams:html>
\ No newline at end of file
Index: lams_tool_vote/web/learning/AnswersContent.jsp
===================================================================
diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -r5f940a9f66e9fc53d5c13d69fc716c4e7675a19e
--- lams_tool_vote/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2)
+++ lams_tool_vote/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 5f940a9f66e9fc53d5c13d69fc716c4e7675a19e)
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-
 <%@ include file="/common/taglibs.jsp"%>
 
 <c:set scope="request" var="lams">
@@ -13,202 +12,215 @@
 <lams:head>
 	<html:base />
 	<lams:css />
-	<title><fmt:message key="activity.title" />	</title>
+	<title><fmt:message key="activity.title" /></title>
 
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
 	<script language="JavaScript" type="text/JavaScript">
-
-	var noSelected = 0;
-	var maxVotes = <c:out value="${VoteLearningForm.maxNominationCount}"/>; 
-	var minVotes = <c:out value="${VoteLearningForm.minNominationCount}"/>; 
-	function updateCount(clickedObj){
-		var userEntry = 0;
-		<c:if test="${VoteLearningForm.allowTextEntry == true}">	
-			if(document.forms[0].userEntry.value != ""){
+		var noSelected = 0;
+		var maxVotes = <c:out value="${VoteLearningForm.maxNominationCount}"/>;
+		var minVotes = <c:out value="${VoteLearningForm.minNominationCount}"/>;
+		function updateCount(clickedObj) {
+			var userEntry = 0;
+			<c:if test="${VoteLearningForm.allowTextEntry == true}">
+			if (document.forms[0].userEntry.value != "") {
 				userEntry = 1;
 			}
-		</c:if>
-		if(clickedObj.checked){
-			noSelected++;
-		}else{
-			noSelected--;
+			</c:if>
+			if (clickedObj.checked) {
+				noSelected++;
+			} else {
+				noSelected--;
+			}
+
+			if ((noSelected + userEntry) > maxVotes) {
+				clickedObj.checked = false;
+				noSelected--;
+				alertTooManyVotes(maxVotes);
+			}
+
 		}
-		
-		if((noSelected + userEntry) > maxVotes){
-			clickedObj.checked = false;
-			noSelected--;
-			alertTooManyVotes(maxVotes);
-		}
-	
-	}
 
-	function validate(){
-		var error = "";
-		var userEntry = 0;
-		<c:if test="${VoteLearningForm.allowTextEntry == true}">	
-			if(document.forms[0].userEntry.value != ""){
+		function validate() {
+			var error = "";
+			var userEntry = 0;
+			<c:if test="${VoteLearningForm.allowTextEntry == true}">
+			if (document.forms[0].userEntry.value != "") {
 				userEntry = 1;
 			}
-		</c:if>
+			</c:if>
 
-		var numberOfVotes = noSelected + userEntry;
-		if(numberOfVotes > maxVotes) {
-			alertTooManyVotes(maxVotes);
-			return false;
-		} else if(numberOfVotes < minVotes) {
-			var msg = "<fmt:message key="error.minNominationCount.not.reached"/> " + minVotes + " <fmt:message key="label.nominations"/>";
+			var numberOfVotes = noSelected + userEntry;
+			if (numberOfVotes > maxVotes) {
+				alertTooManyVotes(maxVotes);
+				return false;
+			} else if (numberOfVotes < minVotes) {
+				var msg = "<fmt:message key="error.minNominationCount.not.reached"/> "
+						+ minVotes + " <fmt:message key="label.nominations"/>";
+				alert(msg);
+				return false;
+			} else if (numberOfVotes == 0) {
+				alert("<fmt:message key="error.empty.selection"/>");
+				return false;
+			} else {
+				return true;
+			}
+		}
+
+		function alertTooManyVotes(maxVotes) {
+			var msg = "<fmt:message key="error.maxNominationCount.reached"/> "
+					+ maxVotes + " <fmt:message key="label.nominations"/>";
 			alert(msg);
-			return false;			
-		} else if(numberOfVotes == 0) {
-			alert("<fmt:message key="error.empty.selection"/>");
-			return false;
-		} else {
-			return true;
 		}
-	}
 
-	function alertTooManyVotes(maxVotes) {
-		var msg = "<fmt:message key="error.maxNominationCount.reached"/> "+maxVotes+" <fmt:message key="label.nominations"/>";
-		alert(msg);
-	}
-	
-	function submitMethod(actionMethod) {
-		document.VoteLearningForm.dispatch.value=actionMethod; 
-		document.VoteLearningForm.submit();
-	}
-	
-	function checkLeaderProgress() {
-		
-        $.ajax({
-        	async: false,
-            url: '<c:url value="/learning.do"/>',
-            data: 'dispatch=checkLeaderProgress&toolSessionID=' + $('[name="toolSessionID"]').val(),
-            dataType: 'json',
-            type: 'post',
-            success: function (json) {
-            	if (json.isLeaderResponseFinalized) {
-            		location.reload();
-            	}
-            }
-       	});
-	}
-	
-	$(document).ready(function(){
-		
-		var mode = "${voteGeneralLearnerFlowDTO.learningMode}"; 
-		var isUserLeader = ($('[name="userLeader"]').val() === "true");
-		var isLeadershipEnabled = ($('[name="useSelectLeaderToolOuput"]').val() === "true");
-		var hasEditRight = !isLeadershipEnabled || isLeadershipEnabled && isUserLeader;
-		
-		if (!hasEditRight && (mode != "teacher")) {
-			setInterval("checkLeaderProgress();",60000);// Auto-Refresh every 1 minute for non-leaders
+		function submitMethod(actionMethod) {
+			document.VoteLearningForm.dispatch.value = actionMethod;
+			document.VoteLearningForm.submit();
 		}
-		
-		if (!hasEditRight) {
-			$('[name="userEntry"]').prop('disabled', true);
-			$('[name="checkedVotes"]').prop('disabled', true);
-			$('[name="continueOptionsCombined"]').hide();
+
+		function checkLeaderProgress() {
+
+			$.ajax({
+				async : false,
+				url : '<c:url value="/learning.do"/>',
+				data : 'dispatch=checkLeaderProgress&toolSessionID='
+						+ $('[name="toolSessionID"]').val(),
+				dataType : 'json',
+				type : 'post',
+				success : function(json) {
+					if (json.isLeaderResponseFinalized) {
+						location.reload();
+					}
+				}
+			});
 		}
-	});
+
+		$(document)
+				.ready(
+						function() {
+
+							var mode = "${voteGeneralLearnerFlowDTO.learningMode}";
+							var isUserLeader = ($('[name="userLeader"]').val() === "true");
+							var isLeadershipEnabled = ($(
+									'[name="useSelectLeaderToolOuput"]').val() === "true");
+							var hasEditRight = !isLeadershipEnabled
+									|| isLeadershipEnabled && isUserLeader;
+
+							if (!hasEditRight && (mode != "teacher")) {
+								setInterval("checkLeaderProgress();", 60000);// Auto-Refresh every 1 minute for non-leaders
+							}
+
+							if (!hasEditRight) {
+								$('[name="userEntry"]').prop('disabled', true);
+								$('[name="checkedVotes"]').prop('disabled',
+										true);
+								$('[name="continueOptionsCombined"]').hide();
+							}
+						});
 	</script>
 </lams:head>
 
 <body class="stripes">
 
-	<div id="content">
-		<h1>
-			<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="true" />
-		</h1>
+	<html:form onsubmit="return validate();" action="/learning?validate=false&dispatch=continueOptionsCombined"
+		method="POST" target="_self">
+		<c:set var="formBean" value="<%=request
+							.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+		<html:hidden property="toolSessionID" />
+		<html:hidden property="userID" />
+		<html:hidden property="revisitingUser" />
+		<html:hidden property="previewOnly" />
+		<html:hidden property="maxNominationCount" />
+		<html:hidden property="minNominationCount" />
+		<html:hidden property="allowTextEntry" />
+		<html:hidden property="lockOnFinish" />
+		<html:hidden property="reportViewOnly" />
+		<html:hidden property="showResults" />
+		<html:hidden property="userLeader" />
+		<html:hidden property="groupLeaderName" />
+		<html:hidden property="useSelectLeaderToolOuput" />
 
-		<html:form onsubmit="return validate();" action="/learning?validate=false&dispatch=continueOptionsCombined" method="POST" target="_self">
-			<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-			<html:hidden property="toolSessionID" />
-			<html:hidden property="userID" />
-			<html:hidden property="revisitingUser" />
-			<html:hidden property="previewOnly" />
-			<html:hidden property="maxNominationCount" />
-			<html:hidden property="minNominationCount" />
-			<html:hidden property="allowTextEntry" />
-			<html:hidden property="lockOnFinish" />
-			<html:hidden property="reportViewOnly" />
-			<html:hidden property="showResults" />
-			<html:hidden property="userLeader" />
-			<html:hidden property="groupLeaderName" />
-			<html:hidden property="useSelectLeaderToolOuput" />
-						
+
+		<lams:Page type="learner" title="${voteGeneralLearnerFlowDTO.activityTitle}">
+
+
+
+			<!-- Announcements and advanced settings -->
 			<c:if test="${formBean.useSelectLeaderToolOuput}">
-				<h4>
-					<fmt:message key="label.group.leader" >
+				<lams:Alert id="groupLeader" type="info" close="false">
+					<fmt:message key="label.group.leader">
 						<fmt:param>${formBean.groupLeaderName}</fmt:param>
 					</fmt:message>
-				</h4>
+				</lams:Alert>
 			</c:if>
-			
+
 			<c:if test="${not empty voteGeneralLearnerFlowDTO.submissionDeadline}">
-				<div class="info">
-					<fmt:message key="authoring.info.teacher.set.restriction" >
-						<fmt:param><lams:Date value="${voteGeneralLearnerFlowDTO.submissionDeadline}" /></fmt:param>
-					</fmt:message>	
-				</div>
+				<lams:Alert id="submissionDeadline" type="warning" close="false">
+					<fmt:message key="authoring.info.teacher.set.restriction">
+						<fmt:param>
+							<lams:Date value="${voteGeneralLearnerFlowDTO.submissionDeadline}" />
+						</fmt:param>
+					</fmt:message>
+				</lams:Alert>
 			</c:if>
 
 			<c:if test="${voteGeneralLearnerFlowDTO.maxNominationCountReached == 'true'}">
-				<div class="warning">
+				<lams:Alert id="maxNominations" type="info" close="false">
 					<fmt:message key="error.maxNominationCount.reached" />
 					<c:out value="${voteGeneralLearnerFlowDTO.maxNominationCount}" />
 					<fmt:message key="label.nominations" />
-				</div>
+				</lams:Alert>
 			</c:if>
-
-				<p>
+			<!-- End announcements and advanced settings -->
+			<div class="panel">
 				<c:out value="${voteGeneralLearnerFlowDTO.activityInstructions}" escapeXml="false" />
-				</p>
+			</div>
 
-				<c:if test="${voteGeneralLearnerFlowDTO.maxNominationCount > 1}">
-					<p>&nbsp;</p>
-					<p>
-						<fmt:message key="label.nominations.available">
-							<fmt:param>
-								<c:out value="${voteGeneralLearnerFlowDTO.maxNominationCount}" />
-							</fmt:param>
-						</fmt:message>
-					</p>
-				</c:if>
+			<c:if test="${voteGeneralLearnerFlowDTO.maxNominationCount > 1}">
+				<lams:Alert id="maxNominations" type="info" close="false">
+					<fmt:message key="label.nominations.available">
+						<fmt:param>
+							<c:out value="${voteGeneralLearnerFlowDTO.maxNominationCount}" />
+						</fmt:param>
+					</fmt:message>
+				</lams:Alert>
+			</c:if>
 
-				<table class="shading-bg">
-					<c:forEach var="subEntry" varStatus="status" items="${requestScope.mapQuestionContentLearner}">
+			<!-- options  -->
+			<div class="table-responsive">
+				<table class="table table-hover table-condensed">
+					<tbody>
+						<c:set var="count" value="0" scope="page" />
+						<c:forEach var="subEntry" varStatus="status" items="${requestScope.mapQuestionContentLearner}">
+							<c:set var="count" value="${count + 1}" scope="page" />
 
-						<tr>
-						<td width="1px">
-								<input type="checkbox" name="checkedVotes" class="noBorder"
-									value="${subEntry.key}" onClick="updateCount(this);">
-							</td>
-
-							<td>
-								<c:out value="${subEntry.value}" escapeXml="false" />
-							</td>
-						</tr>
-						
-					</c:forEach>
+							<tr>
+								<td width="20px"><input type="checkbox" id="vote${count}" name="checkedVotes" value="${subEntry.key}"
+									onClick="updateCount(this);"></td>
+								<td width="100%"><label for="vote${count}"><c:out value="${subEntry.value}" escapeXml="false" /></label></td>
+							</tr>
+						</c:forEach>
+					</tbody>
 				</table>
+			</div>
+			<!-- End options -->
 
-				<c:if test="${VoteLearningForm.allowTextEntry == 'true'}">
-					<strong> <fmt:message key="label.other" />: </strong>
-					<html:text property="userEntry" size="30" maxlength="100" />
-				</c:if>
+			<c:if test="${VoteLearningForm.allowTextEntry == 'true'}">
+				<fmt:message key="label.other" />:
+				<html:text styleClass="form-control" property="userEntry" size="30" maxlength="100" />
+			</c:if>
 
-				<html:hidden property="donePreview" />
+			<html:hidden property="donePreview" />
 
-				<div class="space-bottom-top">
-					<html:submit property="continueOptionsCombined" styleClass="button">
-						<fmt:message key="label.submit.vote" />
-					</html:submit>
-				</div>
-				
-		</html:form>
-	</div>
 
-	<div id="footer"></div>
+			<html:submit property="continueOptionsCombined" styleClass="btn btn-primary pull-right voffset10">
+				<fmt:message key="label.submit.vote" />
+			</html:submit>
 
+			<div id="footer"></div>
+
+		</lams:Page>
+
+	</html:form>
+
 </body>
 </lams:html>
Index: lams_tool_vote/web/learning/ExitLearning.jsp
===================================================================
diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -r5f940a9f66e9fc53d5c13d69fc716c4e7675a19e
--- lams_tool_vote/web/learning/ExitLearning.jsp	(.../ExitLearning.jsp)	(revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2)
+++ lams_tool_vote/web/learning/ExitLearning.jsp	(.../ExitLearning.jsp)	(revision 5f940a9f66e9fc53d5c13d69fc716c4e7675a19e)
@@ -14,115 +14,120 @@
 	<html:base />
 	<lams:css />
 	<link type="text/css" href="${lams}/css/chart.css" rel="stylesheet" />
-	
+
 	<title><fmt:message key="activity.title" /></title>
-	
+
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.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">
-		function submitMethod(actionMethod) 
-		{
+		function submitMethod(actionMethod) {
 			if (actionMethod == "learnerFinished") {
 				document.getElementById("finishButton").disabled = true;
-			}			
-			document.VoteLearningForm.dispatch.value=actionMethod; 
+			}
+			document.VoteLearningForm.dispatch.value = actionMethod;
 			document.VoteLearningForm.submit();
 		}
 	</script>
 </lams:head>
 
 <body class="stripes">
-	<div id="content">
 
-		<h1>
-			<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="true" />
-		</h1>
-		
-		<c:if test="${VoteLearningForm.lockOnFinish and voteGeneralLearnerFlowDTO.learningMode != 'teacher'}">
-			<div class="info space-bottom">
-				<fmt:message key="message.activityLocked" />
-			</div>
-		</c:if>
+	<html:form action="/learning?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)%>" />
+		<c:set var="isUserLeader" value="${formBean.userLeader}" />
+		<c:set var="isLeadershipEnabled" value="${formBean.useSelectLeaderToolOuput}" />
+		<c:set var="hasEditRight" value="${!isLeadershipEnabled || isLeadershipEnabled && isUserLeader}" />
 
-		<html:form action="/learning?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)%>" />
-			<c:set var="isUserLeader" value="${formBean.userLeader}" />
-			<c:set var="isLeadershipEnabled" value="${formBean.useSelectLeaderToolOuput}" />
-			<c:set var="hasEditRight" value="${!isLeadershipEnabled || isLeadershipEnabled && isUserLeader}" />
-			
-			<html:hidden property="dispatch" />
-			<html:hidden property="toolSessionID" />
-			<html:hidden property="userID" />
-			<html:hidden property="revisitingUser" />
-			<html:hidden property="previewOnly" />
-			<html:hidden property="maxNominationCount" />
-			<html:hidden property="minNominationCount" />
-			<html:hidden property="allowTextEntry" />
-			<html:hidden property="lockOnFinish" />
-			<html:hidden property="reportViewOnly" />
-			<html:hidden property="userEntry" />
-			<html:hidden property="showResults" />
-			<html:hidden property="userLeader" />
-			<html:hidden property="groupLeaderName" />
-			<html:hidden property="useSelectLeaderToolOuput" />
-			
+		<html:hidden property="dispatch" />
+		<html:hidden property="toolSessionID" />
+		<html:hidden property="userID" />
+		<html:hidden property="revisitingUser" />
+		<html:hidden property="previewOnly" />
+		<html:hidden property="maxNominationCount" />
+		<html:hidden property="minNominationCount" />
+		<html:hidden property="allowTextEntry" />
+		<html:hidden property="lockOnFinish" />
+		<html:hidden property="reportViewOnly" />
+		<html:hidden property="userEntry" />
+		<html:hidden property="showResults" />
+		<html:hidden property="userLeader" />
+		<html:hidden property="groupLeaderName" />
+		<html:hidden property="useSelectLeaderToolOuput" />
+
+		<lams:Page type="learner" title="${voteGeneralLearnerFlowDTO.activityTitle}">
+
+			<c:if test="${VoteLearningForm.lockOnFinish and voteGeneralLearnerFlowDTO.learningMode != 'teacher'}">
+				<lams:Alert id="lockedActivity" type="info" close="false">
+					<fmt:message key="message.activityLocked" />
+				</lams:Alert>
+			</c:if>
+
 			<c:if test="${isLeadershipEnabled}">
-				<h4>
-					<fmt:message key="label.group.leader" >
+				<lams:Alert id="leaderEnabled" type="info" close="false">
+					<fmt:message key="label.group.leader">
 						<fmt:param>${formBean.groupLeaderName}</fmt:param>
 					</fmt:message>
-				</h4>
+				</lams:Alert>
 			</c:if>
 
 			<c:if test="${VoteLearningForm.showResults == 'true'}">
 				<jsp:include page="/learning/RevisitedDisplay.jsp" />
 			</c:if>
-							
+
 			<c:if test="${VoteLearningForm.showResults != 'true'}">
 				<jsp:include page="/learning/RevisitedNoDisplay.jsp" />
 			</c:if>
-			
+
 			<c:if test="${voteGeneralLearnerFlowDTO.reflection}">
-				<h2>
-					<lams:out value="${voteGeneralLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />												
-				</h2>
-	
-				<lams:out value="${voteGeneralLearnerFlowDTO.notebookEntry}" escapeHtml="true" />
+				<hr class="msg-hr">
+				<div class="panel panel-default">
+					<div class="panel-heading panel-title">
+						<fmt:message key="label.reflection" />
+					</div>
+					<div class="panel-body">
+
+						<lams:out value="${voteGeneralLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />
+
+						<div class="panel-body voffset5 bg-warning">
+							<lams:out value="${voteGeneralLearnerFlowDTO.notebookEntry}" escapeHtml="true" />
+						</div>
+
+						<c:if
+							test="${voteGeneralLearnerFlowDTO.lockOnFinish == 'false' && hasEditRight && voteGeneralLearnerFlowDTO.learningMode != 'teacher'}">
+							<html:button property="forwardtoReflection" styleClass="btn btn-sm btn-default voffset10 pull-left"
+								onclick="submitMethod('forwardtoReflection');">
+								<fmt:message key="label.edit" />
+							</html:button>
+						</c:if>
+
+					</div>
+				</div>
 			</c:if>
 
 			<c:if test="${voteGeneralLearnerFlowDTO.learningMode != 'teacher'}">
-				<br>
-				<c:if test="${voteGeneralLearnerFlowDTO.reflection && hasEditRight}">
-					<html:button property="forwardtoReflection" styleClass="button"
-						onclick="submitMethod('forwardtoReflection');"> 
-						<fmt:message key="label.edit" />
-					</html:button>
-				</c:if>
+				<html:link href="#nogo" property="learnerFinished" styleClass="btn btn-primary voffset10 pull-right na"
+					styleId="finishButton" onclick="submitMethod('learnerFinished');return false">
+					<c:choose>
+						<c:when test="${activityPosition.last}">
+							<fmt:message key="button.submitActivity" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="button.endLearning" />
+						</c:otherwise>
+					</c:choose>
 
-				<div class="space-bottom-top align-right">
-					<html:link href="#nogo" property="learnerFinished" styleClass="button" styleId="finishButton"
-						onclick="submitMethod('learnerFinished');return false">
-						<span class="nextActivity">
-							<c:choose>
-								<c:when test="${activityPosition.last}">
-									<fmt:message key="button.submitActivity" />
-								</c:when>
-								<c:otherwise>
-									<fmt:message key="button.endLearning" />
-								</c:otherwise>
-							</c:choose>
-						</span>
-					</html:link>
-				</div>
+				</html:link>
 			</c:if>
+			<div id="footer"></div>
 
-		</html:form>
+		</lams:Page>
+	</html:form>
 
-	</div>
 
-	<div id="footer"></div>
+
 </body>
 </lams:html>
Index: lams_tool_vote/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -r5f940a9f66e9fc53d5c13d69fc716c4e7675a19e
--- lams_tool_vote/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2)
+++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 5f940a9f66e9fc53d5c13d69fc716c4e7675a19e)
@@ -20,116 +20,130 @@
 			if (actionMethod == 'learnerFinished') {
 				document.getElementById("finishButton").disabled = true;
 			}
-			document.VoteLearningForm.action += "&dispatch=" + actionMethod; 
+			document.VoteLearningForm.action += "&dispatch=" + actionMethod;
 			document.VoteLearningForm.submit();
 		}
 	</script>
 </lams:head>
 
 <body class="stripes">
-	<div id="content">
-		<h1>
-			<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="true" />
-		</h1>
-		
-		<c:if test="${VoteLearningForm.lockOnFinish and voteGeneralLearnerFlowDTO.learningMode != 'teacher'}">
-			<div class="info space-bottom">
-				<fmt:message key="message.warnLockOnFinish" />
-			</div>
-		</c:if>	
-			
-		<html:form action="/learning?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)%>" />
-			<c:set var="isUserLeader" value="${formBean.userLeader}" />
-			<c:set var="isLeadershipEnabled" value="${formBean.useSelectLeaderToolOuput}" />
-			<c:set var="hasEditRight" value="${!isLeadershipEnabled || isLeadershipEnabled && isUserLeader}" />
-			
-			<html:hidden property="toolSessionID" />
-			<html:hidden property="userID" />
-			<html:hidden property="revisitingUser" />
-			<html:hidden property="previewOnly" />
-			<html:hidden property="maxNominationCount" />
-			<html:hidden property="minNominationCount" />
-			<html:hidden property="allowTextEntry" />
-			<html:hidden property="lockOnFinish" />
-			<html:hidden property="reportViewOnly" />
-			<html:hidden property="userEntry" />
-			<html:hidden property="showResults" />
-			<html:hidden property="userLeader" />
-			<html:hidden property="groupLeaderName" />
-			<html:hidden property="useSelectLeaderToolOuput" />
-			
+
+	<html:form action="/learning?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)%>" />
+		<c:set var="isUserLeader" value="${formBean.userLeader}" />
+		<c:set var="isLeadershipEnabled" value="${formBean.useSelectLeaderToolOuput}" />
+		<c:set var="hasEditRight" value="${!isLeadershipEnabled || isLeadershipEnabled && isUserLeader}" />
+
+		<html:hidden property="toolSessionID" />
+		<html:hidden property="userID" />
+		<html:hidden property="revisitingUser" />
+		<html:hidden property="previewOnly" />
+		<html:hidden property="maxNominationCount" />
+		<html:hidden property="minNominationCount" />
+		<html:hidden property="allowTextEntry" />
+		<html:hidden property="lockOnFinish" />
+		<html:hidden property="reportViewOnly" />
+		<html:hidden property="userEntry" />
+		<html:hidden property="showResults" />
+		<html:hidden property="userLeader" />
+		<html:hidden property="groupLeaderName" />
+		<html:hidden property="useSelectLeaderToolOuput" />
+
+		<lams:Page type="learner" title="${voteGeneralLearnerFlowDTO.activityTitle}">
+
+			<c:if test="${VoteLearningForm.lockOnFinish and voteGeneralLearnerFlowDTO.learningMode != 'teacher'}">
+				<lams:Alert id="lockWhenFinished" type="info" close="false">
+					<fmt:message key="message.warnLockOnFinish" />
+				</lams:Alert>
+			</c:if>
+
 			<c:if test="${isLeadershipEnabled}">
-				<h4>
-					<fmt:message key="label.group.leader" >
+				<lams:Alert id="leaderEnabled" type="info" close="false">
+					<fmt:message key="label.group.leader">
 						<fmt:param>${formBean.groupLeaderName}</fmt:param>
 					</fmt:message>
-				</h4>
+				</lams:Alert>
 			</c:if>
-			
-			<p>
-				<strong> <fmt:message key="label.learning.reportMessage" /></strong>
-			</p>
 
-			<ul>
-				<c:forEach var="entry" items="${requestScope.mapGeneralCheckedOptionsContent}">
-					<li>
-						<c:out value="${entry.value}" escapeXml="false" />
-					</li>
-				</c:forEach>
+			<div class="row">
+				<div class="col-xs-12">
+					<div class="panel panel-default">
+						<div class="panel-heading panel-title">
+							<fmt:message key="label.learning.reportMessage" />
+						</div>
+						<div class="panel-body">
 
-				<c:if test="${not empty VoteLearningForm.userEntry}">
-					<li>
-						<c:out value="${VoteLearningForm.userEntry}" escapeXml="true"/> 
-					</li>
-				</c:if>
-			</ul>
+							<c:forEach var="entry" items="${requestScope.mapGeneralCheckedOptionsContent}">
+								<div class="media">
+									<div class="media-left">
+										<i class="fa fa-xs fa-check text-success"></i>
+									</div>
+									<div class="media-body">
+										<c:out value="${entry.value}" escapeXml="false" />
+									</div>
+								</div>
+							</c:forEach>
 
-			<div class="space-bottom-top">
-				<c:if test="${hasEditRight}">
-					<html:submit property="redoQuestions" styleClass="button" onclick="submitMethod('redoQuestions');">
-						<fmt:message key="label.retake" />
-					</html:submit>
-				</c:if>
+							<c:if test="${not empty VoteLearningForm.userEntry}">
+								<div class="media">
+									<div class="media-left">
+										<i class="fa fa-xs fa-check text-success"></i>
+									</div>
+									<div class="media-body">
+										<c:out value="${VoteLearningForm.userEntry}" escapeXml="true" />
+									</div>
+								</div>
+							</c:if>
 
-				<c:choose>
+							<c:if test="${hasEditRight}">
+								<html:submit property="redoQuestions" styleClass="btn btn-sm btn-default pull-left voffset10"
+									onclick="submitMethod('redoQuestions');">
+									<fmt:message key="label.retake" />?
+							</html:submit>
+							</c:if>
+
+						</div>
+					</div>
+
+				</div>
+			</div>
+
+
+			<c:choose>
 				<c:when test="${VoteLearningForm.showResults=='true'}">
-					<html:submit property="viewAllResults" styleClass="button" onclick="submitMethod('viewAllResults');">
+					<html:submit property="viewAllResults" styleClass="btn btn-primary pull-right"
+						onclick="submitMethod('viewAllResults');">
 						<fmt:message key="label.overAllResults" />
 					</html:submit>
 				</c:when>
-				
+
 				<c:when test="${voteGeneralLearnerFlowDTO.reflection != 'true' || !hasEditRight}">
-					<span class="right-buttons">
-						<html:link href="#nogo" property="learnerFinished" styleId="finishButton"
-							onclick="javascript:submitMethod('learnerFinished');return false"
-							styleClass="button big-space-top">
-							<span class="nextActivity">
-								<c:choose>
-									<c:when test="${activityPosition.last}">
-										<fmt:message key="button.submitActivity" />
-									</c:when>
-									<c:otherwise>
-										<fmt:message key="button.endLearning" />
-									</c:otherwise>
-								</c:choose>
-							</span>
-						</html:link>
-					</span>
+					<html:link href="#nogo" property="learnerFinished" styleId="finishButton"
+						onclick="javascript:submitMethod('learnerFinished');return false"
+						styleClass="btn btn-primary voffset10 pull-right na">
+						<c:choose>
+							<c:when test="${activityPosition.last}">
+								<fmt:message key="button.submitActivity" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="button.endLearning" />
+							</c:otherwise>
+						</c:choose>
+					</html:link>
 				</c:when>
 
 				<c:otherwise>
-					<html:submit property="forwardtoReflection"
-						onclick="javascript:submitMethod('forwardtoReflection');"
-						styleClass="button">
+					<html:submit property="forwardtoReflection" onclick="javascript:submitMethod('forwardtoReflection');"
+						styleClass="btn btn-primary pull-right">
 						<fmt:message key="label.continue" />
 					</html:submit>
 				</c:otherwise>
-				</c:choose>
-				
-			</div>
-		</html:form>
+			</c:choose>
 
+		</lams:Page>
+	</html:form>
+
 	</div>
 	<div id="footer"></div>
 </body>
Index: lams_tool_vote/web/learning/Notebook.jsp
===================================================================
diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -r5f940a9f66e9fc53d5c13d69fc716c4e7675a19e
--- lams_tool_vote/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2)
+++ lams_tool_vote/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 5f940a9f66e9fc53d5c13d69fc716c4e7675a19e)
@@ -1,7 +1,5 @@
 <!DOCTYPE html>
-
 <%@ include file="/common/taglibs.jsp"%>
-
 <c:set var="lams">
 	<lams:LAMSURL />
 </c:set>
@@ -17,45 +15,44 @@
 
 	<script language="JavaScript" type="text/JavaScript">
 		function submitMethod(actionMethod) {
-			document.VoteLearningForm.dispatch.value=actionMethod; 
+			document.VoteLearningForm.dispatch.value = actionMethod;
 			document.VoteLearningForm.submit();
 		}
 	</script>
 
 </lams:head>
 
 <body class="stripes">
-	<html:form action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">
 
-		<html:hidden property="dispatch" />
-		<html:hidden property="toolSessionID" />
-		<html:hidden property="userID" />
-		<html:hidden property="userLeader" />
-		<html:hidden property="groupLeaderName" />
-		<html:hidden property="useSelectLeaderToolOuput" />
+	<lams:Page type="learner" title="${voteGeneralLearnerFlowDTO.activityTitle}">
+		<html:form action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">
 
-		<div id="content">
-			<h1>
-				<lams:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeHtml="true" />
-			</h1>
+			<html:hidden property="dispatch" />
+			<html:hidden property="toolSessionID" />
+			<html:hidden property="userID" />
+			<html:hidden property="userLeader" />
+			<html:hidden property="groupLeaderName" />
+			<html:hidden property="useSelectLeaderToolOuput" />
 
-			<p>
-				<lams:out value="${voteGeneralLearnerFlowDTO.reflectionSubject}" escapeHtml="true"/>
+			<div class="panel">
+				<lams:out value="${voteGeneralLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />
+			</div>
 
-			</p>
+			<html:textarea rows="5" property="entryText" styleClass="form-control" styleId="focused"></html:textarea>
+			<html:link href="#" property="submitReflection" onclick="javascript:submitMethod('submitReflection');return false"
+				styleClass="btn btn-primary voffset10 pull-right na" styleId="finishButton">
+				<fmt:message key="button.endLearning" />
+			</html:link>
 
-			<html:textarea cols="60" rows="8" property="entryText" styleClass="text-area"></html:textarea>
+		</html:form>
+	</lams:Page>
 
-			<div class="space-bottom-top align-right">
-				<html:link href="#" property="submitReflection"
-					onclick="javascript:submitMethod('submitReflection');return false"
-					styleClass="button" styleId="finishButton">
-					<span class="nextActivity"><fmt:message key="button.endLearning" /></span>
-				</html:link>
-			</div>
-
-		</div>
-	</html:form>
+	<script type="text/javascript">
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
+	
 </body>
 </lams:html>
 
Index: lams_tool_vote/web/learning/RevisitedAllNominations.jsp
===================================================================
diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -r5f940a9f66e9fc53d5c13d69fc716c4e7675a19e
--- lams_tool_vote/web/learning/RevisitedAllNominations.jsp	(.../RevisitedAllNominations.jsp)	(revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2)
+++ lams_tool_vote/web/learning/RevisitedAllNominations.jsp	(.../RevisitedAllNominations.jsp)	(revision 5f940a9f66e9fc53d5c13d69fc716c4e7675a19e)
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-
 <%@ include file="/common/taglibs.jsp"%>
 
 <c:set scope="request" var="lams">
@@ -14,111 +13,130 @@
 	<html:base />
 	<lams:css />
 	<link type="text/css" href="${lams}/css/chart.css" rel="stylesheet" />
-	
+
 	<title><fmt:message key="activity.title" /></title>
-	
+
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.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">
 		function submitMethod(actionMethod) {
 			if (actionMethod == "learnerFinished") {
 				document.getElementById("finishButton").disabled = true;
 			}
-			document.VoteLearningForm.dispatch.value=actionMethod; 
+			document.VoteLearningForm.dispatch.value = actionMethod;
 			document.VoteLearningForm.submit();
 		}
 	</script>
 </lams:head>
 
 <body class="stripes">
 
-	<div id="content">
+	<html:form action="/learning?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)%>" />
+		<c:set var="isUserLeader" value="${formBean.userLeader}" />
+		<c:set var="isLeadershipEnabled" value="${formBean.useSelectLeaderToolOuput}" />
+		<c:set var="hasEditRight" value="${!isLeadershipEnabled || isLeadershipEnabled && isUserLeader}" />
 
-		<h1>
-			<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="true" />
-		</h1>
+		<html:hidden property="dispatch" />
+		<html:hidden property="toolSessionID" />
+		<html:hidden property="userID" />
+		<html:hidden property="revisitingUser" />
+		<html:hidden property="previewOnly" />
+		<html:hidden property="maxNominationCount" />
+		<html:hidden property="minNominationCount" />
+		<html:hidden property="allowTextEntry" />
+		<html:hidden property="lockOnFinish" />
+		<html:hidden property="reportViewOnly" />
+		<html:hidden property="userEntry" />
+		<html:hidden property="showResults" />
+		<html:hidden property="userLeader" />
+		<html:hidden property="groupLeaderName" />
+		<html:hidden property="useSelectLeaderToolOuput" />
 
-		<html:form action="/learning?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)%>" />
-			<c:set var="isUserLeader" value="${formBean.userLeader}" />
-			<c:set var="isLeadershipEnabled" value="${formBean.useSelectLeaderToolOuput}" />
-			<c:set var="hasEditRight" value="${!isLeadershipEnabled || isLeadershipEnabled && isUserLeader}" />
-			
-			<html:hidden property="dispatch" />
-			<html:hidden property="toolSessionID" />
-			<html:hidden property="userID" />
-			<html:hidden property="revisitingUser" />
-			<html:hidden property="previewOnly" />
-			<html:hidden property="maxNominationCount" />
-			<html:hidden property="minNominationCount" />
-			<html:hidden property="allowTextEntry" />
-			<html:hidden property="lockOnFinish" />
-			<html:hidden property="reportViewOnly" />
-			<html:hidden property="userEntry" />
-			<html:hidden property="showResults" />
-			<html:hidden property="userLeader" />
-			<html:hidden property="groupLeaderName" />
-			<html:hidden property="useSelectLeaderToolOuput" />
-			
+		<lams:Page type="learner" title="${voteGeneralLearnerFlowDTO.activityTitle}">
+
 			<c:if test="${isLeadershipEnabled}">
-				<h4>
-					<fmt:message key="label.group.leader" >
+				<lams:Alert type="info" id="leaderEnabled" close="false">
+					<fmt:message key="label.group.leader">
 						<fmt:param>${formBean.groupLeaderName}</fmt:param>
 					</fmt:message>
-				</h4>
+				</lams:Alert>
 			</c:if>
 
-			<c:if test="${VoteLearningForm.showResults == 'true'}">
-				<jsp:include page="/learning/RevisitedDisplay.jsp" />
+			<div class="row">
+				<div class="col-xs12">
+					<div id="revisitedContent" class="panel-body">
+
+
+						<c:if test="${VoteLearningForm.showResults == 'true'}">
+							<jsp:include page="/learning/RevisitedDisplay.jsp" />
+						</c:if>
+
+						<c:if test="${VoteLearningForm.showResults != 'true'}">
+							<jsp:include page="/learning/RevisitedNoDisplay.jsp" />
+						</c:if>
+
+						<c:if test="${hasEditRight}">
+							<html:submit property="redoQuestionsOk" styleClass="btn btn-sm btn-default voffset10 pull-left"
+								onclick="submitMethod('redoQuestionsOk');">
+								<fmt:message key="label.retake" />
+							</html:submit>
+						</c:if>
+					</div>
+				</div>
+			</div>
+
+			<c:if test="${voteGeneralLearnerFlowDTO.reflection == 'true'}">
+			<hr class="msg-hr">
+				<div class="panel panel-default">
+					<div class="panel-heading panel-title">
+						<fmt:message key="label.reflection" />
+					</div>
+					<div class="panel-body">
+
+						<lams:out value="${voteGeneralLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />
+
+						<div class="panel-body voffset5 bg-warning">
+							<lams:out value="${voteGeneralLearnerFlowDTO.notebookEntry}" escapeHtml="true" />
+						</div>
+
+						<c:if test="${voteGeneralLearnerFlowDTO.lockOnFinish == 'false' && hasEditRight}">
+							<html:button property="forwardtoReflection" styleClass="btn btn-sm btn-default voffset10 pull-left"
+								onclick="submitMethod('forwardtoReflection');">
+								<fmt:message key="label.edit" />
+							</html:button>
+						</c:if>
+
+					</div>
+				</div>
 			</c:if>
-							
-			<c:if test="${VoteLearningForm.showResults != 'true'}">
-				<jsp:include page="/learning/RevisitedNoDisplay.jsp" />
-			</c:if>
 
-			<h4>
-				<lams:out value="${voteGeneralLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />												
-			</h4>
 
-			<lams:out value="${voteGeneralLearnerFlowDTO.notebookEntry}" escapeHtml="true" />
-			
-			<c:if test="${voteGeneralLearnerFlowDTO.lockOnFinish == 'true' && hasEditRight}">					
-				<br>
-				<html:button property="forwardtoReflection" styleClass="button" onclick="submitMethod('forwardtoReflection');"> 
-					<fmt:message key="label.edit" />
-				</html:button>
-			</c:if>													
 
-			<div class="space-bottom-top">
+			<html:link href="#nogo" property="learnerFinished" styleId="finishButton"
+				onclick="javascript:submitMethod('learnerFinished');return false"
+				styleClass="btn btn-primary voffset10 pull-right na">
+				<span class="nextActivity"> <c:choose>
+						<c:when test="${activityPosition.last}">
+							<fmt:message key="button.submitActivity" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="button.endLearning" />
+						</c:otherwise>
+					</c:choose>
+				</span>
+			</html:link>
 
-				<c:if test="${hasEditRight}">
-					<html:submit property="redoQuestionsOk" styleClass="button" onclick="submitMethod('redoQuestionsOk');">
-						<fmt:message key="label.retake" />
-					</html:submit>
-				</c:if>
+			<div id="footer"></div>
 
-				<html:link href="#nogo" property="learnerFinished" styleId="finishButton"
-					onclick="javascript:submitMethod('learnerFinished');return false"
-					styleClass="button big-space-top">
-					<span class="nextActivity">
-						<c:choose>
-							<c:when test="${activityPosition.last}">
-								<fmt:message key="button.submitActivity" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="button.endLearning" />
-							</c:otherwise>
-						</c:choose>
-					</span>
-				</html:link>
-			</div>
-		</html:form>
+		</lams:Page>
+	</html:form>
 
-	</div>
 
-	<div id="footer"></div>
+
 </body>
 </lams:html>
Index: lams_tool_vote/web/learning/RevisitedDisplay.jsp
===================================================================
diff -u -r1eadfd07c1afcebfb2b87c43a11c92041698ee3c -r5f940a9f66e9fc53d5c13d69fc716c4e7675a19e
--- lams_tool_vote/web/learning/RevisitedDisplay.jsp	(.../RevisitedDisplay.jsp)	(revision 1eadfd07c1afcebfb2b87c43a11c92041698ee3c)
+++ lams_tool_vote/web/learning/RevisitedDisplay.jsp	(.../RevisitedDisplay.jsp)	(revision 5f940a9f66e9fc53d5c13d69fc716c4e7675a19e)
@@ -1,30 +1,22 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<h2>
+<h4>
 	<fmt:message key="label.progressiveResults" />
-</h2>
+</h4>
 
 <!--present  a mini summary table here -->
-<table cellspacing="0" class="alternative-color">
+<table class="table table-hover table-stripped" id="voteSummary">
 	<tr>
-		<th>
-			<fmt:message key="label.nomination" />
-		</th>
-		<th>
-			<fmt:message key="label.total.votes" />
-		</th>
+		<th><fmt:message key="label.nomination" /></th>
+		<th class="text-center"><fmt:message key="label.total.votes" /></th>
 	</tr>
-
 	<c:forEach var="currentNomination" items="${voteGeneralLearnerFlowDTO.mapStandardNominationsHTMLedContent}">
 		<c:set var="currentNominationKey" scope="request" value="${currentNomination.key}" />
 		<tr>
-			<td class="space">
-				<c:out value="${currentNomination.value}" escapeXml="false" />
-			</td>
+			<td class="text-left"><c:out value="${currentNomination.value}" escapeXml="false" /></td>
 
-			<td>
-
-				<c:forEach var="currentUserCount" items="${voteGeneralLearnerFlowDTO.mapStandardUserCount}">
+			<td class="text-center"><c:forEach var="currentUserCount"
+					items="${voteGeneralLearnerFlowDTO.mapStandardUserCount}">
 					<c:set var="currentUserKey" scope="request" value="${currentUserCount.key}" />
 					<c:if test="${currentNominationKey == currentUserKey}">
 
@@ -36,15 +28,15 @@
 									<c:forEach var="currentSessionUid" items="${voteGeneralLearnerFlowDTO.mapStandardToolSessionUid}">
 										<c:set var="currentSessionUidKey" scope="request" value="${currentSessionUid.key}" />
 										<c:if test="${currentSessionUidKey == currentQuestionUidKey}">
-	
+
 											<c:if test="${currentNomination.value != 'Open Vote'}">
 												<c:set scope="request" var="viewURL">
 													<lams:WebAppURL />monitoring.do?method=getVoteNomination&questionUid=${currentQuestionUid.value}&sessionUid=${currentSessionUid.value}
 												</c:set>
-		
+
 												<c:out value="${currentUserCount.value}" />
 											</c:if>
-											
+
 											<c:if test="${currentNomination.value == 'Open Vote'}">
 												<c:out value="${currentUserCount.value}" />
 											</c:if>
@@ -53,74 +45,88 @@
 								</c:if>
 							</c:forEach>
 						</c:if>
-									
+
 						<c:if test="${currentUserCount.value == '0' }">
 							<c:out value="${currentUserCount.value}" />
 						</c:if>
 					</c:if>
-				</c:forEach>
-
-				<c:forEach var="currentRate" items="${voteGeneralLearnerFlowDTO.mapStandardRatesContent}">
+				</c:forEach> <c:forEach var="currentRate" items="${voteGeneralLearnerFlowDTO.mapStandardRatesContent}">
 					<c:set var="currentRateKey" scope="request" value="${currentRate.key}" />
 					<c:if test="${currentNominationKey == currentRateKey}"> 				
 						&nbsp(<fmt:formatNumber type="number" maxFractionDigits="2" value="${currentRate.value}" />
 						<fmt:message key="label.percent" />) 
 					</c:if>
-				</c:forEach>
-			</td>
+				</c:forEach></td>
 		</tr>
 	</c:forEach>
 
 </table>
 
-<div>
-	<div class="float-right">
-		<c:set var="chartURL" value="${tool}chartGenerator.do?currentSessionId=${VoteLearningForm.toolSessionID}" />
-		<img src='<c:out value="${tool}"/>images/piechart.gif' width="30"
-			title="<fmt:message key='label.tip.displayPieChart'/>"
-			style="cursor: pointer;" height="30" border="0"
-			onclick="javascript:drawChart('pie', 'chartDiv', '${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('pie', 'chartDiv', '${chartURL}')">
-	</div>
-				
+
+<div class="pull-right">
+	<c:set var="chartURL" value="${tool}chartGenerator.do?currentSessionId=${VoteLearningForm.toolSessionID}" />
+	<a title="<fmt:message key='label.tip.displayPieChart'/>" class="fa fa-pie-chart text-primary btn btn-md btn-primary"
+		onclick="javascript:drawChart('pie', 'chartDiv', '${chartURL}')"></a> <a
+		title="<fmt:message key='label.tip.displayBarChart'/>" class="fa fa-bar-chart text-primary btn btn-md btn-primary"
+		onclick="javascript:drawChart('bar', 'chartDiv', '${chartURL}')"></a>
+</div>
+
+<div id="textEntries">
 	<c:if test="${VoteLearningForm.allowTextEntry}">
-		<strong> <fmt:message key="label.open.votes"/> </strong>
+		<strong> <fmt:message key="label.open.votes" />
+		</strong>
 		<c:forEach var="vote" items="${requestScope.listUserEntriesContent}">
-			<div>
-			<c:choose>
-			<c:when test="${vote.visible}">
-				<c:out value="${vote.userEntry}" escapeXml="true" />
-			</c:when>
-			<c:otherwise>
-				<em>(<fmt:message key="label.hidden"/>)</em>
-			</c:otherwise>
-			</c:choose>
-			</div>
+			<c:if test="${vote.userEntry != ''}">
+				<div class="media">
+					<div class="media-left">
+						<i class="fa fa-xs fa-check text-success"></i>
+					</div>
+					<div class="media-body">
+						<c:choose>
+							<c:when test="${vote.visible}">
+								<c:out value="${vote.userEntry}" escapeXml="true" />
+							</c:when>
+							<c:otherwise>
+								<em>(<fmt:message key="label.hidden" />)
+								</em>
+							</c:otherwise>
+						</c:choose>
+					</div>
+				</div>
+			</c:if>
 		</c:forEach>
-		<div>&nbsp;</div>
 	</c:if>
-
+</div>
+<div id="nominations" class="voffset10">
 	<c:choose>
 		<c:when test="${fn:length(requestScope.listGeneralCheckedOptionsContent) > 1}">
-        	<strong><fmt:message key="label.learner.nominations" />  </strong>
+			<strong><fmt:message key="label.learner.nominations" /> </strong>
 		</c:when>
-	    <c:otherwise>
-			<strong><fmt:message key="label.learner.nomination" />  </strong>
+		<c:otherwise>
+			<strong><fmt:message key="label.learner.nomination" /> </strong>
 		</c:otherwise>
 	</c:choose>
 
-	<c:forEach var="entry"items="${requestScope.listGeneralCheckedOptionsContent}">
-		<div>
-			<c:out value="${entry}" escapeXml="false" />
+	<c:forEach var="entry" items="${requestScope.listGeneralCheckedOptionsContent}">
+		<div class="media">
+			<div class="media-left">
+				<i class="fa fa-xs fa-check text-success"></i>
+			</div>
+			<div class="media-body">
+				<c:out value="${entry}" escapeXml="false" />
+			</div>
 		</div>
 	</c:forEach>
-	
-	<div>
-		<c:out value="${VoteLearningForm.userEntry}" escapeXml="true"/>
-	</div>
 
-	<div id="chartDiv" style="height: 220px; display: none;"></div>
+	<c:if test="${not empty VoteLearningForm.userEntry}">
+		<div class="media">
+			<div class="media-left">
+				<i class="fa fa-xs fa-check text-success"></i>
+			</div>
+			<div class="media-body">
+				<c:out value="${VoteLearningForm.userEntry}" escapeXml="true" />
+			</div>
+		</div>
+	</c:if>
 </div>
+<div id="chartDiv" style="height: 220px; display: none;"></div>
Index: lams_tool_vote/web/learning/RevisitedNoDisplay.jsp
===================================================================
diff -u -r47504be2fed82feafa090c667f43ae1a04a5d5cc -r5f940a9f66e9fc53d5c13d69fc716c4e7675a19e
--- lams_tool_vote/web/learning/RevisitedNoDisplay.jsp	(.../RevisitedNoDisplay.jsp)	(revision 47504be2fed82feafa090c667f43ae1a04a5d5cc)
+++ lams_tool_vote/web/learning/RevisitedNoDisplay.jsp	(.../RevisitedNoDisplay.jsp)	(revision 5f940a9f66e9fc53d5c13d69fc716c4e7675a19e)
@@ -1,21 +1,37 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <c:choose>
-	 <c:when test="${fn:length(requestScope.listGeneralCheckedOptionsContent) > 1}">
-	    <h2><fmt:message key="label.learner.nominations" /></h2>
-	 </c:when>
-	 
-	 <c:otherwise>
-	    <h2><fmt:message key="label.learner.nomination" /></h2>
-	 </c:otherwise>
+	<c:when test="${fn:length(requestScope.listGeneralCheckedOptionsContent) > 1}">
+		<h4>
+			<fmt:message key="label.learner.nominations" />
+		</h4>
+	</c:when>
+
+	<c:otherwise>
+		<h4>
+			<fmt:message key="label.learner.nomination" />
+		</h4>
+	</c:otherwise>
 </c:choose>
 
 <c:forEach var="entry" items="${requestScope.listGeneralCheckedOptionsContent}">
-	<div>
-		<c:out value="${entry}" escapeXml="false" />
+	<div class="media">
+		<div class="media-left">
+			<i class="fa fa-xs fa-check text-success"></i>
+		</div>
+		<div class="media-body">
+			<c:out value="${entry}" escapeXml="false" />
+		</div>
 	</div>
 </c:forEach>
 
-<div>
-	<lams:out value="${VoteLearningForm.userEntry}" escapeHtml="true" />
-</div>
+<c:if test="${not empty VoteLearningForm.userEntry}">
+	<div class="media">
+		<div class="media-left">
+			<i class="fa fa-xs fa-check text-success"></i>
+		</div>
+		<div class="media-body">
+			<c:out value="${VoteLearningForm.userEntry}" escapeXml="true" />
+		</div>
+	</div>
+</c:if>
Index: lams_tool_vote/web/learning/WaitForLeader.jsp
===================================================================
diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -r5f940a9f66e9fc53d5c13d69fc716c4e7675a19e
--- lams_tool_vote/web/learning/WaitForLeader.jsp	(.../WaitForLeader.jsp)	(revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2)
+++ lams_tool_vote/web/learning/WaitForLeader.jsp	(.../WaitForLeader.jsp)	(revision 5f940a9f66e9fc53d5c13d69fc716c4e7675a19e)
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-
 <%@ include file="/common/taglibs.jsp"%>
 
 <lams:html>
@@ -13,44 +12,33 @@
 		function refresh() {
 			location.reload();
 		}
-		
+
 		//refresh page every 30 sec
-		setTimeout("refresh();",30000);
-    </script>
+		setTimeout("refresh();", 30000);
+	</script>
 </lams:head>
 <body class="stripes">
 
-	<div id="content">
-		<h1>
-			<c:out value="${content.title}" escapeXml="true"/>
-		</h1>
-		
-		<h2>
+	<lams:Page type="learner" title="${content.title}">
+		<h4>
 			<fmt:message key="label.waiting.for.leader" />
-		</h2>
+		</h4>
 
 		<div>
 			<fmt:message key="label.users.from.group" />
 		</div>
-		
+
 		<div>
 			<c:forEach var="user" items="${groupUsers}" varStatus="status">
-				<div>
-					<c:out value="${user.fullname}" escapeXml="true"/>
+				<div class="user">
+					<c:out value="${user.fullname}" escapeXml="true" />
 				</div>
 			</c:forEach>
 		</div>
-		
-		<div class="space-bottom-top align-right">
-			<html:button property="refreshButton" onclick="refresh();" styleClass="button">
-				<fmt:message key="label.refresh" />
-			</html:button>
-		</div>
 
-	</div>
-
-	<div id="footer">
-	</div>
-
+		<html:button property="refreshButton" onclick="refresh();" styleClass="btn btn-sm btn-primary pull-right">
+			<fmt:message key="label.refresh" />
+		</html:button>
+	</lams:Page>
 </body>
 </lams:html>
\ No newline at end of file
Index: lams_tool_vote/web/learning/defineLater.jsp
===================================================================
diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -r5f940a9f66e9fc53d5c13d69fc716c4e7675a19e
--- lams_tool_vote/web/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2)
+++ lams_tool_vote/web/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 5f940a9f66e9fc53d5c13d69fc716c4e7675a19e)
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-
 <%@ include file="/common/taglibs.jsp"%>
 
 <c:set scope="request" var="lams">
@@ -13,18 +12,17 @@
 <lams:head>
 	<html:base />
 	<lams:css />
-	<title><fmt:message key="activity.title" />
-	</title>
+	<title><fmt:message key="activity.title" /></title>
 </lams:head>
 
 <body class="stripes">
-	<div id="content">
-		<h1>
-			<fmt:message key="activity.title" />
-		</h1>
+	<c:set var="title" scope="request">
+		<fmt:message key="activity.title" />
+	</c:set>
+	<lams:Page type="learner" title="${title}">
 		<lams:DefineLater defineLaterMessageKey="error.defineLater" />
-	</div>
-	<div id="footer"></div>
+		<div id="footer"></div>
+	</lams:Page>
 </body>
 </lams:html>
 
Index: lams_tool_vote/web/learning/submissionDeadline.jsp
===================================================================
diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -r5f940a9f66e9fc53d5c13d69fc716c4e7675a19e
--- lams_tool_vote/web/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2)
+++ lams_tool_vote/web/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 5f940a9f66e9fc53d5c13d69fc716c4e7675a19e)
@@ -1,7 +1,5 @@
 <!DOCTYPE html>
-
 <%@ include file="/common/taglibs.jsp"%>
-
 <c:set var="lams">
 	<lams:LAMSURL />
 </c:set>
@@ -27,31 +25,28 @@
 
 <body class="stripes">
 
+<c:set var="title" scope="request">
+	<fmt:message key="activity.title" />
+</c:set>
+
+<lams:Page type="learner" title="${title}">
+
 	<html:form action="/learning?validate=false" method="POST">
 		<html:hidden property="dispatch" />
 		<html:hidden property="toolSessionID" />
 		<html:hidden property="userID" />
-
-		<div id="content">
-
-			<h1>
-				<fmt:message key="activity.title" />
-			</h1>
 			
-			<div class="warning">
+			<lams:Alert id="submissionDeadline" type="danger" close="false">
 				<fmt:message key="authoring.info.teacher.set.restriction" >
 					<fmt:param><lams:Date value="${submissionDeadline}" /></fmt:param>
 				</fmt:message>
-			</div>
+			</lams:Alert>
 			
-			<div class="space-bottom-top align-right">
-
 				<c:if test="${voteGeneralLearnerFlowDTO.reflection != 'true'}">
 
 					<html:link href="#nogo" property="endLearning" styleId="finishButton" 
 				      onclick="javascript:submitMethod('learnerFinished');return false"
-				      styleClass="button">
-						<span class="nextActivity">
+				      styleClass="btn btn-primary voffset10 pull-right na">
 							<c:choose>
 								<c:when test="${activityPosition.last}">
 									<fmt:message key="button.submitActivity" />
@@ -60,23 +55,19 @@
 									<fmt:message key="button.endLearning" />
 								</c:otherwise>
 							</c:choose>
-						</span>
 					</html:link>
 
 				</c:if>
 
 				<c:if test="${voteGeneralLearnerFlowDTO.reflection == 'true'}">
 					<html:submit property="forwardtoReflection"
 						onclick="javascript:submitMethod('forwardtoReflection');"
-						styleClass="button">
+						styleClass="btn btn-primary voffset10 pull-right">
 						<fmt:message key="label.continue" />
 					</html:submit>
 				</c:if>
 
-			</div>
-
-		</div>
 	</html:form>
-
+</lams:Page>
 </body>
 </lams:html>