Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java
===================================================================
diff -u -r36db941b897cc39fda9832b8b73b3b81a3c9faa9 -r418f65577010d4ad648867396f4e14cd36d2c723
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java	(.../VoteLearningAction.java)	(revision 36db941b897cc39fda9832b8b73b3b81a3c9faa9)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java	(.../VoteLearningAction.java)	(revision 418f65577010d4ad648867396f4e14cd36d2c723)
@@ -441,8 +441,7 @@
     
     	
     	logger.debug("created user attempt in the db");
-    	voteLearningForm.resetCommands();
-
+    	
     	// Put the map in the request ready for the next screen
     	request.setAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT, mapGeneralCheckedOptionsContent);
     	logger.debug("final mapGeneralCheckedOptionsContent: " + mapGeneralCheckedOptionsContent);
@@ -453,6 +452,7 @@
     	MonitoringUtil.prepareChartData(request, voteService, null, toolContentId, toolSessionUid);
     	
     	logger.debug("fwding to INDIVIDUAL_REPORT: " + INDIVIDUAL_REPORT);
+    	voteLearningForm.resetCommands();
     	return (mapping.findForward(INDIVIDUAL_REPORT));
     }
 
@@ -492,6 +492,7 @@
 	    String previewOnly=(String)request.getSession().getAttribute(PREVIEW_ONLY);
 	    logger.debug("previewOnly : " + previewOnly);
 	    logger.debug("fwd'ing to LOAD_LEARNER : " + LOAD_LEARNER);
+	    voteLearningForm.resetCommands();
 	    return (mapping.findForward(LOAD_LEARNER));
    }
 
Index: lams_tool_vote/web/authoring/AdvancedContent.jsp
===================================================================
diff -u -re48a67de27af42221ddce80419f05c1be4680430 -r418f65577010d4ad648867396f4e14cd36d2c723
--- lams_tool_vote/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision e48a67de27af42221ddce80419f05c1be4680430)
+++ lams_tool_vote/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 418f65577010d4ad648867396f4e14cd36d2c723)
@@ -33,73 +33,65 @@
 
 				<table class="forms">
 				<tr>
-	      			<td NOWRAP class="formlabel" valign=top>
-		      			<font size=2> <b>
+					<td class="field-name">							
+		      			 <b>
 			      			<bean:message key="label.vote.changable"/>:
-			      		</b> </font>		      			
+			      		</b> 
 					</td>
-					<td NOWRAP valign=top>
-						<font size=2>
+	  				<td NOWRAP valign=top>
 						<html:radio property="voteChangable" value="ON">
 						 <bean:message key="option.on"/>
 						</html:radio>
 
 						<html:radio property="voteChangable" value="OFF">
 						 <bean:message key="option.off"/>
 						</html:radio>
-						</font>												
 	      			</td>
 		         </tr>
 		         
 				<tr>
-	      			<td NOWRAP class="formlabel" valign=top>
-		      			<font size=2> <b>
+					<td class="field-name">							
+		      			 <b>
 			      			<bean:message key="label.vote.lockedOnFinish"/>:
-			      		</b> </font>		      			
+			      		</b> 
 					</td>
 					<td NOWRAP valign=top>
-						<font size=2>
 						<html:radio property="lockOnFinish" value="ON">
 						 <bean:message key="option.on"/>
 						</html:radio>
 
 						<html:radio property="lockOnFinish" value="OFF">
 						 <bean:message key="option.off"/>
 						</html:radio>
-						</font>												
 	      			</td>
 		         </tr>
 		         
 
 				<tr>
-	      			<td NOWRAP class="formlabel" valign=top>
-		      			<font size=2> <b>
+					<td class="field-name">							
+		      			 <b>
 			      			<bean:message key="label.allowText"/>:
-			      		</b> </font>		      			
+			      		</b> 
 					</td>
 					<td NOWRAP valign=top>
-						<font size=2>
 						<html:radio property="allowText" value="ON">
 						 <bean:message key="option.on"/>
 						</html:radio>
 
 						<html:radio property="allowText" value="OFF">
 						 <bean:message key="option.off"/>
 						</html:radio>
-						</font>												
 	      			</td>
 		         </tr>
 
 
 			  	<tr> 
-	      			<td NOWRAP class="formlabel" valign=top>
-	      			<font size=2> <b>
+					<td class="field-name">							
+	      			 <b>
 				 		<bean:message key="label.maxNomCount"/>: </td>
-		      		</b> </font>		      							 					 		
+		      		</b> 
 					<td NOWRAP valign=top>
-					<font size=2>
 			 			<html:text property="maxNominationCount" size="3" maxlength="3"/>
-					</font>									 			
 			 		</td>
 			  	</tr>
 				
Index: lams_tool_vote/web/authoring/BasicContent.jsp
===================================================================
diff -u -re48a67de27af42221ddce80419f05c1be4680430 -r418f65577010d4ad648867396f4e14cd36d2c723
--- lams_tool_vote/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision e48a67de27af42221ddce80419f05c1be4680430)
+++ lams_tool_vote/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 418f65577010d4ad648867396f4e14cd36d2c723)
@@ -33,24 +33,24 @@
 <c:set var="tool"><lams:WebAppURL/></c:set>
 
 	                                     
-		           <h2><font size=2> <b> <bean:message key="label.authoring.vote.basic"/> </b></font></h2>
+		           <h2>  <bean:message key="label.authoring.vote.basic"/> </h2>
 					<table class="forms">
 						<tr>   
 						<td NOWRAP class=error>
 							<c:if test="${sbmtSuccess == 'true' }"> 			
-								<img src="<c:out value="${tool}"/>images/success.gif" align="left" width=20 height=20>  <font size=2> <bean:message key="sbmt.successful"/> </font> </img>
+								<img src="<c:out value="${tool}"/>images/success.gif" align="left" width=20 height=20>  <bean:message key="sbmt.successful"/>  </img>
 							</c:if> 			
 
 							<c:if test="${userExceptionMaxNominationInvalid == 'true'}"> 										
-									<img src="<c:out value="${tool}"/>images/error.jpg" align="left" width=20 height=20>  <font size=2> <bean:message key="error.maxNominationCount.invalid"/> </font> </img>
+									<img src="<c:out value="${tool}"/>images/error.jpg" align="left" width=20 height=20>  <bean:message key="error.maxNominationCount.invalid"/>  </img>
 							</c:if> 			
 
 							<c:if test="${validationError == 'true'}"> 			
-									<img src="<c:out value="${tool}"/>images/error.jpg" align="left" width=20 height=20>  <font size=2> <bean:message key="error.fields.mandatory"/> </font> </img>
+									<img src="<c:out value="${tool}"/>images/error.jpg" align="left" width=20 height=20>  <bean:message key="error.fields.mandatory"/>  </img>
 							</c:if> 			
 							
 							<c:if test="${userExceptionOptionsDuplicate == 'true'}"> 			
-									<img src="<c:out value="${tool}"/>images/error.jpg" align="left" width=20 height=20>  <font size=2> <bean:message key="error.duplicate.nomination"/> </font> </img>
+									<img src="<c:out value="${tool}"/>images/error.jpg" align="left" width=20 height=20>   <bean:message key="error.duplicate.nomination"/>  </img>
 							</c:if> 			
 							
 						</td>
@@ -80,7 +80,7 @@
 							</td> 
 							
 						  	<td NOWRAP valign=middle>			
-								 <font size=2>  <img src="<c:out value="${tool}"/>images/down.gif" align=left onclick="javascript:submitModifyNomination('1','moveNominationDown');"> </font>
+								  <img src="<c:out value="${tool}"/>images/down.gif" align=left onclick="javascript:submitModifyNomination('1','moveNominationDown');"> 
 							</td> 								
 							<td> </td>														 
 					  	</tr>
@@ -113,14 +113,12 @@
                                     </td>
 	      						  	<td NOWRAP valign=middle>			
 						  				<c:if test="${maxOptionIndex == optIndex}"> 			
-		     								 <font size=2> <img src="<c:out value="${tool}"/>images/up.gif" align=left onclick="javascript:submitModifyNomination('<c:out value="${optIndex}"/>','moveNominationUp');"> </font>
+		     								  <img src="<c:out value="${tool}"/>images/up.gif" align=left onclick="javascript:submitModifyNomination('<c:out value="${optIndex}"/>','moveNominationUp');"> 
 		     							</c:if> 	    
 										
 		 				  				<c:if test="${maxOptionIndex != optIndex }"> 			
-			 				  				<font size=2>
 			   								    <img src="<c:out value="${tool}"/>images/down.gif" align=left onclick="javascript:submitModifyNomination('<c:out value="${optIndex}"/>','moveNominationDown');">		  	   								 
 			       								<img src="<c:out value="${tool}"/>images/up.gif" align=left onclick="javascript:submitModifyNomination('<c:out value="${optIndex}"/>','moveNominationUp');">		  	
-			       							</font>
 										</c:if> 	           								 
 		                         	</td>
 								  </tr>
Index: lams_tool_vote/web/authoring/BasicContentViewOnly.jsp
===================================================================
diff -u -re48a67de27af42221ddce80419f05c1be4680430 -r418f65577010d4ad648867396f4e14cd36d2c723
--- lams_tool_vote/web/authoring/BasicContentViewOnly.jsp	(.../BasicContentViewOnly.jsp)	(revision e48a67de27af42221ddce80419f05c1be4680430)
+++ lams_tool_vote/web/authoring/BasicContentViewOnly.jsp	(.../BasicContentViewOnly.jsp)	(revision 418f65577010d4ad648867396f4e14cd36d2c723)
@@ -31,21 +31,21 @@
 				<tr> <td>
 						<table class="forms">
 							<tr> 
