Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java
===================================================================
diff -u -r1584ef78e1cf4a5bbdc726bda5345d69be190801 -r176368e713ee9dee5b8c206e3f979dfc839f95cd
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java	(.../VoteLearningAction.java)	(revision 1584ef78e1cf4a5bbdc726bda5345d69be190801)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java	(.../VoteLearningAction.java)	(revision 176368e713ee9dee5b8c206e3f979dfc839f95cd)
@@ -569,7 +569,6 @@
 		
 		// check number of votes
 		int castVoteCount= voteDisplayOrderIds!=null ? voteDisplayOrderIds.size() : 0;
-    	//String userEntry=voteLearningForm.getUserEntry();
     	logger.debug("userEntry: " + userEntry);
     	
     	if ((userEntry != null) && (userEntry.length() > 0))
@@ -657,7 +656,7 @@
         	logger.debug("votes deleted for user: " + voteQueUsr.getUid());
     	}
     	
-    	// To mimize changes to working code, convert the String[] array to the mapGeneralCheckedOptionsContent structure 
+    	/* to mimize changes to working code, convert the String[] array to the mapGeneralCheckedOptionsContent structure */ 
     	Map mapGeneralCheckedOptionsContent = LearningUtil.buildQuestionContentMap(request, voteService, voteContent, voteDisplayOrderIds);
     	logger.debug("mapGeneralCheckedOptionsContent size: " + mapGeneralCheckedOptionsContent.size());
     	
@@ -699,7 +698,7 @@
     	
     	logger.debug("created user attempt in the db");
     	
-    	// Put the map in the request ready for the next screen
+    	/* put the map in the request ready for the next screen */
     	request.setAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT, mapGeneralCheckedOptionsContent);
     	logger.debug("final mapGeneralCheckedOptionsContent: " + mapGeneralCheckedOptionsContent);
     	voteLearningForm.setMapGeneralCheckedOptionsContent(mapGeneralCheckedOptionsContent);
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java
===================================================================
diff -u -r1584ef78e1cf4a5bbdc726bda5345d69be190801 -r176368e713ee9dee5b8c206e3f979dfc839f95cd
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java	(.../VoteLearningForm.java)	(revision 1584ef78e1cf4a5bbdc726bda5345d69be190801)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java	(.../VoteLearningForm.java)	(revision 176368e713ee9dee5b8c206e3f979dfc839f95cd)
@@ -692,28 +692,7 @@
         this.userID = userID;
     }
     
-    public String toString() {
-        return new ToStringBuilder(this)
-            .append("activityInstructions: ", activityInstructions)
-            .append("activityTitle: ", activityTitle)
-            .append("revisitingUser: ", revisitingUser)
-            .append("userEntry: ", userEntry)
-            .append("castVoteCount: ", castVoteCount)
-            .append("maxNominationCountReached: ", maxNominationCountReached)            
-            .append("activityRunOffline: ", activityRunOffline)
-            .append("toolSessionID: ", toolSessionID)
-            .append("learningMode: ", learningMode)
-            .append("toolContentID: ", toolContentID)
-            .append("nominationsSubmited: ", nominationsSubmited)            
-            .append("toolContentUID: ", toolContentUID)
-            .append("previewOnly: ", previewOnly)            
-            .append("reportViewOnly: ", reportViewOnly)
-            .append("mapGeneralCheckedOptionsContent: ", mapGeneralCheckedOptionsContent)
-            .toString();
-    }
-    
-    
-        /**
+     /**
      * @return Returns the reportViewOnly.
      */
     public String getReportViewOnly() {
@@ -762,4 +741,25 @@
     public void setPreviewOnly(String previewOnly) {
         this.previewOnly = previewOnly;
     }
+    
+    public String toString() {
+        return new ToStringBuilder(this)
+            .append("activityInstructions: ", activityInstructions)
+            .append("activityTitle: ", activityTitle)
+            .append("revisitingUser: ", revisitingUser)
+            .append("userEntry: ", userEntry)
+            .append("castVoteCount: ", castVoteCount)
+            .append("maxNominationCountReached: ", maxNominationCountReached)            
+            .append("activityRunOffline: ", activityRunOffline)
+            .append("toolSessionID: ", toolSessionID)
+            .append("learningMode: ", learningMode)
+            .append("toolContentID: ", toolContentID)
+            .append("nominationsSubmited: ", nominationsSubmited)            
+            .append("toolContentUID: ", toolContentUID)
+            .append("previewOnly: ", previewOnly)            
+            .append("reportViewOnly: ", reportViewOnly)
+            .append("mapGeneralCheckedOptionsContent: ", mapGeneralCheckedOptionsContent)
+            .toString();
+    }
+    
 }
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java
===================================================================
diff -u -r1584ef78e1cf4a5bbdc726bda5345d69be190801 -r176368e713ee9dee5b8c206e3f979dfc839f95cd
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	(.../VoteLearningStarterAction.java)	(revision 1584ef78e1cf4a5bbdc726bda5345d69be190801)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	(.../VoteLearningStarterAction.java)	(revision 176368e713ee9dee5b8c206e3f979dfc839f95cd)
@@ -306,7 +306,6 @@
 		commonContentSetup(request, voteService, voteContent, voteGeneralLearnerFlowDTO);
 		
 		/* PREVIEW_ONLY for jsp*/
-    	//request.getSession().setAttribute(PREVIEW_ONLY, new Boolean(true).toString());
 		voteLearningForm.setPreviewOnly(new Boolean(true).toString());
 		voteGeneralLearnerFlowDTO.setPreviewOnly(new Boolean(true).toString());
 		
@@ -501,10 +500,6 @@
      		logger.debug("preparing chart data for readonly mode");
      		MonitoringUtil.prepareChartData(request, voteService, null, voteContent.getVoteContentId().toString(), toolSessionID, voteGeneralLearnerFlowDTO);
      		
-     		//voteLearningForm.setReportViewOnly(new Boolean(true).toString());
-     		//voteGeneralLearnerFlowDTO.setReportViewOnly(new Boolean(true).toString());
-     		
-     		
      		logger.debug("view-only voteGeneralLearnerFlowDTO: " + voteGeneralLearnerFlowDTO);
      		request.setAttribute(VOTE_GENERAL_LEARNER_FLOW_DTO,voteGeneralLearnerFlowDTO);
      		
Index: lams_tool_vote/web/learning/AllNominations.jsp
===================================================================
diff -u -r1584ef78e1cf4a5bbdc726bda5345d69be190801 -r176368e713ee9dee5b8c206e3f979dfc839f95cd
--- lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision 1584ef78e1cf4a5bbdc726bda5345d69be190801)
+++ lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision 176368e713ee9dee5b8c206e3f979dfc839f95cd)
@@ -209,21 +209,14 @@
 				<c:if test="${VoteLearningForm.reportViewOnly != 'true'}"> 				   	
 				  <tr>
 				  	<td NOWRAP valign=top> 
-								<c:if test="${VoteLearningForm.voteChangable == 'true' && VoteLearningForm.lockOnFinish != 'true'}"> 				   						
+								<c:if test="${VoteLearningForm.voteChangable == 'true'}"> 				   						
 			                                <html:submit property="redoQuestionsOk" 
 			                                             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="button" 
-				                                             onclick="submitMethod('redoQuestionsOk');">
-				                                    <bean:message key="label.retake"/>
-				                                </html:submit>
-								</c:if> 		          								                      
 					<td>					
 					<td NOWRAP valign=top> 			
 						<div class="right-buttons">