Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java
===================================================================
diff -u -ra314b1f3fb3820613f8bad30e7b2fee0fe4d34b9 -r7bc72a4d321888b2d580845d6767beca96516e5d
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	(.../McStarterAction.java)	(revision a314b1f3fb3820613f8bad30e7b2fee0fe4d34b9)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	(.../McStarterAction.java)	(revision 7bc72a4d321888b2d580845d6767beca96516e5d)
@@ -368,6 +368,17 @@
 		logger.debug("will return to jsp with: " + sourceMcStarter);
 		String destination=McUtils.getDestination(sourceMcStarter);
 		logger.debug("destination: " + destination);
+		
+		logger.debug("activeModule: " + request.getSession().getAttribute("activeModule"));
+		logger.debug("defineLaterInEditMode: " + request.getSession().getAttribute("defineLaterInEditMode"));
+		logger.debug("editOptionsMode: " + request.getSession().getAttribute("editOptionsMode"));
+		logger.debug("richTextTitle: " + request.getSession().getAttribute("richTextTitle"));
+		logger.debug("richTextInstructions: " + request.getSession().getAttribute("richTextInstructions"));
+		logger.debug("mapQuestionsContent: " + request.getSession().getAttribute("mapQuestionsContent"));
+		logger.debug("mapWeights: " + request.getSession().getAttribute("mapWeights"));
+		logger.debug("queIndex: " + request.getSession().getAttribute("queIndex"));
+		logger.debug("maxQuestionIndex: " + request.getSession().getAttribute("maxQuestionIndex"));
+		
 		return (mapping.findForward(destination));
 	} 
 
@@ -593,6 +604,11 @@
     	request.getSession().setAttribute(MAP_QUESTIONS_CONTENT, mapQuestionsContent);
     	logger.debug("starter initialized the existing Questions Map: " + request.getSession().getAttribute(MAP_QUESTIONS_CONTENT));
     	
+		int maxQuestionIndex=mapQuestionsContent.size();
+		request.getSession().setAttribute(MAX_QUESTION_INDEX, new Integer(maxQuestionIndex));
+		logger.debug("MAX_QUESTION_INDEX: " +  request.getSession().getAttribute(MAX_QUESTION_INDEX));
+    	
+    	
 	    AuthoringUtil.refreshMaps(request, toolContentId, mcService);
 	    AuthoringUtil.assignStaterMapsToCurrentMaps(request);
 	    
Index: lams_tool_lamc/web/authoring/AuthoringMaincontent.jsp
===================================================================
diff -u -r33a828c4cef478536cf95e7c69422e6708c4a265 -r7bc72a4d321888b2d580845d6767beca96516e5d
--- lams_tool_lamc/web/authoring/AuthoringMaincontent.jsp	(.../AuthoringMaincontent.jsp)	(revision 33a828c4cef478536cf95e7c69422e6708c4a265)
+++ lams_tool_lamc/web/authoring/AuthoringMaincontent.jsp	(.../AuthoringMaincontent.jsp)	(revision 7bc72a4d321888b2d580845d6767beca96516e5d)
@@ -47,7 +47,7 @@
 
 		<%@ include file="/common/header.jsp"%>
 		<%@ include file="/common/fckeditorheader.jsp"%>
-		
+
 		<c:if test="${sessionScope.activeModule != 'defineLater'}"> 			
 			<script language="JavaScript" type="text/JavaScript">
 		        function init(){
@@ -72,8 +72,7 @@
 		</c:if> 
 
 		<c:if test="${ (sessionScope.activeModule == 'defineLater') &&  
-			   (sessionScope.defineLaterInEditMode == 'true') &&  
-			   (sessionScope.editOptionsMode != 1)   			
+			   (sessionScope.defineLaterInEditMode == 'false') 
 			  }"> 			
 			<script language="JavaScript" type="text/JavaScript">
 		        function init(){
@@ -85,16 +84,16 @@
 			    		selectTab(tag.value);
 		            else
 		                selectTab(1); //select the default tab;
-		            
+		        
 		            initEditor("richTextTitle");
 		            initEditor("richTextInstructions");
 			   }     
 			</script>
 		</c:if> 
 
 		<c:if test="${ (sessionScope.activeModule == 'defineLater') &&  
-			   (sessionScope.defineLaterInEditMode == 'true') &&  
-			   (sessionScope.editOptionsMode == 1)   			   
+			   (sessionScope.defineLaterInEditMode == 'true') &&
+   			   (sessionScope.editOptionsMode != 1)   			
 			  }"> 			
 			<script language="JavaScript" type="text/JavaScript">
 			  function init(){
@@ -106,7 +105,26 @@
 			    		selectTab(tag.value);
 		            else
 		                selectTab(1); //select the default tab;
+		                
+			   }     
+			</script>
+		</c:if> 			
+			
+		<c:if test="${ (sessionScope.activeModule == 'defineLater') &&  
+			   (sessionScope.defineLaterInEditMode == 'true') &&
+   			   (sessionScope.editOptionsMode == 1)   			
+			  }"> 			
+			<script language="JavaScript" type="text/JavaScript">
+			  function init(){
+		        
+		            initTabSize(1);
 		            
+		            var tag = document.getElementById("currentTab");
+			    	if(tag.value != "")
+			    		selectTab(tag.value);
+		            else
+		                selectTab(1); //select the default tab;
+		                
 		            initEditor("richTextIncorrectFeedback");                                                
 		            initEditor("richTextCorrectFeedback");                                                            
 			   }     
Index: lams_tool_lamc/web/authoring/BasicContent.jsp
===================================================================
diff -u -ra314b1f3fb3820613f8bad30e7b2fee0fe4d34b9 -r7bc72a4d321888b2d580845d6767beca96516e5d
--- lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision a314b1f3fb3820613f8bad30e7b2fee0fe4d34b9)
+++ lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 7bc72a4d321888b2d580845d6767beca96516e5d)
@@ -46,8 +46,6 @@
 					</td> </tr>
 				</table>
 				
-				
-
 				<table class="forms">
 					
 				<c:if test="${ (sessionScope.activeModule == 'authoring') ||