-						 		<td valign="top"><font size=2> <b> <bean:message key="label.authoring.title"/>: </b></font> </td>
+						 		<td valign="top"><b> <bean:message key="label.authoring.title"/>: </b> </td>
 						 		<td NOWRAP> 
 	                                     <c:out value="${activityTitle}" escapeXml="false"/>
 								</td> 
 						  	</tr>
 						  	<tr> 
-						 		<td valign="top"><font size=2> <b> <bean:message key="label.authoring.instructions"/>:  </b></font></td>
+						 		<td valign="top"><b> <bean:message key="label.authoring.instructions"/>:  </b></td>
 						 		<td NOWRAP> 
 	                                    <c:out value="${activityInstructions}" escapeXml="false"/>
 								</td>
 							</tr>
 					
 					 		<tr> 
 							  	<td valign="top"> 
-							 		<font size=2> <b> <bean:message key="label.nomination1"/>:  </b></font>
+							 		 <b> <bean:message key="label.nomination1"/>:  </b>
 							 	</td>
 							  	<td>
 										<c:out value="${defaultOptionContent}"  escapeXml="false"/>
@@ -58,7 +58,7 @@
 					  		<c:if test="${optionEntry.key > 1}"> 			
 								<c:set var="optIndex" scope="session" value="${optIndex +1}"/>
 								  <tr>
-								  	<td NOWRAP valign="top">  <font size=2> <b> <c:out value="Nomination ${optIndex}"/>:  </b> </font></td>
+								  	<td NOWRAP valign="top">   <b> <c:out value="Nomination ${optIndex}"/>:  </b> </td>
 
 									<td NOWRAP valign=top>
 										<c:out value="${optionEntry.value}"  escapeXml="false"/>										
Index: lams_tool_vote/web/authoring/InstructionsContent.jsp
===================================================================
diff -u -re48a67de27af42221ddce80419f05c1be4680430 -r418f65577010d4ad648867396f4e14cd36d2c723
--- lams_tool_vote/web/authoring/InstructionsContent.jsp	(.../InstructionsContent.jsp)	(revision e48a67de27af42221ddce80419f05c1be4680430)
+++ lams_tool_vote/web/authoring/InstructionsContent.jsp	(.../InstructionsContent.jsp)	(revision 418f65577010d4ad648867396f4e14cd36d2c723)
@@ -39,117 +39,109 @@
 					</td> 
 				</tr>
 				
-				<tr> 
-					<td NOWRAP class="formlabel" valign=top>
-						<font size=2>
-    	      				<b> <bean:message key="label.onlineFiles" /> </b>
-    	      			</font>
-          			</td>
-          			<td colspan=3 NOWRAP valign=top> 
-	          			<font size=2>
-							<html:file  property="theOnlineFile"></html:file>
-						 	<html:submit onclick="javascript:submitMethod('submitOnlineFiles');" styleClass="buttonLeft">
-								 <bean:message key="button.upload"/> 
-							</html:submit>
-						</font>
-					</td> 
-				</tr>
-
 				<tr>
-					<td NOWRAP align="right" valign=top>
-	          			<font size=2>
-		      				<b> <bean:message key="label.uploadedOnlineFiles" /> </b>
-	      				</font>
-          			</td>
           			
-					<td NOWRAP colspan=3 align=left valign=top width="100%">
+					<td NOWRAP colspan=4 align=left valign=top width="100%">
 						<table align="left" >
 									<c:forEach var='file' items='${sessionScope.listOnlineFilesMetadata}'>
 											<tr>
 												<td NOWRAP valign=top>
-													<font size=2> <c:out value="${file.filename}"/> </font>
-													&nbsp&nbsp
+													 <c:out value="${file.filename}"/> 
+													</td>
+													<td NOWRAP valign=top>												
 													<c:set var="viewURL">
 														<html:rewrite page="/download/?uuid=${file.uuid}&preferDownload=false"/>
 													</c:set>
 													<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-														 <font size=2>	<bean:message key="label.view"/> </font>
+														 	<bean:message key="label.view"/> 
 													</a>
-													&nbsp
+													</td>
+													<td NOWRAP valign=top>													
 													<c:set var="downloadURL">
 															<html:rewrite page="/download/?uuid=${file.uuid}&preferDownload=true"/>
 													</c:set>
 													<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-														<font size=2> <bean:message key="label.download"/> </font>
+														 <bean:message key="label.download"/> 
 													</a>
-													&nbsp
-													<font size=2> <img src="<c:out value="${tool}"/>images/delete.gif" align=left onclick="javascript:submitDeleteFile('<c:out value="${file.uuid}"/>','deleteOnlineFile');"> </font>	
+													</td>
+													<td NOWRAP valign=top>
+
+													 <img src="<c:out value="${tool}"/>images/delete.gif" align=left onclick="javascript:submitDeleteFile('<c:out value="${file.uuid}"/>','deleteOnlineFile');"> 	
 												</td>
 											</tr>
 				         			</c:forEach>
 	         			</table>
 					</td> 
 				</tr>
 
-				
 				<tr> 
-					<td NOWRAP colspan=4 valign=top>
-						<lams:SetEditor id="richTextOfflineInstructions" text="${richTextOfflineInstructions}" small="true" key="label.offlineInstructions.col"/>																			
-					</td> 
-				</tr>
-				
-				<tr> 
-					<td NOWRAP class="formlabel" valign=top>
-						<font size=2>
-							<b> <bean:message key="label.offlineFiles" /> <b>
-						</font>
+					<td class="field-name">
+    	      				<b> <bean:message key="label.onlineFiles" /> </b>
           			</td>
           			<td colspan=3 NOWRAP valign=top> 
-	          			<font size=2>
-							<html:file  property="theOfflineFile"></html:file>
-						 	<html:submit onclick="javascript:submitMethod('submitOfflineFiles');" styleClass="buttonLeft">
+							<html:file  property="theOnlineFile"></html:file>
+						 	<html:submit onclick="javascript:submitMethod('submitOnlineFiles');" styleClass="buttonLeft">
 								 <bean:message key="button.upload"/> 
 							</html:submit>
-						</font>
 					</td> 
+				</tr>
 
+				
+				<tr> 
+					<td NOWRAP colspan=4 valign=top>
+						<lams:SetEditor id="richTextOfflineInstructions" text="${richTextOfflineInstructions}" small="true" key="label.offlineInstructions.col"/>																			
+					</td> 
 				</tr>
+				
+
 				<tr> 
-					<td NOWRAP align="right" valign=top>
-						<font size=2>
-    	      				<b> <bean:message key="label.uploadedOfflineFiles" /> </b>
-    	      			</font>
-          			</td>
-					<td NOWRAP colspan=3 align=left valign=top width="100%">
+					<td NOWRAP colspan=4 align=left valign=top width="100%">
 						<table align="left">
 									<c:forEach var='file' items='${sessionScope.listOfflineFilesMetadata}'>
 											<tr>
 												<td NOWRAP valign=top>
-													<font size=2> <c:out value="${file.filename}"/> </font>
-													&nbsp&nbsp
+													 <c:out value="${file.filename}"/> 
+													</td>
+													<td NOWRAP valign=top>												
 													<c:set var="viewURL">
 														<html:rewrite page="/download/?uuid=${file.uuid}&preferDownload=false"/>
 													</c:set>
 													<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-														<font size=2> <bean:message key="label.view"/> </font>
+														 	<bean:message key="label.view"/> 
 													</a>
-													&nbsp
+													</td>
+													<td NOWRAP valign=top>													
 													<c:set var="downloadURL">
 															<html:rewrite page="/download/?uuid=${file.uuid}&preferDownload=true"/>
 													</c:set>
 													<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-														<font size=2> <bean:message key="label.download"/> </font>
+														 <bean:message key="label.download"/> 
 													</a>
-													&nbsp
-												 <font size=2>	<img src="<c:out value="${tool}"/>images/delete.gif" align=left onclick="javascript:submitDeleteFile('<c:out value="${file.uuid}"/>','deleteOfflineFile');"> </font>													
+													</td>
+													<td NOWRAP valign=top>
+
+													 <img src="<c:out value="${tool}"/>images/delete.gif" align=left onclick="javascript:submitDeleteFile('<c:out value="${file.uuid}"/>','deleteOnlineFile');"> 	
 												</td>
 											</tr>
 				         			</c:forEach>
 	         			</table>
 					</td> 
 				</tr>
 
+				<tr> 
+					<td class="field-name">
+							<b> <bean:message key="label.offlineFiles" /> <b>
+	      			</td>
+          			<td colspan=3 NOWRAP valign=top> 
+							<html:file  property="theOfflineFile"></html:file>
+						 	<html:submit onclick="javascript:submitMethod('submitOfflineFiles');" styleClass="buttonLeft">
+								 <bean:message key="button.upload"/> 
+							</html:submit>
+					</td> 
 
+				</tr>
+
+
 				<html:hidden property="fileItem"/>
 				<html:hidden property="offlineFile"/>				
 				<html:hidden property="uuid"/>				
Index: lams_tool_vote/web/export/ExportContent.jsp
===================================================================
diff -u -rbc57e15fafb3b401d129d35de37586324e2e2a83 -r418f65577010d4ad648867396f4e14cd36d2c723
--- lams_tool_vote/web/export/ExportContent.jsp	(.../ExportContent.jsp)	(revision bc57e15fafb3b401d129d35de37586324e2e2a83)
+++ lams_tool_vote/web/export/ExportContent.jsp	(.../ExportContent.jsp)	(revision 418f65577010d4ad648867396f4e14cd36d2c723)
@@ -32,7 +32,7 @@
 <c:set var="tool"><lams:WebAppURL/></c:set>
 
  				
