Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java
===================================================================
diff -u -r96c010334a799ab269945c37537e46dd15f2a2bc -r42c1b74cbc393836dc6e71afbb4223c27690e40e
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java	(.../VoteAppConstants.java)	(revision 96c010334a799ab269945c37537e46dd15f2a2bc)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java	(.../VoteAppConstants.java)	(revision 42c1b74cbc393836dc6e71afbb4223c27690e40e)
@@ -185,7 +185,7 @@
     public static final Integer MAX_TOOL_SESSION_COUNT					=new Integer(500);
     public static final String IS_TOOL_SESSION_CHANGED					="isToolSessionChanged";
     public static final String OPTION_OFF								="false";
-    public static final String ACTIVITY_TITLE 							= "activityTitle";
+    public static final String ACTIVITY_TITLE 							="activityTitle";
     public static final String ACTIVITY_INSTRUCTIONS					= "activityInstructions";
     public static final String MONITORING								="monitoring";
     public static final String REMOVABLE_QUESTION_INDEX					="removableQuestionIndex";
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java
===================================================================
diff -u -r36db941b897cc39fda9832b8b73b3b81a3c9faa9 -r42c1b74cbc393836dc6e71afbb4223c27690e40e
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	(.../VoteLearningStarterAction.java)	(revision 36db941b897cc39fda9832b8b73b3b81a3c9faa9)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	(.../VoteLearningStarterAction.java)	(revision 42c1b74cbc393836dc6e71afbb4223c27690e40e)
@@ -187,7 +187,7 @@
      * And the passed tool session id already refers to it.
      */
     setupAttributes(request, voteContent, voteLearningForm);
-
+    
     request.getSession().setAttribute(TOOL_CONTENT_ID, voteContent.getVoteContentId());
     logger.debug("using TOOL_CONTENT_ID: " + voteContent.getVoteContentId());
     
@@ -455,6 +455,12 @@
 	    logger.debug("allow text entry is: " + voteLearningForm.getAllowTextEntry());
 	    voteLearningForm.setLockOnFinish(new Boolean(voteContent.isLockOnFinish()).toString());
 	    voteLearningForm.setVoteChangable(new Boolean(voteContent.isVoteChangable()).toString());
+	    
+	    logger.debug("ACTIVITY_TITLE: " + voteContent.getTitle());
+	    request.getSession().setAttribute(ACTIVITY_TITLE,voteContent.getTitle());
+	    
+	    logger.debug("ACTIVITY_INSTRUCTIONS: " + voteContent.getInstructions());
+	    request.getSession().setAttribute(ACTIVITY_INSTRUCTIONS,voteContent.getInstructions());
 	}
 	
 	
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteStarterAction.java
===================================================================
diff -u -r96c010334a799ab269945c37537e46dd15f2a2bc -r42c1b74cbc393836dc6e71afbb4223c27690e40e
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteStarterAction.java	(.../VoteStarterAction.java)	(revision 96c010334a799ab269945c37537e46dd15f2a2bc)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteStarterAction.java	(.../VoteStarterAction.java)	(revision 42c1b74cbc393836dc6e71afbb4223c27690e40e)
@@ -287,6 +287,8 @@
 		logger.debug("destination: " + destination);
 		
 		logger.debug("active module is: " + voteAuthoringForm.getActiveModule());
+		
+		logger.debug("final ACTIVITY_TITLE is: " + request.getSession().getAttribute(ACTIVITY_TITLE));
 		return (mapping.findForward(destination));
 	} 
 	
@@ -433,8 +435,8 @@
 		
 		if (voteContent.getTitle() == null)
 		{
-			request.getSession().setAttribute(ACTIVITY_TITLE, "Questions and Answers");
-			request.getSession().setAttribute(ACTIVITY_INSTRUCTIONS, "Please answer the questions.");
+			request.getSession().setAttribute(ACTIVITY_TITLE, "Voting Title");
+			request.getSession().setAttribute(ACTIVITY_INSTRUCTIONS, "Voting Instructions");
 		}
 		else
 		{
Index: lams_tool_vote/web/learning/AllNominations.jsp
===================================================================
diff -u -r96c010334a799ab269945c37537e46dd15f2a2bc -r42c1b74cbc393836dc6e71afbb4223c27690e40e
--- lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision 96c010334a799ab269945c37537e46dd15f2a2bc)
+++ lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision 42c1b74cbc393836dc6e71afbb4223c27690e40e)
@@ -18,28 +18,44 @@
 
   http://www.gnu.org/licenses/gpl.txt
 --%>
