Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java
===================================================================
diff -u -rae28185f07883077586773f760d1bde953e2d9bf -r6e806e2588289bb42a1791b145a0f403a72a883d
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java	(.../LearningUtil.java)	(revision ae28185f07883077586773f760d1bde953e2d9bf)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java	(.../LearningUtil.java)	(revision 6e806e2588289bb42a1791b145a0f403a72a883d)
@@ -85,7 +85,7 @@
 	}
 
 
-    public static void createUser(HttpServletRequest request)
+    public static VoteQueUsr createUser(HttpServletRequest request)
 	{
 		IVoteService voteService =VoteUtils.getToolService(request);
 	    Long queUsrId=VoteUtils.getUserId();
@@ -101,6 +101,7 @@
 										new TreeSet());		
 		voteService.createVoteQueUsr(voteQueUsr);
 		logger.debug("created voteQueUsr in the db: " + voteQueUsr);
+		return voteQueUsr;
 	}
 
     
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java
===================================================================
diff -u -rae28185f07883077586773f760d1bde953e2d9bf -r6e806e2588289bb42a1791b145a0f403a72a883d
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java	(.../VoteLearningAction.java)	(revision ae28185f07883077586773f760d1bde953e2d9bf)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java	(.../VoteLearningAction.java)	(revision 6e806e2588289bb42a1791b145a0f403a72a883d)
@@ -253,12 +253,14 @@
 		
 		
         /* REMOVE THIS this is temp code from here **/
+		/*
 		VoteSession voteSession=null;
 		voteSession=voteService.retrieveVoteSession(toolSessionId);
 		logger.debug("retrieved voteSession: " + voteSession);
     	voteSession.setSessionStatus(VoteAppConstants.COMPLETED);
     	voteService.updateVoteSession(voteSession);
     	logger.debug("updated voteSession to COMPLETED" + voteSession);
+    	*/
     	/* till here*/
 
 	
@@ -387,20 +389,48 @@
     	}
     	logger.debug("userEntryAvailable " + userEntryAvailable);
     	
+    	Long toolSessionId=(Long)request.getSession().getAttribute(TOOL_SESSION_ID);
+    	logger.debug("toolSessionId " + toolSessionId);
     	
-    	boolean isUserDefined=LearningUtil.doesUserExists(request);
-    	logger.debug("isUserDefined");
+    	VoteSession voteSession=voteService.retrieveVoteSession(toolSessionId);
+        logger.debug("retrieving voteSession: " + voteSession);
+
+    	
+    	boolean isUserDefined=false;
+    	String userID=(String)request.getSession().getAttribute(USER_ID);
+    	logger.debug("userID: " + userID);
+    	VoteQueUsr existingVoteQueUsr=voteService.getVoteUserBySession(new Long(userID), voteSession.getUid());
+    	logger.debug("existingVoteQueUsr: " + existingVoteQueUsr);
+    	
+    	if (existingVoteQueUsr != null)
+    	    isUserDefined=true;
+    	
+    	logger.debug("isUserDefined: " + isUserDefined);
+    	
+    	
+    	VoteQueUsr voteQueUsr=null;
     	if (isUserDefined == false)
     	{
-    		LearningUtil.createUser(request);
+    	    voteQueUsr=LearningUtil.createUser(request);
     		logger.debug("created user in the db");
+    		logger.debug("new create");
     	}
-    	VoteQueUsr voteQueUsr=LearningUtil.getUser(request);
+    	else
+    	{
+    	    voteQueUsr=existingVoteQueUsr;
+    	    logger.debug("assign");
+    	}
+    	
     	logger.debug("voteQueUsr: " + voteQueUsr);
+    	//VoteQueUsr voteQueUsr=LearningUtil.getUser(request);
+    	logger.debug("voteQueUsr is : " + voteQueUsr);
     	
     	logger.debug("creating attemps with mapGeneralCheckedOptionsContent " + mapGeneralCheckedOptionsContent);
