Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java
===================================================================
diff -u -re46194b7711ec6078f5946f1281946c9b177e103 -rcdcf81bed7731048affeec8f53caa5865c8fe045
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java	(.../IMcOptionsContentDAO.java)	(revision e46194b7711ec6078f5946f1281946c9b177e103)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java	(.../IMcOptionsContentDAO.java)	(revision cdcf81bed7731048affeec8f53caa5865c8fe045)
@@ -111,8 +111,6 @@
 	public void removeMcOptionsContent(McOptsContent mcOptsContent);
 	
 	public List findMcOptionNamesByQueId(Long mcQueContentId);
-	
-	public Long loadMaxUid();
 }
 
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java
===================================================================
diff -u -re46194b7711ec6078f5946f1281946c9b177e103 -rcdcf81bed7731048affeec8f53caa5865c8fe045
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java	(.../McOptionsContentDAO.java)	(revision e46194b7711ec6078f5946f1281946c9b177e103)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java	(.../McOptionsContentDAO.java)	(revision cdcf81bed7731048affeec8f53caa5865c8fe045)
@@ -60,44 +60,8 @@
 			 return (McOptsContent) this.getHibernateTemplate()
 	         .get(McOptsContent.class, uid);
 		}
-
 	 	
-	 	public Long loadMaxUid()
-	    {
-	 	   logger.debug("starting loadMaxUid");
-	 	   HibernateTemplate templ = this.getHibernateTemplate();
-		
-			List list = getSession().createQuery(LOAD_MAX_UID)
-				.list();
-	
-			logger.debug("list:" + list);
-			
-			int maxUid=0;
-			Long uid=null;
-			if(list != null && list.size() > 0){
-				Iterator listIterator=list.iterator();
-		    	while (listIterator.hasNext())
-		    	{
-		    	    McOptsContent mcOptsContent=(McOptsContent)listIterator.next();
-		    		logger.debug("mcOptsContent:" + mcOptsContent);
-		    		uid=mcOptsContent.getUid();
-		    		logger.debug("uid:" + uid);
-		    		
-		    		if (uid.intValue() > maxUid)
-		    		{
-		    		    logger.debug("assign max to :" + uid);
-		    		    maxUid=uid.intValue();
-		    		}
-		    		
-		    		
-		    	}
-			}
-			logger.debug("final max uid:" + maxUid);
-			return new Long(maxUid);
-	    }
-
 	 	
-	 	
 	 	public List findMcOptionsContentByQueId(Long mcQueContentId)
 	    {
 			HibernateTemplate templ = this.getHibernateTemplate();
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
===================================================================
diff -u -re46194b7711ec6078f5946f1281946c9b177e103 -rcdcf81bed7731048affeec8f53caa5865c8fe045
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java	(.../IMcService.java)	(revision e46194b7711ec6078f5946f1281946c9b177e103)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java	(.../IMcService.java)	(revision cdcf81bed7731048affeec8f53caa5865c8fe045)
@@ -93,8 +93,6 @@
     
     public McOptsContent getMcOptionsContentByUID(Long uid) throws McApplicationException;
     
-    public Long loadMaxUid() throws McApplicationException;
-    
     public void cleanAllQuestionsSimple(final Long mcContentUid) throws McApplicationException;
     
     public void resetAllQuestions(final Long mcContentUid) throws McApplicationException;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
diff -u -re46194b7711ec6078f5946f1281946c9b177e103 -rcdcf81bed7731048affeec8f53caa5865c8fe045
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision e46194b7711ec6078f5946f1281946c9b177e103)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision cdcf81bed7731048affeec8f53caa5865c8fe045)
@@ -692,21 +692,6 @@
     }
     
     
-    public Long loadMaxUid() throws McApplicationException
-    {
-    	try
-        {
-            return mcOptionsContentDAO.loadMaxUid();
-        }
-        catch (DataAccessException e)
-        {
-            throw new McApplicationException("Exception occured when lams is getting max uid"
-                                                 + " in the mc options content: "
-                                                 + e.getMessage(),e);
-        }        
-    }
-    
-    
     public List populateCandidateAnswersDTO(Long mcQueContentId) throws McApplicationException
     {
     	try
Index: lams_tool_lamc/web/images/send.gif
===================================================================
diff -u -rcfc98c3ffea35e539a0622b545474d802c0cda76 -rcdcf81bed7731048affeec8f53caa5865c8fe045
Binary files differ
Index: lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp
===================================================================
diff -u -rcfc98c3ffea35e539a0622b545474d802c0cda76 -rcdcf81bed7731048affeec8f53caa5865c8fe045
--- lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp	(.../SingleQuestionAnswersContent.jsp)	(revision cfc98c3ffea35e539a0622b545474d802c0cda76)
+++ lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp	(.../SingleQuestionAnswersContent.jsp)	(revision cdcf81bed7731048affeec8f53caa5865c8fe045)
@@ -102,10 +102,10 @@
 		</html:submit>
 	</c:if>
 
-
 	<c:if test="${mcGeneralLearnerFlowDTO.totalCountReached == 'true'}">
-		<img src="<c:out value="${tool}"/>images/send.gif"
-			align=left onclick="javascript:if (verifyCandidateSelected()){ submitAllAnswers();}">
+		<html:button property="continueOptionsCombined" onclick="javascript:if (verifyCandidateSelected()){ submitAllAnswers();}" styleClass="button">
+			<fmt:message key="button.submit" />
+		</html:button>
 	</c:if>
 
 	<p>&nbsp;</p>