-			<table width="80%" cellspacing="8" align="CENTER" class="forms">
+			<table  class="forms">
 						<tr>
 							<td NOWRAP valign=top align=left>
 								<table>
@@ -43,8 +43,8 @@
 										</tr>
 										
 										<tr>
-									 		<td NOWRAP> <b> <font size=2> <bean:message key="label.nomination"/> </b> </td>
-											<td NOWRAP> <b> <font size=2> <bean:message key="label.total.votes"/> </b> </td>
+									 		<td NOWRAP> <b>  <bean:message key="label.nomination"/> </b> </td>
+											<td NOWRAP> <b>  <bean:message key="label.total.votes"/> </b> </td>
 										</tr>
 
 										<c:forEach var="currentNomination" items="${mapStandardNominationsHTMLedContent}">
@@ -58,14 +58,14 @@
 										  	 		<c:forEach var="currentUserCount" items="${mapStandardUserCount}">
 											  	 		<c:set var="currentUserKey" scope="request" value="${currentUserCount.key}"/>
 										  				<c:if test="${currentNominationKey == currentUserKey}"> 				
-																	<font size=2> <c:out value="${currentUserCount.value}"/>  </font>
+																	 <c:out value="${currentUserCount.value}"/>  
 														</c:if> 	    
 													</c:forEach>		  
 				
 										  	 		<c:forEach var="currentRate" items="${mapStandardRatesContent}">
 											  	 		<c:set var="currentRateKey" scope="request" value="${currentRate.key}"/>
 										  				<c:if test="${currentNominationKey == currentRateKey}"> 				
-																	<font size=2> &nbsp(<c:out value="${currentRate.value}"/> <bean:message key="label.percent"/>) </font>
+																	 &nbsp(<c:out value="${currentRate.value}"/> <bean:message key="label.percent"/>) 
 														</c:if> 	    
 													</c:forEach>		  
 												</td>								
@@ -81,8 +81,8 @@
 														</tr>
 			
 														<tr> 
-															 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.vote"/> </font> </b> </td>  														 
-									  						 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.attemptTime"/></font> </b></td>
+															 <td NOWRAP valign=top align=left> <b>   <bean:message key="label.vote"/>  </b> </td>  														 
+									  						 <td NOWRAP valign=top align=left> <b>   <bean:message key="label.attemptTime"/> </b></td>
 											  			</tr>				 
 													
 								 			
@@ -93,7 +93,7 @@
 																		<td NOWRAP valign=top align=left> 
 																				<c:out value="${currentDto.question}" escapeXml="false"/> 
 																		</td>
-																		 <td NOWRAP valign=top align=left>   <font size=2> <c:out value="${userData.attemptTime}"/> </font> </td>
+																		 <td NOWRAP valign=top align=left>    <c:out value="${userData.attemptTime}"/>  </td>
 																</tr>		
 															</c:forEach>		  	
 													</c:forEach>		
@@ -110,8 +110,8 @@
 										</tr>
 										
 										<tr>
-									 		<td NOWRAP> <b> <font size=2> <bean:message key="label.nomination"/> </b> </td>
-											<td NOWRAP> <b> <font size=2> <bean:message key="label.total.votes"/> </b> </td>
+									 		<td NOWRAP> <b>  <bean:message key="label.nomination"/> </b> </td>
+											<td NOWRAP> <b>  <bean:message key="label.total.votes"/> </b> </td>
 										</tr>
 										
 										<c:forEach var="currentNomination" items="${mapStandardNominationsHTMLedContent}">
@@ -125,14 +125,14 @@
 										  	 		<c:forEach var="currentUserCount" items="${mapStandardUserCount}">
 											  	 		<c:set var="currentUserKey" scope="request" value="${currentUserCount.key}"/>
 										  				<c:if test="${currentNominationKey == currentUserKey}"> 				
-																	<font size=2> <c:out value="${currentUserCount.value}"/>  </font>
+																	 <c:out value="${currentUserCount.value}"/>  
 														</c:if> 	    
 													</c:forEach>		  
 				
 										  	 		<c:forEach var="currentRate" items="${mapStandardRatesContent}">
 											  	 		<c:set var="currentRateKey" scope="request" value="${currentRate.key}"/>
 										  				<c:if test="${currentNominationKey == currentRateKey}"> 				
-																	<font size=2> &nbsp(<c:out value="${currentRate.value}"/> <bean:message key="label.percent"/>) </font>
+																	 &nbsp(<c:out value="${currentRate.value}"/> <bean:message key="label.percent"/>) 
 														</c:if> 	    
 													</c:forEach>		  
 												</td>								
@@ -148,9 +148,9 @@
 												</tr>
 	
 												<tr> 
-													 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.vote"/> </font> </b> </td>  														 
-													 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.user"/> </font> </b> </td>  
-							  						 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.attemptTime"/></font> </b></td>
+													 <td NOWRAP valign=top align=left> <b>   <bean:message key="label.vote"/>  </b> </td>  														 
+													 <td NOWRAP valign=top align=left> <b>   <bean:message key="label.user"/>  </b> </td>  
+							  						 <td NOWRAP valign=top align=left> <b>   <bean:message key="label.attemptTime"/> </b></td>
 									  			</tr>				 
 											
 						 			
@@ -162,12 +162,12 @@
 																<td NOWRAP valign=top align=left> 
 																	<c:out value="${currentDto.question}" escapeXml="false"/> 
 																	<c:if test="${userData.visible != 'true' }"> 			
-												                                <font size=2> <i><bean:message key="label.hidden"/> </i> </font>											                                
+												                                 <i><bean:message key="label.hidden"/> </i> 
 																	</c:if> 								
 																</td>
 																 
-																 <td NOWRAP valign=top align=left>   <font size=2> <c:out value="${userData.userName}"/> </font>  </td>  
-																 <td NOWRAP valign=top align=left>   <font size=2> <c:out value="${userData.attemptTime}"/> </font> </td>
+																 <td NOWRAP valign=top align=left>    <c:out value="${userData.userName}"/>   </td>  
+																 <td NOWRAP valign=top align=left>    <c:out value="${userData.attemptTime}"/>  </td>
 														</tr>		
 													</c:forEach>		  	
 											</c:forEach>		
@@ -236,17 +236,17 @@
 						  	 			<td> &nbsp&nbsp</td>
 						  	 		</tr>
 									<tr>			
-										<td NOWRAP valign=top align=left><b> <font size=2> <bean:message key="label.nomination"/>: </b>
+										<td NOWRAP valign=top align=left><b>  <bean:message key="label.nomination"/>: </b>
 											<c:out value="${currentDto.question}" escapeXml="false"/>
-										</font> </td>
+										 </td>
 									</tr>	
 									
 									<tr> 
 										<td NOWRAP class="formlabel" valign=top>
 											<table align=center>
 												<tr> 
-													 <td NOWRAP valign=top> <b> <font size=2> <bean:message key="label.user"/> </font> </b> </td>  
-							  						 <td NOWRAP valign=top> <b> <font size=2> <bean:message key="label.attemptTime"/></font> </b></td>
+													 <td NOWRAP valign=top> <b>  <bean:message key="label.user"/>  </b> </td>  
+							  						 <td NOWRAP valign=top> <b>  <bean:message key="label.attemptTime"/> </b></td>
 									  			</tr>				 
 					  							<c:forEach var="questionAttemptData" items="${currentDto.questionAttempts}">
 													<c:forEach var="sData" items="${questionAttemptData.value}">
@@ -278,17 +278,17 @@
 						  	 			<td> &nbsp&nbsp</td>
 						  	 		</tr>
 									<tr>			
-										<td NOWRAP valign=top align=left><b> <font size=2> <bean:message key="label.nomination"/>: </b>
+										<td NOWRAP valign=top align=left><b>  <bean:message key="label.nomination"/>: </b>
 											<c:out value="${currentDto.question}" escapeXml="false"/>
-										</font> </td>
+										 </td>
 									</tr>	
 									
 									<tr> 
 										<td NOWRAP class="formlabel" valign=top>
 											<table align=center>
 												<tr> 
-													 <td NOWRAP valign=top> <b> <font size=2> <bean:message key="label.user"/> </font> </b> </td>  
-							  						 <td NOWRAP valign=top> <b> <font size=2> <bean:message key="label.attemptTime"/></font> </b></td>
+													 <td NOWRAP valign=top> <b>  <bean:message key="label.user"/>  </b> </td>  
+							  						 <td NOWRAP valign=top> <b> <bean:message key="label.attemptTime"/> </b></td>
 									  			</tr>				 
 			
 					  							<c:forEach var="questionAttemptData" items="${currentDto.questionAttempts}">
Index: lams_tool_vote/web/export/exportportfolio.jsp
===================================================================
diff -u -r7fe908efae6be42f2be3ce09eb8e92a0755ad8f2 -r418f65577010d4ad648867396f4e14cd36d2c723
--- lams_tool_vote/web/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 7fe908efae6be42f2be3ce09eb8e92a0755ad8f2)
+++ lams_tool_vote/web/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 418f65577010d4ad648867396f4e14cd36d2c723)
@@ -19,43 +19,14 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
 
-<%@ taglib uri="tags-bean" prefix="bean"%> 
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="fck-editor" prefix="FCK" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ include file="/common/taglibs.jsp"%>
 
-
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
-
-	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-	<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
-	
 	<html:html locale="true">
 	<head>