+
 <!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>
-	<title> <bean:message key="label.learning"/> </title>
-	<%@ include file="/common/header.jsp"%>
-	<%@ include file="/common/fckeditorheader.jsp"%>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
 
+<html:html>
+<head>
+	<html:base />
+	<lams:headItems />
+	<title><bean:message key="activity.title" /></title>
+	
 	<script language="JavaScript" type="text/JavaScript">
 		function submitMethod(actionMethod) 
 		{
 			document.VoteLearningForm.dispatch.value=actionMethod; 
 			document.VoteLearningForm.submit();
 		}
 	</script>
-	
 </head>
+
 <body>
+	<div id="page-learner">
 
+<h1 class="no-tabs-below">
+	<c:out value="${sessionScope.activityTitle}" escapeXml="false" />
+</h1>
+
+<div id="header-no-tabs-learner"></div>
+
+<div id="content-learner">
 <html:form  action="/learning?validate=false" enctype="multipart/form-data"method="POST" target="_self">
 	<html:hidden property="dispatch"/>
 	<html:hidden property="toolContentID"/>
@@ -85,8 +101,8 @@
 					  
 
 					  <tr>
-					  	<td NOWRAP align=center  valign=top colspan=2> 
-								&nbsp&nbsp&nbsp&nbsp								
+					  	<td NOWRAP valign=top colspan=2> 
+								&nbsp
 					  	</td>
 					  </tr>	
 
@@ -112,36 +128,40 @@
 
 
 				  <tr>
-				  	<td NOWRAP colspan=2 align=center valign=top> 
+				  	<td NOWRAP valign=top> 
 								<c:if test="${VoteLearningForm.voteChangable == 'true' && VoteLearningForm.lockOnFinish != 'true'}"> 				   						
 			                                <html:submit property="redoQuestionsOk" 
-			                                             styleClass="linkbutton" 
+			                                             styleClass="button" 
 			                                             onclick="submitMethod('redoQuestionsOk');">
 			                                    <bean:message key="label.retake"/>
 			                                </html:submit>
 								</c:if> 		          
 
 								<c:if test="${VoteLearningForm.voteChangable == 'true' && VoteLearningForm.lockOnFinish == 'true' && VoteLearningForm.revisitingUser == 'false' }"> 				   						
 				                                <html:submit property="redoQuestionsOk" 
-				                                             styleClass="linkbutton" 
+				                                             styleClass="button" 
 				                                             onclick="submitMethod('redoQuestionsOk');">
 				                                    <bean:message key="label.retake"/>
 				                                </html:submit>
 								</c:if> 		          								                      
-
+					<td>					
+					<td NOWRAP valign=top> 			
+						<div class="right-buttons">
                                 <html:submit property="learnerFinished" 
-                                             styleClass="linkbutton" 
+                                             styleClass="button" 
                                              onclick="submitMethod('learnerFinished');">
                                     <bean:message key="label.finished"/>
                                 </html:submit>
+                         </div>
 				  	 </td>
 				  </tr>
 
-					  
-</html:form>
+	</html:form>
+</div>
 
+<div id="footer-learner"></div>
+
+</div>
 </body>
 </html:html>
 
-
-
Index: lams_tool_vote/web/learning/AnswersContent.jsp
===================================================================
diff -u -r418f65577010d4ad648867396f4e14cd36d2c723 -r42c1b74cbc393836dc6e71afbb4223c27690e40e
--- lams_tool_vote/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 418f65577010d4ad648867396f4e14cd36d2c723)
+++ lams_tool_vote/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 42c1b74cbc393836dc6e71afbb4223c27690e40e)
@@ -19,17 +19,23 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
-
 <!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">
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+
+<html:html>
 <head>
-	<title> <bean:message key="label.learning"/> </title>
-	<%@ include file="/common/header.jsp"%>
-	<%@ include file="/common/fckeditorheader.jsp"%>
+	<html:base />
+	<lams:headItems />
+	<title><bean:message key="activity.title" /></title>
 
 	<script language="JavaScript" type="text/JavaScript">
 
@@ -87,12 +93,19 @@
 			document.VoteLearningForm.submit();
 		}
 	</script>
-	
-
 </head>
+
 <body>
+	<div id="page-learner">
 
-<html:form  onsubmit="return validate();" action="/learning?validate=false&dispatch=continueOptionsCombined" method="POST" target="_self">
+<h1 class="no-tabs-below">
+	<c:out value="${sessionScope.activityTitle}" escapeXml="false" />
+</h1>
+
+<div id="header-no-tabs-learner"></div>
+
+<div id="content-learner">
+	<html:form  onsubmit="return validate();" action="/learning?validate=false&dispatch=continueOptionsCombined" method="POST" target="_self">
 	<html:hidden property="dispatch"/>
 	<html:hidden property="toolContentID"/>
 