-    	voteService.removeAttemptsForUser(voteQueUsr.getUid());
-    	logger.debug("nominations deleted for user: " + voteQueUsr.getUid());
+    	if (existingVoteQueUsr != null)
+    	{
+        	voteService.removeAttemptsForUser(existingVoteQueUsr.getUid());
+        	logger.debug("nominations deleted for user: " + voteQueUsr.getUid());
+    	}
     	
     	logger.debug("mapGeneralCheckedOptionsContent size: " + mapGeneralCheckedOptionsContent.size());
     	if (mapGeneralCheckedOptionsContent.size() > 0)
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java
===================================================================
diff -u -rae28185f07883077586773f760d1bde953e2d9bf -r6e806e2588289bb42a1791b145a0f403a72a883d
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	(.../VoteLearningStarterAction.java)	(revision ae28185f07883077586773f760d1bde953e2d9bf)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	(.../VoteLearningStarterAction.java)	(revision 6e806e2588289bb42a1791b145a0f403a72a883d)
@@ -346,7 +346,9 @@
 	String userID=(String) request.getSession().getAttribute(USER_ID);
 	logger.debug("userID:" + userID);
     
-	VoteQueUsr voteQueUsr=voteService.retrieveVoteQueUsr(new Long(userID));
+	logger.debug("voteSession uid :" + voteSession.getUid());
+	//VoteQueUsr voteQueUsr=voteService.retrieveVoteQueUsr(new Long(userID));
+	VoteQueUsr voteQueUsr=voteService.getVoteUserBySession(new Long(userID), voteSession.getUid());
     logger.debug("voteQueUsr:" + voteQueUsr);
     
     if (voteQueUsr != null)
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java
===================================================================
diff -u -rb981d563ace42f1c943a2e847aa2f725249b82a8 -r6e806e2588289bb42a1791b145a0f403a72a883d
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java	(.../VoteMonitoringStarterAction.java)	(revision b981d563ace42f1c943a2e847aa2f725249b82a8)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java	(.../VoteMonitoringStarterAction.java)	(revision 6e806e2588289bb42a1791b145a0f403a72a883d)
@@ -85,6 +85,8 @@
 		
 		
 		request.getSession().setAttribute(USER_EXCEPTION_NO_TOOL_SESSIONS, new Boolean(true).toString());
+		request.getSession().setAttribute(COUNT_ALL_USERS, new Integer(0).toString());
+		request.getSession().setAttribute(COUNT_SESSION_COMPLETE, new Integer(0).toString());
 		
 		VoteMonitoringAction voteMonitoringAction= new VoteMonitoringAction();
 		logger.debug("calling initSummaryContent.");
Index: lams_tool_vote/web/authoring/BasicContentViewOnly.jsp
===================================================================
diff -u -rb981d563ace42f1c943a2e847aa2f725249b82a8 -r6e806e2588289bb42a1791b145a0f403a72a883d
--- lams_tool_vote/web/authoring/BasicContentViewOnly.jsp	(.../BasicContentViewOnly.jsp)	(revision b981d563ace42f1c943a2e847aa2f725249b82a8)
+++ lams_tool_vote/web/authoring/BasicContentViewOnly.jsp	(.../BasicContentViewOnly.jsp)	(revision 6e806e2588289bb42a1791b145a0f403a72a883d)
@@ -58,7 +58,7 @@
 					  		<c:if test="${optionEntry.key > 1}"> 			
 								<c:set var="optIndex" scope="session" value="${optIndex +1}"/>
 								  <tr>
-								  	<td valign="top">  <b> <c:out value="Nomination ${optIndex}"/>:  </b> </td>
+								  	<td valign="top">  <font size=2> <b> <c:out value="Nomination ${optIndex}"/>:  </b> </font></td>
 
 									<td NOWRAP valign=top>
 										<c:out value="${optionEntry.value}"  escapeXml="false"/>