-		<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<title> <bean:message key="label.export"/> </title>
-	
-	 <lams:css localLink="true" />
-	<!-- depending on user / site preference this will get changed probably use passed in variable from flash to select which one to use-->
-
- 	<!-- ******************** FCK Editor related javascript & HTML ********************** -->
-    <script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
-    <script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
-    <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
-
-	<script language="JavaScript" type="text/JavaScript">
-    	var imgRoot="${lams}images/";
-	    var themeName="aqua";
-	</script>
-	
-	<script type="text/javascript" src="<c:out value="${lams}"/>includes/javascript/tabcontroller.js"></script>    
-	<script type="text/javascript" src="<c:out value="${lams}"/>includes/javascript/common.js"></script>
-	
 	</head>
 	<body>
 	
@@ -68,7 +39,7 @@
 				<table align="center">
 					<tr> 
 						<td NOWRAP valign=top align=center> 
-							<b> <font size=2> <bean:message key="error.noLearnerActivity"/> </font></b>
+							<b>  <bean:message key="error.noLearnerActivity"/> </b>
 						</td> 
 					<tr>
 				</table>
Index: lams_tool_vote/web/learning/AllNominations.jsp
===================================================================
diff -u -rd9641f5d7a8cc008eb7621e6a48d6d21438eafe1 -r418f65577010d4ad648867396f4e14cd36d2c723
--- lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision d9641f5d7a8cc008eb7621e6a48d6d21438eafe1)
+++ lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision 418f65577010d4ad648867396f4e14cd36d2c723)
@@ -18,78 +18,81 @@
 
   http://www.gnu.org/licenses/gpl.txt
 --%>
-<%@ taglib uri="tags-bean" prefix="bean"%> 
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-logic-el" prefix="logic-el" %>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="fck-editor" prefix="FCK" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
+<%@ include file="/common/taglibs.jsp"%>
 
 <html:html locale="true">
 <head>
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-	<jsp:include page="/learning/learningHeader.jsp" />
+	<title> <bean:message key="label.learning"/> </title>
+	<%@ include file="/common/header.jsp"%>
+	<%@ include file="/common/fckeditorheader.jsp"%>
+
+	<script language="JavaScript" type="text/JavaScript">
+		function submitMethod(actionMethod) 
+		{
+			document.VoteLearningForm.dispatch.value=actionMethod; 
+			document.VoteLearningForm.submit();
+		}
+	</script>
+	
 </head>
 <body>
 
 <html:form  action="/learning?validate=false" enctype="multipart/form-data"method="POST" target="_self">
 	<html:hidden property="dispatch"/>
 	<html:hidden property="toolContentID"/>
 
-				<table width="80%" cellspacing="8" align="CENTER" class="forms">
+				<table  class="forms">
 					  <tr>
-					  	<td NOWRAP align=center class="input" valign=top colspan=2> 
-						  	<font size=2> <b>  <bean:message key="label.progressiveResults"/> </b> </font>
+					  	<td NOWRAP align=center  valign=top colspan=2> 
+						  	 <b>  <bean:message key="label.progressiveResults"/> </b> 
 					  	</td>
 					  </tr>
 					  
  					<c:if test="${VoteLearningForm.nominationsSubmited == 'true'}"> 			
 						<tr> <td class="error" align=center>
 								<img src="<c:out value="${tool}"/>images/success.gif" align="left" width=20 height=20>  
-								<font size=2> <bean:message key="sbmt.learner.nominations.successful"/> </font> </img>
+								 <bean:message key="sbmt.learner.nominations.successful"/>  </img>
 						</td></tr>
 					</c:if> 		
 					  
 					  <tr>
-					  	<td NOWRAP align=center class="input" valign=top colspan=2> 
+					  	<td NOWRAP align=center valign=top colspan=2> 
 							<c:set var="viewURL">
 								<html:rewrite page="/chartGenerator?type=pie"/>
 							</c:set>
 							<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-								 <font size=2>	<bean:message key="label.view.piechart"/>  </font>
+								 	<bean:message key="label.view.piechart"/>  
 							</a>
 								
 					  	</td>
 					  </tr>	
 					  
 					  
 			  			<tr> 
-						  	<td NOWRAP align=center class="input" valign=top colspan=2> 
+						  	<td NOWRAP align=center  valign=top colspan=2> 
 								<c:set var="viewURL">
 									<html:rewrite page="/chartGenerator?type=bar"/>
 								</c:set>
 								<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-									 <font size=2>	<bean:message key="label.view.barchart"/>  </font>
+									 	<bean:message key="label.view.barchart"/>  
 								</a>
 							</td>
 						</tr>
 					  
 					  
 
 					  <tr>
-					  	<td NOWRAP align=center class="input" valign=top colspan=2> 
+					  	<td NOWRAP align=center  valign=top colspan=2> 
 								&nbsp&nbsp&nbsp&nbsp								
 					  	</td>
 					  </tr>	
 
 					  <tr>
-					  	<td NOWRAP align=center class="input" valign=top colspan=2> 
-						  	<font size=2> <b>  <bean:message key="label.learner.nominations"/> </b> </font>
+					  	<td NOWRAP align=center  valign=top colspan=2> 
+						  	 <b>  <bean:message key="label.learner.nominations"/> </b> 
 					  	</td>
 					  </tr>
 
@@ -102,16 +105,14 @@
 					</c:forEach>
 
 						<tr> 
-							<td NOWRAP align=center class="input" valign=top colspan=2> 
+							<td NOWRAP align=center  valign=top colspan=2> 
 						 	  		<c:out value="${VoteLearningForm.userEntry}"/> 						 			
 					 		</td>
 					  	</tr>
 
 
 				  <tr>
-				  	<td NOWRAP colspan=2 align=center class="input" valign=top> 
-					  	<font size=2>
-					  	
+				  	<td NOWRAP colspan=2 align=center valign=top> 
 								<c:if test="${VoteLearningForm.voteChangable == 'true' && VoteLearningForm.lockOnFinish != 'true'}"> 				   						
 			                                <html:submit property="redoQuestionsOk" 
 			                                             styleClass="linkbutton" 
@@ -133,7 +134,6 @@
                                              onclick="submitMethod('learnerFinished');">
                                     <bean:message key="label.finished"/>
                                 </html:submit>
-						</font>
 				  	 </td>
 				  </tr>
 
Index: lams_tool_vote/web/learning/AnswersContent.jsp
===================================================================
diff -u -r6b6dbecc625e165bc695c84162f36c68687eda20 -r418f65577010d4ad648867396f4e14cd36d2c723
--- lams_tool_vote/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 6b6dbecc625e165bc695c84162f36c68687eda20)
+++ lams_tool_vote/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 418f65577010d4ad648867396f4e14cd36d2c723)
@@ -18,22 +18,18 @@
 
   http://www.gnu.org/licenses/gpl.txt
 --%>
-<%@ taglib uri="tags-bean" prefix="bean"%> 
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-logic-el" prefix="logic-el" %>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="fck-editor" prefix="FCK" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
 
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+
 <html:html locale="true">
 <head>
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-	<jsp:include page="/learning/learningHeader.jsp" />
+	<title> <bean:message key="label.learning"/> </title>
+	<%@ include file="/common/header.jsp"%>
+	<%@ include file="/common/fckeditorheader.jsp"%>
 
 	<script language="JavaScript" type="text/JavaScript">
 
@@ -83,6 +79,15 @@
 		alert(msg);
 	}
 	</script>
+	
+	<script language="JavaScript" type="text/JavaScript">
+		function submitMethod(actionMethod) 
+		{
+			document.VoteLearningForm.dispatch.value=actionMethod; 
+			document.VoteLearningForm.submit();
+		}
+	</script>
+	
 
 </head>
 <body>
@@ -91,7 +96,7 @@
 	<html:hidden property="dispatch"/>
 	<html:hidden property="toolContentID"/>
 
-			<table width="80%" cellspacing="8" align="CENTER" class="forms">
+			<table class="forms">
 					<c:if test="${VoteLearningForm.activityRunOffline == 'true'}"> 			
 						<tr> <td class="error">
 							<bean:message key="label.learning.forceOfflineMessage"/>
@@ -136,24 +141,21 @@
 							<c:if test="${VoteLearningForm.allowTextEntry == 'true'}"> 			
 									<tr> 
 										<td NOWRAP align=left valign=top colspan=2> 
-							      			<font size=2> <b>
+							      			 <b>
 										 		<bean:message key="label.other"/>: 
 									      		</b> 
 									 			<html:text property="userEntry" size="30" maxlength="100"/>
-											</font>									 			
 								 		</td>
 								  	</tr>
 							</c:if> 									  	
 				  	   
 				  	<html:hidden property="donePreview"/>						   
 		  	   		  <tr>
-					  	<td NOWRAP align=right class="input" valign=top> 
-						  	<font size=2>
+					  	<td NOWRAP align=left valign=top> 
 		                            <html:submit property="continueOptionsCombined" 
 		                                         styleClass="linkbutton">
 										<bean:message key="label.submit.vote"/>
 		                            </html:submit>
-							</font>
 					  	 </td>
 					  </tr>
 					