@@ -106,19 +119,13 @@
 					<c:if test="${VoteLearningForm.maxNominationCountReached == 'true'}"> 			
 						<tr> <td class="error">
 							<bean:message key="error.maxNominationCount.reached"/> 
-							<c:out value="${VoteLearningForm.maxNominationCount}"/>	
+								<c:out value="${VoteLearningForm.maxNominationCount}"/>	
 							<bean:message key="label.nominations"/>
 						</td></tr>
 					</c:if> 		
 					
 	
 					<c:if test="${VoteLearningForm.activityRunOffline != 'true'}"> 			
-	  					  <tr>
-						  	<td NOWRAP align=center valign=top colspan=2> 
-								  <c:out value="${VoteLearningForm.activityTitle}" escapeXml="false" />						  								
-						  	</td>
-						  </tr>
-						  
 						  <tr>
 						  	<td  NOWRAP align=left valign=top colspan=2> 
 								  <c:out value="${VoteLearningForm.activityInstructions}" escapeXml="false" />						  																
@@ -141,28 +148,37 @@
 							<c:if test="${VoteLearningForm.allowTextEntry == 'true'}"> 			
 									<tr> 
 										<td NOWRAP align=left valign=top colspan=2> 
-							      			 <b>
-										 		<bean:message key="label.other"/>: 
-									      		</b> 
-									 			<html:text property="userEntry" size="30" maxlength="100"/>
+											<table align=left> 
+												<tr> <td>
+								      			 <b>
+											 		<bean:message key="label.other"/>: 
+										      		</b> 
+										 			<html:text property="userEntry" size="30" maxlength="100"/>
+											 	</td> </tr>
+											</table>									 			
 								 		</td>
 								  	</tr>
 							</c:if> 									  	
 				  	   
 				  	<html:hidden property="donePreview"/>						   
+		  	   		
 		  	   		  <tr>
-					  	<td NOWRAP align=left valign=top> 
+					  	<td NOWRAP valign=top colspan=2> 
 		                            <html:submit property="continueOptionsCombined" 
-		                                         styleClass="linkbutton">
+		                                         styleClass="button">
 										<bean:message key="label.submit.vote"/>
 		                            </html:submit>
 					  	 </td>
 					  </tr>
 					
 					</c:if> 		
 				</table>
-</html:form>
+	</html:form>
+</div>
 
+<div id="footer-learner"></div>
+
+</div>
 </body>
 </html:html>
 
Index: lams_tool_vote/web/learning/ExitLearning.jsp
===================================================================
diff -u -r418f65577010d4ad648867396f4e14cd36d2c723 -r42c1b74cbc393836dc6e71afbb4223c27690e40e
--- lams_tool_vote/web/learning/ExitLearning.jsp	(.../ExitLearning.jsp)	(revision 418f65577010d4ad648867396f4e14cd36d2c723)
+++ lams_tool_vote/web/learning/ExitLearning.jsp	(.../ExitLearning.jsp)	(revision 42c1b74cbc393836dc6e71afbb4223c27690e40e)
@@ -1,45 +1,80 @@
+<%-- 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as 
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+  USA
+
+  http://www.gnu.org/licenses/gpl.txt
+--%>
+
 <!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>
-	<title> <bean:message key="label.learning"/> </title>
-	<%@ include file="/common/header.jsp"%>
-	<%@ include file="/common/fckeditorheader.jsp"%>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
 
+<html:html>
+<head>
+	<html:base />
+	<lams:headItems />
+	<title><bean:message key="activity.title" /></title>
+	
 	<script language="JavaScript" type="text/JavaScript">
 		function submitMethod(actionMethod) 
 		{
 			document.VoteLearningForm.dispatch.value=actionMethod; 
 			document.VoteLearningForm.submit();
 		}
 	</script>
-	
-	
 </head>
+
 <body>
+	<div id="page-learner">
 
+<h1 class="no-tabs-below">
+	<c:out value="${sessionScope.activityTitle}" escapeXml="false" />
+</h1>
+
+<div id="header-no-tabs-learner"></div>
+
+<div id="content-learner">
 <html:form  action="/learning?validate=false" enctype="multipart/form-data"method="POST" target="_self">
 	<html:hidden property="dispatch"/>
 	<html:hidden property="toolContentID"/>
 
 			<table class="forms">
 					  <tr>
