Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java
===================================================================
diff -u -ra1f83079a0fedc3d6982fde779286d0246847339 -r632c698437a8444e4f4b9cf6a30b4744be1c6653
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java	(.../VoteUtils.java)	(revision a1f83079a0fedc3d6982fde779286d0246847339)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java	(.../VoteUtils.java)	(revision 632c698437a8444e4f4b9cf6a30b4744be1c6653)
@@ -59,8 +59,12 @@
     public static String replaceNewLines(String text)
     {
         logger.debug("using text: " + text);
-        String newText = text.replaceAll("\n","<br>");
-        logger.debug("newText: " + newText);
+        String newText = "";
+        if (text != null)
+        {
+            newText = text.replaceAll("\n","<br>");
+            logger.debug("newText: " + newText);
+        }
         
         return newText;
     }
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java
===================================================================
diff -u -ra1f83079a0fedc3d6982fde779286d0246847339 -r632c698437a8444e4f4b9cf6a30b4744be1c6653
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java	(.../VoteLearningAction.java)	(revision a1f83079a0fedc3d6982fde779286d0246847339)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java	(.../VoteLearningAction.java)	(revision 632c698437a8444e4f4b9cf6a30b4744be1c6653)
@@ -43,6 +43,7 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
+import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
@@ -284,7 +285,8 @@
 		
 	    
 		voteGeneralLearnerFlowDTO.setReflection(new Boolean(voteContent.isReflect()).toString());
-		voteGeneralLearnerFlowDTO.setReflectionSubject(voteContent.getReflectionSubject());
+		String reflectionSubject=VoteUtils.replaceNewLines(voteContent.getReflectionSubject());
+		voteGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject);
 	    
 	    voteLearningForm.resetCommands();
     	
@@ -443,7 +445,8 @@
 		logger.debug("requested redoQuestionsOk, user is sure to redo the questions.");
 
 		voteGeneralLearnerFlowDTO.setReflection(new Boolean(voteContent.isReflect()).toString());
-		voteGeneralLearnerFlowDTO.setReflectionSubject(voteContent.getReflectionSubject());
+		String reflectionSubject=VoteUtils.replaceNewLines(voteContent.getReflectionSubject());
+		voteGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject);
 	    
 		voteLearningForm.resetCommands();
 
@@ -539,7 +542,8 @@
 		logger.debug("attempting to leave/complete session with toolSessionID:" + toolSessionID + " and userID:"+userID);
 		
 		voteGeneralLearnerFlowDTO.setReflection(new Boolean(voteContent.isReflect()).toString());
-		voteGeneralLearnerFlowDTO.setReflectionSubject(voteContent.getReflectionSubject());
+		String reflectionSubject=VoteUtils.replaceNewLines(voteContent.getReflectionSubject());
+		voteGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject);
 	    
 		logger.debug("final voteGeneralLearnerFlowDTO: " + voteGeneralLearnerFlowDTO);
  		request.setAttribute(VOTE_GENERAL_LEARNER_FLOW_DTO,voteGeneralLearnerFlowDTO);
@@ -988,6 +992,27 @@
 	    reflectionSubject=VoteUtils.replaceNewLines(reflectionSubject);
 	    
 	    voteGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject);
+	    
+	    String userID=request.getParameter("userID");
+	 	logger.debug("userID: " + userID);	 	
+	 	voteLearningForm.setUserID(userID);
+	    
+		logger.debug("attempt getting notebookEntry: ");
+		NotebookEntry notebookEntry = voteService.getEntry(new Long(toolSessionID),
+				CoreNotebookConstants.NOTEBOOK_TOOL,
+				MY_SIGNATURE, new Integer(userID));
+		
+        logger.debug("notebookEntry: " + notebookEntry);
+		
+		if (notebookEntry != null) {
+		    String notebookEntryPresentable=notebookEntry.getEntry();
+		    logger.debug("notebookEntryPresentable: " + notebookEntryPresentable);
+		    voteGeneralLearnerFlowDTO.setNotebookEntry(notebookEntryPresentable);
+		    voteLearningForm.setEntryText(notebookEntryPresentable);
+		}
+        
+	    
+	    
 	    request.setAttribute(VOTE_GENERAL_LEARNER_FLOW_DTO, voteGeneralLearnerFlowDTO);
 	    
 		logger.debug("final voteGeneralLearnerFlowDTO: " + voteGeneralLearnerFlowDTO);
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java
===================================================================
diff -u -r4508ae32cc04a4072f3ec94f60168f1b9cee9e71 -r632c698437a8444e4f4b9cf6a30b4744be1c6653
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	(.../VoteLearningStarterAction.java)	(revision 4508ae32cc04a4072f3ec94f60168f1b9cee9e71)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	(.../VoteLearningStarterAction.java)	(revision 632c698437a8444e4f4b9cf6a30b4744be1c6653)
@@ -303,8 +303,12 @@
 	logger.debug("is tool reflective: " + voteContent.isReflect());
 	voteGeneralLearnerFlowDTO.setReflection(new Boolean(voteContent.isReflect()).toString());
 	logger.debug("reflection subject: " + voteContent.getReflectionSubject());