Index: lams_tool_vote/web/learning/ExitLearning.jsp
===================================================================
diff -u -rd9641f5d7a8cc008eb7621e6a48d6d21438eafe1 -r418f65577010d4ad648867396f4e14cd36d2c723
--- lams_tool_vote/web/learning/ExitLearning.jsp	(.../ExitLearning.jsp)	(revision d9641f5d7a8cc008eb7621e6a48d6d21438eafe1)
+++ lams_tool_vote/web/learning/ExitLearning.jsp	(.../ExitLearning.jsp)	(revision 418f65577010d4ad648867396f4e14cd36d2c723)
@@ -1,30 +1,34 @@
-<%@ taglib uri="tags-bean" prefix="bean"%> 
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-logic-el" prefix="logic-el" %>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="fck-editor" prefix="FCK" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
+<%@ include file="/common/taglibs.jsp"%>
 
 <html:html locale="true">
 <head>
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-	<jsp:include page="/learning/learningHeader.jsp" />
+	<title> <bean:message key="label.learning"/> </title>
+	<%@ include file="/common/header.jsp"%>
+	<%@ include file="/common/fckeditorheader.jsp"%>
+
+	<script language="JavaScript" type="text/JavaScript">
+		function submitMethod(actionMethod) 
+		{
+			document.VoteLearningForm.dispatch.value=actionMethod; 
+			document.VoteLearningForm.submit();
+		}
+	</script>
+	
+	
 </head>
 <body>
 
 <html:form  action="/learning?validate=false" enctype="multipart/form-data"method="POST" target="_self">
 	<html:hidden property="dispatch"/>
 	<html:hidden property="toolContentID"/>
 
-			<table width="80%" cellspacing="8" align="CENTER" class="forms">
+			<table class="forms">
 					  <tr>
 					  	<td NOWRAP align=left class="input" valign=top colspan=2> 
-						  	<font size=2> <b>  <bean:message key="label.learning.forceFinishMessage"/> </b> </font>
+						  	 <b>  <bean:message key="label.learning.forceFinishMessage"/> </b> 
 					  	</td>
 					  </tr>
 				
@@ -36,7 +40,7 @@
 				
 				  <tr>
 				  	<td NOWRAP align=left class="input" valign=top colspan=2> 
-					  	<font size=2> <b>  <bean:message key="label.learning.reportMessage.past"/> </b> </font>
+					  	 <b>  <bean:message key="label.learning.reportMessage.past"/> </b> 
 				  	</td>
 				  </tr>
 				
@@ -51,13 +55,11 @@
 				
 		  	   		  <tr>
 					  	<td NOWRAP colspan=2 align=center class="input" valign=top> 
-						  	<font size=2>
                                 <html:submit property="learnerFinished" 
                                              styleClass="linkbutton" 
                                              onclick="submitMethod('learnerFinished');">
                                     <bean:message key="label.finished"/>
                                 </html:submit>
-							</font>
 					  	 </td>
 					  </tr>
 					
Index: lams_tool_vote/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -rd9641f5d7a8cc008eb7621e6a48d6d21438eafe1 -r418f65577010d4ad648867396f4e14cd36d2c723
--- lams_tool_vote/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision d9641f5d7a8cc008eb7621e6a48d6d21438eafe1)
+++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 418f65577010d4ad648867396f4e14cd36d2c723)
@@ -1,37 +1,41 @@
-<%@ taglib uri="tags-bean" prefix="bean"%> 
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-logic-el" prefix="logic-el" %>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="fck-editor" prefix="FCK" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
+<%@ include file="/common/taglibs.jsp"%>
 
 <html:html locale="true">
 <head>
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-	<jsp:include page="/learning/learningHeader.jsp" />
+	<title> <bean:message key="label.learning"/> </title>
+	<%@ include file="/common/header.jsp"%>
+	<%@ include file="/common/fckeditorheader.jsp"%>
+
+	<script language="JavaScript" type="text/JavaScript">
+		function submitMethod(actionMethod) 
+		{
+			document.VoteLearningForm.dispatch.value=actionMethod; 
+			document.VoteLearningForm.submit();
+		}
+	</script>
+
+	
 </head>
 <body>
 
 <html:form  action="/learning?validate=false" enctype="multipart/form-data"method="POST" target="_self">
 	<html:hidden property="dispatch"/>
 	<html:hidden property="toolContentID"/>
 				
-			<table width="80%" cellspacing="8" align="CENTER" class="forms">
+			<table class="forms">
 
 					  <tr>
-					  	<td NOWRAP align=left class="input" valign=top  colspan=2> 
-						  	<font size=2> <b>  <bean:message key="label.learning.reportMessage"/> </b> </font>
+					  	<td NOWRAP align=left  valign=top  colspan=2> 
+						  	 <b>  <bean:message key="label.learning.reportMessage"/> </b> 
 					  	</td>
 					  </tr>
 				
 
 					<tr>
-						<td NOWRAP align=right class="input" valign=top colspan=2> 
+						<td NOWRAP align=right  valign=top colspan=2> 
 							<hr>
 						</td> 
 					</tr>
@@ -51,15 +55,14 @@
 					  	</tr>
 
 			  	   	<tr> 
-				 		<td NOWRAP colspan=2 class="input" valign=top> 
+				 		<td NOWRAP colspan=2  valign=top> 
 				 		&nbsp
 				 		</td>
 			  	   </tr>
 
 			  	   
 		  	   		  <tr>
-					  	<td NOWRAP colspan=2 align=center class="input" valign=top> 
-						  	<font size=2>
+					  	<td NOWRAP colspan=2 align=center  valign=top> 
                                 <html:submit property="redoQuestions" 
                                              styleClass="linkbutton" 
                                              onclick="submitMethod('redoQuestions');">
@@ -72,7 +75,6 @@
                                              onclick="submitMethod('viewAllResults');">
                                     <bean:message key="label.overAllResults"/>
                                 </html:submit>
-							</font>
 					  	 </td>
 					  </tr>
 					