-					  	<td NOWRAP align=left class="input" valign=top colspan=2> 
+					  	<td NOWRAP align=left valign=top colspan=2> 
 						  	 <b>  <bean:message key="label.learning.forceFinishMessage"/> </b> 
 					  	</td>
 					  </tr>
 				
 					<tr>
-						<td NOWRAP align=right class="input" valign=top colspan=2> 
-							<hr>
+						<td NOWRAP valign=top colspan=2> 
+							&nbsp
 						</td> 
 					</tr>
 				
 				  <tr>
-				  	<td NOWRAP align=left class="input" valign=top colspan=2> 
+				  	<td NOWRAP align=left valign=top colspan=2> 
 					  	 <b>  <bean:message key="label.learning.reportMessage.past"/> </b> 
 				  	</td>
 				  </tr>
@@ -54,20 +89,25 @@
 				
 				
 		  	   		  <tr>
-					  	<td NOWRAP colspan=2 align=center class="input" valign=top> 
+					  	<td NOWRAP colspan=2 valign=top> 
+ 							<div class="right-buttons">
                                 <html:submit property="learnerFinished" 
-                                             styleClass="linkbutton" 
+                                             styleClass="button" 
                                              onclick="submitMethod('learnerFinished');">
                                     <bean:message key="label.finished"/>
                                 </html:submit>
+                            </div>
 					  	 </td>
 					  </tr>
 					
 				</table>
 </html:form>
 
+</div>
+
+<div id="footer-learner"></div>
+
+</div>
 </body>
 </html:html>
 
-
-
Index: lams_tool_vote/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -r418f65577010d4ad648867396f4e14cd36d2c723 -r42c1b74cbc393836dc6e71afbb4223c27690e40e
--- lams_tool_vote/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 418f65577010d4ad648867396f4e14cd36d2c723)
+++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 42c1b74cbc393836dc6e71afbb4223c27690e40e)
@@ -1,26 +1,62 @@
+<%-- 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as 
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+  USA
+
+  http://www.gnu.org/licenses/gpl.txt
+--%>
+
 <!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>
-	<title> <bean:message key="label.learning"/> </title>
-	<%@ include file="/common/header.jsp"%>
-	<%@ include file="/common/fckeditorheader.jsp"%>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
 
+<html:html>
+<head>
+	<html:base />
+	<lams:headItems />
+	<title><bean:message key="activity.title" /></title>
+	
 	<script language="JavaScript" type="text/JavaScript">
 		function submitMethod(actionMethod) 
 		{
 			document.VoteLearningForm.dispatch.value=actionMethod; 
 			document.VoteLearningForm.submit();
 		}
 	</script>
-
-	
 </head>
+
 <body>
+	<div id="page-learner">
 
+<h1 class="no-tabs-below">
+	<c:out value="${sessionScope.activityTitle}" escapeXml="false" />
+</h1>
+
+<div id="header-no-tabs-learner"></div>
+
+<div id="content-learner">
+
 <html:form  action="/learning?validate=false" enctype="multipart/form-data"method="POST" target="_self">
 	<html:hidden property="dispatch"/>
 	<html:hidden property="toolContentID"/>
@@ -36,7 +72,7 @@
 
 					<tr>
 						<td NOWRAP align=right  valign=top colspan=2> 
-							<hr>
+							&nbsp
 						</td> 
 					</tr>
 					
@@ -54,24 +90,17 @@
 					 		</td>
 					  	</tr>
 
-			  	   	<tr> 
-				 		<td NOWRAP colspan=2  valign=top> 
-				 		&nbsp
-				 		</td>
-			  	   </tr>
-
-			  	   
 		  	   		  <tr>
-					  	<td NOWRAP colspan=2 align=center  valign=top> 
+					  	<td NOWRAP colspan=2  valign=top> 
                                 <html:submit property="redoQuestions" 
-                                             styleClass="linkbutton" 
+                                             styleClass="button" 
                                              onclick="submitMethod('redoQuestions');">
                                     <bean:message key="label.retake"/>
                                 </html:submit>
 
 								
                                 <html:submit property="viewAllResults" 
-                                             styleClass="linkbutton" 
+                                             styleClass="button" 
                                              onclick="submitMethod('viewAllResults');">
                                     <bean:message key="label.overAllResults"/>
                                 </html:submit>
@@ -81,7 +110,11 @@
 				</table>
 </html:form>
 
+</div>
+
+<div id="footer-learner"></div>
+
+</div>
 </body>
 </html:html>
 
-