-	voteGeneralLearnerFlowDTO.setReflectionSubject(voteContent.getReflectionSubject());
+	String reflectionSubject=VoteUtils.replaceNewLines(voteContent.getReflectionSubject());
+	voteGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject);
 	
+	logger.debug("is vote lockOnFinish: " + voteContent.isLockOnFinish());
+	 
+	
 	logger.debug("attempt getting notebookEntry: ");
 	NotebookEntry notebookEntry = voteService.getEntry(new Long(toolSessionID),
 			CoreNotebookConstants.NOTEBOOK_TOOL,
Index: lams_tool_vote/web/learning/ExitLearning.jsp
===================================================================
diff -u -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de -r632c698437a8444e4f4b9cf6a30b4744be1c6653
--- lams_tool_vote/web/learning/ExitLearning.jsp	(.../ExitLearning.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
+++ lams_tool_vote/web/learning/ExitLearning.jsp	(.../ExitLearning.jsp)	(revision 632c698437a8444e4f4b9cf6a30b4744be1c6653)
@@ -190,23 +190,22 @@
 				</div>
 
 
-				<c:if
-					test="${voteGeneralLearnerFlowDTO.notebookEntry != null && voteGeneralLearnerFlowDTO.notebookEntry != ''}">
+				<h2>
+						<c:out value="${voteGeneralLearnerFlowDTO.reflectionSubject}" escapeXml="false" />												
+				</h2>
 
-					<h2>
-						<fmt:message key="label.notebook.entries" />
-					</h2>
-	
-					<p>
-						<c:out value="${voteGeneralLearnerFlowDTO.notebookEntry}"
-							escapeXml="false" />
-					</p>
-				</c:if>				
+				<c:out value="${voteGeneralLearnerFlowDTO.notebookEntry}"
+					escapeXml="false" />
+			
 
+				<br>
+						<html:button property="forwardtoReflection" styleClass="button"
+							onclick="submitMethod('forwardtoReflection');"> 
+							<fmt:message key="label.edit" />
+						</html:button>
 
 
 
-
 			<div class="space-bottom-top align-right">
 				<html:submit property="learnerFinished" styleClass="button"
 					onclick="submitMethod('learnerFinished');">
Index: lams_tool_vote/web/learning/RevisitedAllNominations.jsp
===================================================================
diff -u -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de -r632c698437a8444e4f4b9cf6a30b4744be1c6653
--- lams_tool_vote/web/learning/RevisitedAllNominations.jsp	(.../RevisitedAllNominations.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
+++ lams_tool_vote/web/learning/RevisitedAllNominations.jsp	(.../RevisitedAllNominations.jsp)	(revision 632c698437a8444e4f4b9cf6a30b4744be1c6653)
@@ -190,20 +190,25 @@
 					<c:out value="${VoteLearningForm.userEntry}" />
 				</div>
 
-
-				<c:if
-					test="${voteGeneralLearnerFlowDTO.notebookEntry != null && voteGeneralLearnerFlowDTO.notebookEntry != ''}">
-
+				
 					<h2>
-						<fmt:message key="label.notebook.entries" />
+							<c:out value="${voteGeneralLearnerFlowDTO.reflectionSubject}" escapeXml="false" />												
 					</h2>
-	
-					<p>
-						<c:out value="${voteGeneralLearnerFlowDTO.notebookEntry}"
-							escapeXml="false" />
-					</p>
-				</c:if>				
 
+					<c:out value="${voteGeneralLearnerFlowDTO.notebookEntry}"
+						escapeXml="false" />
+				
+					<c:if test="${voteGeneralLearnerFlowDTO.lockOnFinish == 'true' }">					
+					<br>
+							<html:button property="forwardtoReflection" styleClass="button"
+								onclick="submitMethod('forwardtoReflection');"> 
+								<fmt:message key="label.edit" />
+							</html:button>
+					</c:if>													
+				
+				
+				
+
 				<div class="space-bottom-top">
 
 					<html:submit property="redoQuestionsOk" styleClass="button"