Fisheye: Tag 418f65577010d4ad648867396f4e14cd36d2c723 refers to a dead (removed) revision in file `lams_tool_vote/web/learning/Preview.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_vote/web/monitoring/AllSessionsSummary.jsp
===================================================================
diff -u -re48a67de27af42221ddce80419f05c1be4680430 -r418f65577010d4ad648867396f4e14cd36d2c723
--- lams_tool_vote/web/monitoring/AllSessionsSummary.jsp	(.../AllSessionsSummary.jsp)	(revision e48a67de27af42221ddce80419f05c1be4680430)
+++ lams_tool_vote/web/monitoring/AllSessionsSummary.jsp	(.../AllSessionsSummary.jsp)	(revision 418f65577010d4ad648867396f4e14cd36d2c723)
@@ -38,15 +38,15 @@
 						<c:if test="${statsTabActive != 'true'}"> 							
 							<tr> 
 						 		<td NOWRAP> </td>
-								<td NOWRAP align=right>
+								<td NOWRAP align=center>
 									<jsp:include page="/monitoring/PullDownMenu.jsp" />					
 								</td> 
 							</tr>
 						</c:if> 
 						<c:if test="${statsTabActive == 'true'}"> 							
 							<tr> 
 						 		<td NOWRAP> </td>
-								<td NOWRAP align=right>
+								<td NOWRAP align=center>
 									<jsp:include page="/monitoring/PullDownMenuStats.jsp" />					
 								</td> 
 							</tr>
@@ -59,7 +59,7 @@
 						<c:forEach var="currentDto" items="${sessionScope.listVoteAllSessionsDTO}">
 						
 								<tr>
-							 		<td NOWRAP colspan=2 > <b> <font size=2> <bean:message key="label.groupName"/> </b>
+							 		<td NOWRAP colspan=2 > <b>  <bean:message key="label.groupName"/> </b>
 							 		<c:out value="${currentDto.sessionName}"/>  </td>
 								</tr>
 						
@@ -68,15 +68,15 @@
 						  	 		
  							 			<table align=left>
 						  					<tr>
-										 		<td NOWRAP> <b> <font size=2> <bean:message key="label.total.students"/> </b> </td>
-										 		<td> <font size=2> <c:out value="${currentDto.sessionUserCount}"/> </font></td>
+										 		<td NOWRAP> <b>  <bean:message key="label.total.students"/> </b> </td>
+										 		<td>  <c:out value="${currentDto.sessionUserCount}"/> </td>
 											</tr>
 					
 						  					<tr>
-										 		<td NOWRAP> <b> <font size=2> <bean:message key="label.total.completed.students"/> </b> </td> 
-										 		<td NOWRAP> <font size=2> <c:out value="${currentDto.completedSessionUserCount}"/> 
+										 		<td NOWRAP> <b>  <bean:message key="label.total.completed.students"/> </b> </td> 
+										 		<td NOWRAP>  <c:out value="${currentDto.completedSessionUserCount}"/> 
 											 		&nbsp(<c:out value="${currentDto.completedSessionUserPercent}"/> <bean:message key="label.percent"/>)
-										 		</font></td>
+										 		</td>
 											</tr>
 					
 											<tr>
@@ -107,7 +107,7 @@
 																	<html:rewrite page="/chartGenerator?type=pie&currentSessionId=${currentSessionId}"/>
 																</c:set>
 																<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-																	 <font size=2>	<bean:message key="label.view.piechart"/>  </font>
+																	 <bean:message key="label.view.piechart"/>  
 																</a>
 															</td>
 														</tr>
@@ -118,15 +118,15 @@
 																	<html:rewrite page="/chartGenerator?type=bar&currentSessionId=${currentSessionId}"/>
 																</c:set>
 																<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-																	 <font size=2>	<bean:message key="label.view.barchart"/>  </font>
+																	 <bean:message key="label.view.barchart"/>  
 																</a>
 															</td>
 														</tr>
 													</c:if> 
 
 												<tr>
-											 		<td NOWRAP> <b> <font size=2> <bean:message key="label.nomination"/> </b> </td>
-													<td NOWRAP> <b> <font size=2> <bean:message key="label.total.votes"/> </b> </td>
+											 		<td NOWRAP> <b>  <bean:message key="label.nomination"/> </b> </td>
+													<td NOWRAP> <b>  <bean:message key="label.total.votes"/> </b> </td>
 												</tr>
 												
 												<c:forEach var="currentNomination" items="${currentDto.mapStandardNominationsHTMLedContent}">
@@ -159,11 +159,11 @@
 																							</c:set>
 																		  																					
 																							<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-																								<font size=2> <c:out value="${currentUserCount.value}"/>  </font>
+																								 <c:out value="${currentUserCount.value}"/>  
 																							</a>
 																						</c:if> 	    
 																		  				<c:if test="${currentNomination.value == 'Open Vote'}"> 				
-																								<font size=2> <c:out value="${currentUserCount.value}"/>  </font>
+																								 <c:out value="${currentUserCount.value}"/>  
 																						</c:if> 	    
 																						
 																					</c:if> 	    
@@ -174,7 +174,7 @@
 																		</c:forEach>		  
 																	</c:if> 	    								
 													  				<c:if test="${currentUserCount.value == 0 }"> 		  				
-																			<font size=2> <c:out value="${currentUserCount.value}"/>  </font>
+																			 <c:out value="${currentUserCount.value}"/>  
 																	</c:if> 	
 																	    																								
 																</c:if> 	    
@@ -183,7 +183,7 @@
 												  	 		<c:forEach var="currentRate" items="${currentDto.mapStandardRatesContent}">
 													  	 		<c:set var="currentRateKey" scope="request" value="${currentRate.key}"/>
 												  				<c:if test="${currentNominationKey == currentRateKey}"> 				
-																			<font size=2> &nbsp(<c:out value="${currentRate.value}"/> <bean:message key="label.percent"/>) </font>
+																			 &nbsp(<c:out value="${currentRate.value}"/> <bean:message key="label.percent"/>) 
 																</c:if> 	    
 															</c:forEach>		  
 														</td>			
@@ -218,11 +218,11 @@
 												</tr>
 	
 												<tr> 
-													 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.vote"/> </font> </b> </td>  														 
-													 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.user"/> </font> </b> </td>  
-							  						 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.attemptTime"/></font> </b></td>
+													 <td NOWRAP valign=top align=left> <b>  <bean:message key="label.vote"/>  </b> </td>  														 
+													 <td NOWRAP valign=top align=left> <b>   <bean:message key="label.user"/>  </b> </td>  
+							  						 <td NOWRAP valign=top align=left> <b>   <bean:message key="label.attemptTime"/> </b></td>
 							 						 <c:if test="${statsTabActive != 'true'}"> 															  						 
-								  						 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.visible"/> </font> </b></td>								  						 
+								  						 <td NOWRAP valign=top align=left> <b>   <bean:message key="label.visible"/>  </b></td>								  						 
 													 </c:if> 																					  						 
 									  			</tr>				 
 											
@@ -235,12 +235,12 @@
 																<td NOWRAP valign=top align=left> 
 																	<c:out value="${dtoEntry.question}" escapeXml="false"/> 
 																	<c:if test="${userData.visible != 'true' }"> 			
-												                                <font size=2> <i><bean:message key="label.hidden"/> </i> </font>											                                
+												                                 <i><bean:message key="label.hidden"/> </i> 
 																	</c:if> 								
 																</td>
 																 
-																 <td NOWRAP valign=top align=left>   <font size=2> <c:out value="${userData.userName}"/> </font>  </td>  
-																 <td NOWRAP valign=top align=left>   <font size=2> <c:out value="${userData.attemptTime}"/> </font> </td>
+																 <td NOWRAP valign=top align=left>    <c:out value="${userData.userName}"/>   </td>  
+																 <td NOWRAP valign=top align=left>    <c:out value="${userData.attemptTime}"/>  </td>
 																 
 										 						<c:if test="${statsTabActive != 'true'}"> 							
 																	 <td NOWRAP valign=top align=left>
Index: lams_tool_vote/web/monitoring/Edit.jsp
===================================================================
diff -u -rbc445cd305b92a8737e721c1ab90ed6138dc1715 -r418f65577010d4ad648867396f4e14cd36d2c723
--- lams_tool_vote/web/monitoring/Edit.jsp	(.../Edit.jsp)	(revision bc445cd305b92a8737e721c1ab90ed6138dc1715)
+++ lams_tool_vote/web/monitoring/Edit.jsp	(.../Edit.jsp)	(revision 418f65577010d4ad648867396f4e14cd36d2c723)
@@ -44,7 +44,7 @@
 		<c:if test="${isMonitoredContentInUse == 'true'}"> 			
 					<table border="0" cellspacing="2" cellpadding="2">									
 						<tr> <td NOWRAP valign=top>
-								<font size=2> <bean:message key="error.content.inUse"/> </font>
+								 <bean:message key="error.content.inUse"/> 
 						</td> </tr>
 					</table>
 		</c:if> 																									
Index: lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp
===================================================================
diff -u -re48a67de27af42221ddce80419f05c1be4680430 -r418f65577010d4ad648867396f4e14cd36d2c723
--- lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp	(.../IndividualSessionSummary.jsp)	(revision e48a67de27af42221ddce80419f05c1be4680430)
+++ lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp	(.../IndividualSessionSummary.jsp)	(revision 418f65577010d4ad648867396f4e14cd36d2c723)
@@ -56,20 +56,20 @@
 						</tr>
 
 						<tr>
-					 		<td NOWRAP colspan=2 > <b> <font size=2> <bean:message key="label.groupName"/> </b><c:out value="${groupName}"/>  </td>
+					 		<td NOWRAP colspan=2 > <b>  <bean:message key="label.groupName"/> </b><c:out value="${groupName}"/>  </td>
 						</tr>
 
 
 	  					<tr>
-					 		<td NOWRAP> <b> <font size=2> <bean:message key="label.total.students"/> </b> </td>
-					 		<td> <font size=2> <c:out value="${VoteMonitoringForm.sessionUserCount}"/> </font></td>
+					 		<td NOWRAP> <b>  <bean:message key="label.total.students"/> </b> </td>
+					 		<td>  <c:out value="${VoteMonitoringForm.sessionUserCount}"/> </td>
 						</tr>
 
 	  					<tr>
-					 		<td NOWRAP> <b> <font size=2> <bean:message key="label.total.completed.students"/> </b> </td> 
-					 		<td NOWRAP> <font size=2> <c:out value="${VoteMonitoringForm.completedSessionUserCount}"/> 
+					 		<td NOWRAP> <b>  <bean:message key="label.total.completed.students"/> </b> </td> 
+					 		<td NOWRAP>  <c:out value="${VoteMonitoringForm.completedSessionUserCount}"/> 
 						 		&nbsp(<c:out value="${VoteMonitoringForm.completedSessionUserPercent}"/> <bean:message key="label.percent"/>)
-					 		</font></td>
+					 		</td>
 						</tr>
 
 						<tr>
@@ -100,7 +100,7 @@
 											<html:rewrite page="/chartGenerator?type=pie"/>
 										</c:set>
 										<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-											 <font size=2>	<bean:message key="label.view.piechart"/>  </font>
+											 	<bean:message key="label.view.piechart"/>  
 										</a>
 									</td>
 								</tr>
@@ -111,15 +111,15 @@
 											<html:rewrite page="/chartGenerator?type=bar"/>
 										</c:set>
 										<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-											 <font size=2>	<bean:message key="label.view.barchart"/>  </font>
+											 <bean:message key="label.view.barchart"/>  
 										</a>
 									</td>
 								</tr>
 							</c:if> 								
 							
 									<tr>
-								 		<td NOWRAP> <b> <font size=2> <bean:message key="label.nomination"/> </b> </td>
-										<td NOWRAP> <b> <font size=2> <bean:message key="label.total.votes"/> </b> </td>
+								 		<td NOWRAP> <b>  <bean:message key="label.nomination"/> </b> </td>
+										<td NOWRAP> <b>  <bean:message key="label.total.votes"/> </b> </td>
 									</tr>
 									
 									<c:forEach var="currentNomination" items="${mapStandardNominationsHTMLedContent}">
@@ -152,11 +152,11 @@
 																					</c:set>
 																  																					
 																					<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-																						<font size=2> <c:out value="${currentUserCount.value}"/>  </font>
+																						 <c:out value="${currentUserCount.value}"/>  
 																					</a>
 																				</c:if> 	    
 																  				<c:if test="${currentNomination.value == 'Open Vote'}"> 				
-																						<font size=2> <c:out value="${currentUserCount.value}"/>  </font>
+																						 <c:out value="${currentUserCount.value}"/>  
 																				</c:if> 	    
 																		</c:if> 	    
 																	</c:forEach>		  
@@ -165,7 +165,7 @@
 															</c:forEach>		  
 														</c:if> 	    								
 										  				<c:if test="${currentUserCount.value == '0' }"> 		  				
-																<font size=2> <c:out value="${currentUserCount.value}"/>  </font>
+																<c:out value="${currentUserCount.value}"/>  
 														</c:if> 	
 														    																								
 													</c:if> 	    
@@ -174,7 +174,7 @@
 									  	 		<c:forEach var="currentRate" items="${mapStandardRatesContent}">
 										  	 		<c:set var="currentRateKey" scope="request" value="${currentRate.key}"/>
 									  				<c:if test="${currentNominationKey == currentRateKey}"> 				
-																<font size=2> &nbsp(<c:out value="${currentRate.value}"/> <bean:message key="label.percent"/>) </font>
+																 &nbsp(<c:out value="${currentRate.value}"/> <bean:message key="label.percent"/>) 
 													</c:if> 	    
 												</c:forEach>		  
 											</td>								
@@ -207,11 +207,11 @@
 												</tr>
 	
 												<tr> 
-													 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.vote"/> </font> </b> </td>  														 
-													 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.user"/> </font> </b> </td>  
-							  						 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.attemptTime"/></font> </b></td>
+													 <td NOWRAP valign=top align=left> <b>   <bean:message key="label.vote"/>  </b> </td>  														 
+													 <td NOWRAP valign=top align=left> <b>   <bean:message key="label.user"/>  </b> </td>  
+							  						 <td NOWRAP valign=top align=left> <b>   <bean:message key="label.attemptTime"/> </b></td>
 							 						 <c:if test="${statsTabActive != 'true'}"> 															  						 
-								  						 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.visible"/> </font> </b></td>								  						 
+								  						 <td NOWRAP valign=top align=left> <b>   <bean:message key="label.visible"/>  </b></td>								  						 
 													 </c:if> 																					  						 
 									  			</tr>				 
 											
@@ -224,12 +224,12 @@
 																<td NOWRAP valign=top align=left> 
 																	<c:out value="${currentDto.question}" escapeXml="false"/> 
 																	<c:if test="${userData.visible != 'true' }"> 			
-												                                <font size=2> <i><bean:message key="label.hidden"/> </i> </font>											                                
+												                                 <i><bean:message key="label.hidden"/> </i> 
 																	</c:if> 								
 																</td>
 																 
-																 <td NOWRAP valign=top align=left>   <font size=2> <c:out value="${userData.userName}"/> </font>  </td>  
-																 <td NOWRAP valign=top align=left>   <font size=2> <c:out value="${userData.attemptTime}"/> </font> </td>
+																 <td NOWRAP valign=top align=left>    <c:out value="${userData.userName}"/>   </td>  
+																 <td NOWRAP valign=top align=left>    <c:out value="${userData.attemptTime}"/>  </td>
 																 
 										 						<c:if test="${statsTabActive != 'true'}"> 							
 																	 <td NOWRAP valign=top align=left>
Index: lams_tool_vote/web/monitoring/Instructions.jsp
===================================================================
diff -u -re48a67de27af42221ddce80419f05c1be4680430 -r418f65577010d4ad648867396f4e14cd36d2c723
--- lams_tool_vote/web/monitoring/Instructions.jsp	(.../Instructions.jsp)	(revision e48a67de27af42221ddce80419f05c1be4680430)
+++ lams_tool_vote/web/monitoring/Instructions.jsp	(.../Instructions.jsp)	(revision 418f65577010d4ad648867396f4e14cd36d2c723)
@@ -34,45 +34,37 @@
 	
 				<table class="forms">
 				<tr> 
-					<td NOWRAP align="right" valign=top>
-						<font size=2>
-    	      				<b> <bean:message key="label.onlineInstructions.col" /> </b>
-    	      			</font>
-          			</td>
-					<td NOWRAP colspan=3 valign=top>
-							   <c:out value="${sessionScope.richTextOnlineInstructions}" escapeXml="false" />	
+					<td NOWRAP colspan=4 valign=top>
+							<bean:message key="label.onlineInstructions.col" />   <c:out value="${sessionScope.richTextOnlineInstructions}" escapeXml="false" />	
 					</td> 
 				</tr>
 				
 
 				<tr>
-					<td NOWRAP align="right" valign=top>
-	          			<font size=2>
-		      				<b> <bean:message key="label.uploadedOnlineFiles" /> </b>
-	      				</font>
-          			</td>
-          			
-					<td NOWRAP colspan=3 align=left valign=top width="100%">
+					<td NOWRAP colspan=4 align=left valign=top width="100%">
 						<table align="left">
 									<c:forEach var='file' items='${sessionScope.listOnlineFilesMetadata}'>
 											<tr>
 												<td NOWRAP valign=top>
-													<font size=2> <c:out value="${file.filename}"/> </font>
-													&nbsp&nbsp
+													 <c:out value="${file.filename}"/> 
+													</td>
+													<td NOWRAP valign=top>												
 													<c:set var="viewURL">
 														<html:rewrite page="/download/?uuid=${file.uuid}&preferDownload=false"/>
 													</c:set>
 													<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-														 <font size=2>	<bean:message key="label.view"/> </font>
+														 	<bean:message key="label.view"/> 
 													</a>
-													&nbsp
+													</td>
+													<td NOWRAP valign=top>													
+
 													<c:set var="downloadURL">
 															<html:rewrite page="/download/?uuid=${file.uuid}&preferDownload=true"/>
 													</c:set>
 													<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-														<font size=2> <bean:message key="label.download"/> </font>
+														 <bean:message key="label.download"/> 
 													</a>
-												</td>
+													</td>
 											</tr>
 				         			</c:forEach>
 	         			</table>
@@ -81,43 +73,36 @@
 
 				
 				<tr> 
-					<td NOWRAP class="formlabel" valign=top>
-						<font size=2>
-    	      				<b> <bean:message key="label.offlineInstructions.col" /> <b>
-    	      			</font>
-          			</td>
-					<td NOWRAP colspan=3 valign=top>
-						   <c:out value="${sessionScope.richTextOfflineInstructions}" escapeXml="false" />	
+					<td NOWRAP colspan=4 valign=top>
+						<bean:message key="label.offlineInstructions.col" />  <c:out value="${sessionScope.richTextOfflineInstructions}" escapeXml="false" />	
 					</td> 
 				</tr>
 				
 				<tr> 
-					<td NOWRAP align="right" valign=top>
-						<font size=2>
-    	      				<b> <bean:message key="label.uploadedOfflineFiles" /> </b>
-    	      			</font>
-          			</td>
-					<td NOWRAP colspan=3 align=left valign=top width="100%">
+					<td NOWRAP colspan=4 align=left valign=top width="100%">
 						<table align="left">
 									<c:forEach var='file' items='${sessionScope.listOfflineFilesMetadata}'>
 											<tr>
 												<td NOWRAP valign=top>
-													<font size=2> <c:out value="${file.filename}"/> </font>
-													&nbsp&nbsp
+													 <c:out value="${file.filename}"/> 
+													</td>
+													<td NOWRAP valign=top>												
 													<c:set var="viewURL">
 														<html:rewrite page="/download/?uuid=${file.uuid}&preferDownload=false"/>
 													</c:set>
 													<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-														<font size=2> <bean:message key="label.view"/> </font>
+														 	<bean:message key="label.view"/> 
 													</a>
-													&nbsp
+													</td>
+													<td NOWRAP valign=top>													
+
 													<c:set var="downloadURL">
 															<html:rewrite page="/download/?uuid=${file.uuid}&preferDownload=true"/>
 													</c:set>
 													<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-														<font size=2> <bean:message key="label.download"/> </font>
+														 <bean:message key="label.download"/> 
 													</a>
-												</td>
+													</td>
 											</tr>
 				         			</c:forEach>
 	         			</table>
Index: lams_tool_vote/web/monitoring/LearnerRep.jsp
===================================================================
diff -u -r8295fa25ba6790e69058c5f7a38fa476e83f1087 -r418f65577010d4ad648867396f4e14cd36d2c723
--- lams_tool_vote/web/monitoring/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 8295fa25ba6790e69058c5f7a38fa476e83f1087)
+++ lams_tool_vote/web/monitoring/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 418f65577010d4ad648867396f4e14cd36d2c723)
@@ -19,36 +19,19 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
 
-<%@ taglib uri="tags-bean" prefix="bean"%> 
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="fck-editor" prefix="FCK" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
-
-	<!DOCTYPE HTML PUBLIC "-//W3C//DTD hTML 4.01 Transitional//EN">
-	<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
-	
 	<html:html locale="true">
 	<head>
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<title> <bean:message key="label.learning.report"/> </title>
 	
-	 <lams:css/>
+	<%@ include file="/common/header.jsp"%>
+	<%@ include file="/common/fckeditorheader.jsp"%>
 	
-	<!-- depending on user / site preference this will get changed probably use passed in variable from flash to select which one to use-->
-
- 	<!-- ******************** FCK Editor related javascript & HTML ********************** -->
-    <script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
-    <script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
-    <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
 	
-	
 	<script language="JavaScript" type="text/JavaScript">
 
 		// general submit
@@ -69,7 +52,7 @@
 </head>
 <body>
 
-		<table width="80%" cellspacing="8" align="CENTER" class="forms">
+		<table  class="forms">
 				<tr>
 			 		<th NOWRAP>  <bean:message key="label.learner.progress"/>   </th>
 				</tr>
@@ -82,9 +65,7 @@
 	  <html:form  action="/monitoring?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
 		<html:hidden property="method"/>	 
 
-			<div class="tabbody content_b" >
-			
-				<table width="80%" cellspacing="8" align="CENTER" class="forms">
+				<table  class="forms">
 					<tr>
 						<td NOWRAP valign=top align=left>
 			 			<table align=left>
@@ -95,17 +76,17 @@
 				  	 			<td> &nbsp&nbsp</td>
 				  	 		</tr>
 							<tr>			
-								<td NOWRAP valign=top align=left><b> <font size=2> <bean:message key="label.nomination"/>: </b>
+								<td NOWRAP valign=top align=left><b>  <bean:message key="label.nomination"/>: </b>
 									<c:out value="${currentDto.question}" escapeXml="false"/>
-								</font> </td>
+								 </td>
 							</tr>	
 							
 							<tr> 
-								<td NOWRAP class="formlabel" valign=top>
+								<td NOWRAP valign=top>
 									<table align=center>
 										<tr> 
-											 <td NOWRAP valign=top> <b> <font size=2> <bean:message key="label.user"/> </font> </b> </td>  
-					  						 <td NOWRAP valign=top> <b> <font size=2> <bean:message key="label.attemptTime"/></font> </b></td>
+											 <td NOWRAP valign=top> <b>  <bean:message key="label.user"/>  </b> </td>  
+					  						 <td NOWRAP valign=top> <b>  <bean:message key="label.attemptTime"/> </b></td>
 							  			</tr>				 
 			  							<c:forEach var="questionAttemptData" items="${currentDto.questionAttempts}">
 											<c:forEach var="sData" items="${questionAttemptData.value}">
@@ -137,17 +118,17 @@
 				  	 			<td> &nbsp&nbsp</td>
 				  	 		</tr>
 							<tr>			
-								<td NOWRAP valign=top align=left><b> <font size=2> <bean:message key="label.nomination"/>: </b>
+								<td NOWRAP valign=top align=left><b>  <bean:message key="label.nomination"/>: </b>
 									<c:out value="${currentDto.question}" escapeXml="false"/>
-								</font> </td>
+								 </td>
 							</tr>	
 							
 							<tr> 
-								<td NOWRAP class="formlabel" valign=top>
+								<td NOWRAP  valign=top>
 									<table align=center>
 										<tr> 
-											 <td NOWRAP valign=top> <b> <font size=2> <bean:message key="label.user"/> </font> </b> </td>  
-					  						 <td NOWRAP valign=top> <b> <font size=2> <bean:message key="label.attemptTime"/></font> </b></td>
+											 <td NOWRAP valign=top> <b>  <bean:message key="label.user"/>  </b> </td>  
+					  						 <td NOWRAP valign=top> <b>  <bean:message key="label.attemptTime"/> </b></td>
 							  			</tr>				 
 	
 			  							<c:forEach var="questionAttemptData" items="${currentDto.questionAttempts}">
@@ -164,7 +145,6 @@
 			 		</td>
 				</tr>
 			</table>
-		</div>		         
 	</html:form>
 
 </body>
Index: lams_tool_vote/web/monitoring/PullDownMenu.jsp
===================================================================
diff -u -rc8f1ea88d18b9b6b1ee0002d299ac9bfb1431d84 -r418f65577010d4ad648867396f4e14cd36d2c723
--- lams_tool_vote/web/monitoring/PullDownMenu.jsp	(.../PullDownMenu.jsp)	(revision c8f1ea88d18b9b6b1ee0002d299ac9bfb1431d84)
+++ lams_tool_vote/web/monitoring/PullDownMenu.jsp	(.../PullDownMenu.jsp)	(revision 418f65577010d4ad648867396f4e14cd36d2c723)
@@ -36,7 +36,7 @@
 									<c:if test="${(isPortfolioExport != 'true') }"> 	
 									<table align=right>			
 										<tr> 
-											<td NOWRAP  valign=top align=right><font size=2> <b> <bean:message key="label.selectGroup"/> </b>
+											<td NOWRAP  valign=top align=right> <b> <bean:message key="label.selectGroup"/> </b>
 													<select name="monitoredToolSessionId" onchange="javascript:submitSession(this.value,'submitSession');">
 													<c:forEach var="toolSessionName" items="${sessionScope.summaryToolSessions}">
 														<c:forEach var="toolSessionId" items="${sessionScope.summaryToolSessionsId}">
@@ -64,7 +64,6 @@
 														</c:forEach>		  	
 													</c:forEach>		  	
 													</select>
-												</font>
 												</td> 
 											<tr>
 										</table>
Index: lams_tool_vote/web/monitoring/PullDownMenuStats.jsp
===================================================================
diff -u -r757371b55a625e9180b72983c88391f15673cba4 -r418f65577010d4ad648867396f4e14cd36d2c723
--- lams_tool_vote/web/monitoring/PullDownMenuStats.jsp	(.../PullDownMenuStats.jsp)	(revision 757371b55a625e9180b72983c88391f15673cba4)
+++ lams_tool_vote/web/monitoring/PullDownMenuStats.jsp	(.../PullDownMenuStats.jsp)	(revision 418f65577010d4ad648867396f4e14cd36d2c723)
@@ -36,7 +36,7 @@
 									<c:if test="${(isPortfolioExport != 'true') }"> 	
 									<table align=right>			
 										<tr> 
-											<td NOWRAP  valign=top align=right><font size=2> <b> <bean:message key="label.selectGroup"/> </b>
+											<td NOWRAP  valign=top align=right> <b> <bean:message key="label.selectGroup"/> </b>
 													<select name="monitoredToolSessionIdStats" onchange="javascript:submitSession(this.value,'submitSession');">
 													<c:forEach var="toolSessionName" items="${sessionScope.summaryToolSessions}">
 														<c:forEach var="toolSessionId" items="${sessionScope.summaryToolSessionsId}">
@@ -64,7 +64,6 @@
 														</c:forEach>		  	
 													</c:forEach>		  	
 													</select>
-												</font>
 												</td> 
 											<tr>
 										</table>
Index: lams_tool_vote/web/monitoring/Stats.jsp
===================================================================
diff -u -r29bab925f2d52a03638949fa5f1e7f08a0767100 -r418f65577010d4ad648867396f4e14cd36d2c723
--- lams_tool_vote/web/monitoring/Stats.jsp	(.../Stats.jsp)	(revision 29bab925f2d52a03638949fa5f1e7f08a0767100)
+++ lams_tool_vote/web/monitoring/Stats.jsp	(.../Stats.jsp)	(revision 418f65577010d4ad648867396f4e14cd36d2c723)
@@ -36,7 +36,7 @@
 				<table align="center">
 					<tr> 
 						<td NOWRAP valign=top align=center> 
-							<b> <font size=2> <bean:message key="error.noLearnerActivity"/> </font></b>
+							<b>  <bean:message key="error.noLearnerActivity"/> </b>
 						</td> 
 					<tr>
 				</table>
Index: lams_tool_vote/web/monitoring/SummaryContent.jsp
===================================================================
diff -u -r29bab925f2d52a03638949fa5f1e7f08a0767100 -r418f65577010d4ad648867396f4e14cd36d2c723
--- lams_tool_vote/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 29bab925f2d52a03638949fa5f1e7f08a0767100)
+++ lams_tool_vote/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 418f65577010d4ad648867396f4e14cd36d2c723)
@@ -35,7 +35,7 @@
 				<table align="center">
 					<tr> 
 						<td NOWRAP valign=top align=center> 
-							<b> <font size=2> <bean:message key="error.noLearnerActivity"/> </font></b>
+							<b>  <bean:message key="error.noLearnerActivity"/> </b>
 						</td> 
 					<tr>
 				</table>
Index: lams_tool_vote/web/monitoring/UserResponses.jsp
===================================================================
diff -u -rca438ee67636fd831f44725bdb36bb7ff5108ebf -r418f65577010d4ad648867396f4e14cd36d2c723
--- lams_tool_vote/web/monitoring/UserResponses.jsp	(.../UserResponses.jsp)	(revision ca438ee67636fd831f44725bdb36bb7ff5108ebf)
+++ lams_tool_vote/web/monitoring/UserResponses.jsp	(.../UserResponses.jsp)	(revision 418f65577010d4ad648867396f4e14cd36d2c723)
@@ -32,8 +32,8 @@
 <c:set var="tool"><lams:WebAppURL/></c:set>
 
 	<tr> 
-			 <td NOWRAP valign=top>  <font size=2> <c:out value="${userData.userName}"/> </font>  </td>  
-			 <td NOWRAP valign=top>  <font size=2> <c:out value="${userData.attemptTime}"/> </font> </td>
+			 <td NOWRAP valign=top>   <c:out value="${userData.userName}"/>   </td>  
+			 <td NOWRAP valign=top>   <c:out value="${userData.attemptTime}"/>  </td>
 	</tr>		
 	
 
Index: lams_tool_vote/web/monitoring/VoteNominationViewer.jsp
===================================================================
diff -u -r73ed8a0a0d5fa96ffce05fb414831b759b9c000c -r418f65577010d4ad648867396f4e14cd36d2c723
--- lams_tool_vote/web/monitoring/VoteNominationViewer.jsp	(.../VoteNominationViewer.jsp)	(revision 73ed8a0a0d5fa96ffce05fb414831b759b9c000c)
+++ lams_tool_vote/web/monitoring/VoteNominationViewer.jsp	(.../VoteNominationViewer.jsp)	(revision 418f65577010d4ad648867396f4e14cd36d2c723)
@@ -20,32 +20,22 @@
 --%>
 
 
-<%@ taglib uri="tags-bean" prefix="bean"%> 
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="fck-editor" prefix="FCK" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
 
-<%@ page import="java.util.LinkedHashSet" %>
-<%@ page import="java.util.Set" %>
+<%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
-
-<html:html locale="true">
+	<html:html locale="true">
 	<head>
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-	<lams:headItems/>
 	<title> <bean:message key="label.learnersVoted"/> </title>
+	
+	<%@ include file="/common/header.jsp"%>
+	<%@ include file="/common/fckeditorheader.jsp"%>
+	
 </head>
 <body>
 
-    <table width='80%' cellspacing='8' align='CENTER' class='forms'>
+    <table class='forms'>
 	    <tr> <th NOWRAP colspan=2>  <bean:message key="label.learnersVoted"/> </th> </tr>
 	
 		<tr> 
@@ -55,8 +45,8 @@
 	    
 		<c:forEach var="userData" items="${mapStudentsVoted}">
 			<tr>		 
-					 <td NOWRAP valign=top align=center>   <font size=2> <c:out value="${userData.userName}"/> </font>  </td>  
-					 <td NOWRAP valign=top align=center>   <font size=2> <c:out value="${userData.attemptTime}"/> </font> </td>
+					 <td NOWRAP valign=top align=center>    <c:out value="${userData.userName}"/>   </td>  
+					 <td NOWRAP valign=top align=center>    <c:out value="${userData.attemptTime}"/>  </td>
 			</tr>				 
 		</c:forEach>		  	
     </table>