Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
diff -u -r61b5e4280bd941e994fbb7f9f5d3ad39b5ff570c -r013916c3b654081a3b835d3561e2aa316498c346
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision 61b5e4280bd941e994fbb7f9f5d3ad39b5ff570c)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision 013916c3b654081a3b835d3561e2aa316498c346)
@@ -243,8 +243,8 @@
 			request.getSession().setAttribute(SELECTED_QUESTION,selectedQuestion);
 			logger.debug("updated SELECTED_QUESTION");
 		}
-	 	
-	 	String userAction=null;
+
+		String userAction=null;
 	 	if (mcAuthoringForm.getAddQuestion() != null)
 	 	{
 	 		userAction="addQuestion";
@@ -274,6 +274,7 @@
         	logger.debug("weightsValid:" + weightsValid);
         	if (weightsValid == false)
         	{
+        		request.getSession().setAttribute(CURRENT_TAB, new Long(1));
 				return (mapping.findForward(LOAD_QUESTIONS));
         	}
 	 		
@@ -288,6 +289,7 @@
 		 	request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
 			logger.debug("resetting  EDIT_OPTIONS_MODE to 0");
     	    mcAuthoringForm.resetUserAction();
+    	    request.getSession().setAttribute(CURRENT_TAB, new Long(1));
     	    return (mapping.findForward(LOAD_QUESTIONS));
 	 	}
 	 	else if (mcAuthoringForm.getRemoveQuestion() != null)
@@ -343,6 +345,7 @@
 		 	request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
 			logger.debug("resetting  EDIT_OPTIONS_MODE to 0");
 			mcAuthoringForm.resetUserAction();
+			request.getSession().setAttribute(CURRENT_TAB, new Long(1));
 			return (mapping.findForward(LOAD_QUESTIONS));
 	 	}
 	 	else if (mcAuthoringForm.getEditOptions() != null)
@@ -383,6 +386,7 @@
     			
     			request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
     			logger.debug("setting  EDIT_OPTIONS_MODE to 0");
+    			request.getSession().setAttribute(CURRENT_TAB, new Long(1));
     			return (mapping.findForward(LOAD_QUESTIONS));
 			}
 			
@@ -506,6 +510,7 @@
 		 	request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(1));
 			logger.debug("resetting  EDIT_OPTIONS_MODE to 1");
 			mcAuthoringForm.resetUserAction();
+			request.getSession().setAttribute(CURRENT_TAB, new Long(1));
 			return (mapping.findForward(LOAD_QUESTIONS));
 	 	}
 	 	else if (mcAuthoringForm.getAddOption() != null)
@@ -534,6 +539,7 @@
     			
     			request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(1));
     			logger.debug("setting  EDIT_OPTIONS_MODE to 1");
+    			request.getSession().setAttribute(CURRENT_TAB, new Long(1));
     			return (mapping.findForward(LOAD_QUESTIONS));	
 	 		}
 		 	
@@ -578,6 +584,7 @@
 	 		request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(1));
 			logger.debug("resetting  EDIT_OPTIONS_MODE to 1");
 	 		mcAuthoringForm.resetUserAction();
+			request.getSession().setAttribute(CURRENT_TAB, new Long(1));
 			return (mapping.findForward(LOAD_QUESTIONS));
 	 	}
 	 	else if (mcAuthoringForm.getRemoveOption() != null)
@@ -632,6 +639,7 @@
 	 	 	request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(1));
 			logger.debug("resetting  EDIT_OPTIONS_MODE to 1");
 			mcAuthoringForm.resetUserAction();			
+			request.getSession().setAttribute(CURRENT_TAB, new Long(1));
 			return (mapping.findForward(LOAD_QUESTIONS));
 	 	}
 	 	else if (mcAuthoringForm.getDoneOptions() != null)
@@ -657,6 +665,7 @@
     			
     			request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(1));
     			logger.debug("setting  EDIT_OPTIONS_MODE to 1");
+    			request.getSession().setAttribute(CURRENT_TAB, new Long(1));
     			return (mapping.findForward(LOAD_QUESTIONS));	
 	 		}
 	 			 		
@@ -735,6 +744,7 @@
 	    	request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
 			logger.debug("setting  EDIT_OPTIONS_MODE to 0");
 			mcAuthoringForm.resetUserAction();
+			request.getSession().setAttribute(CURRENT_TAB, new Long(1));
 			return (mapping.findForward(LOAD_QUESTIONS));
 	 	}
 	 	else if (mcAuthoringForm.getSubmitQuestions() != null)
@@ -753,6 +763,7 @@
         	logger.debug("weightsValid:" + weightsValid);
         	if (weightsValid == false)
         	{
+    			request.getSession().setAttribute(CURRENT_TAB, new Long(1));
 				return (mapping.findForward(LOAD_QUESTIONS));
         	}
         	
@@ -768,6 +779,7 @@
 				
 				request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
     			logger.debug("setting  EDIT_OPTIONS_MODE to 0");
+    			request.getSession().setAttribute(CURRENT_TAB, new Long(1));
 				return (mapping.findForward(LOAD_QUESTIONS));
         	}
         	
@@ -822,6 +834,7 @@
 					
 					request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
 	    			logger.debug("setting  EDIT_OPTIONS_MODE to 0");
+	    			request.getSession().setAttribute(CURRENT_TAB, new Long(1));
 					return (mapping.findForward(LOAD_QUESTIONS));
 				}
         	}
@@ -843,6 +856,7 @@
     			
     			request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
     			logger.debug("setting  EDIT_OPTIONS_MODE to 0");
+    			request.getSession().setAttribute(CURRENT_TAB, new Long(1));
     			return (mapping.findForward(LOAD_QUESTIONS));
         	}
         	
@@ -890,6 +904,7 @@
     			logger.debug("either title or instructions or both is missing. Returning back to from to fix errors:");
 				request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
     			logger.debug("setting  EDIT_OPTIONS_MODE to 0");
+    			request.getSession().setAttribute(CURRENT_TAB, new Long(1));
     			return (mapping.findForward(LOAD_QUESTIONS));
     		}
     		
@@ -1007,6 +1022,7 @@
 			logger.debug("setting  EDIT_OPTIONS_MODE to 0");
 
 			mcAuthoringForm.resetUserAction();
+			request.getSession().setAttribute(CURRENT_TAB, new Long(1));
 	   	    return (mapping.findForward(LOAD_QUESTIONS));
 	 	}
 	 	else if (mcAuthoringForm.getAdvancedTabDone() != null)
@@ -1016,6 +1032,7 @@
 	 		logger.debug("userAction:" + userAction);
 	 		
 	 		mcAuthoringForm.resetUserAction();
+			request.getSession().setAttribute(CURRENT_TAB, new Long(1));
 	   	    return (mapping.findForward(LOAD_QUESTIONS));
 	 	}
 	 	else if (mcAuthoringForm.getInstructionsTabDone() != null)
@@ -1024,6 +1041,7 @@
 	 		request.setAttribute(USER_ACTION, userAction);
 	 		logger.debug("userAction:" + userAction);
 	 		mcAuthoringForm.resetUserAction();
+			request.getSession().setAttribute(CURRENT_TAB, new Long(1));
 	   	    return (mapping.findForward(LOAD_QUESTIONS));
 	 	} 
 	 	else if (mcAuthoringForm.getSubmitOfflineFile() != null)
@@ -1038,6 +1056,7 @@
 	 		mcAuthoringForm.resetUserAction();
 	 		request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(2));
 	 		logger.debug("setting EDIT_OPTIONS_MODE :" + 2 );
+			request.getSession().setAttribute(CURRENT_TAB, new Long(3));
 	   	    return (mapping.findForward(LOAD_QUESTIONS));
         }
 	 	else if (mcAuthoringForm.getSubmitOnlineFile() != null)
@@ -1261,9 +1280,6 @@
         	 	McQueContent mcQueContent=mcService.getQuestionContentByQuestionText(pairs.getValue().toString(), mcContent.getUid());
         	 	
         	 	logger.debug("mcQueContent: " +  mcQueContent);
-        	 	//FIX THIS!!!!!
-        	 	int weight=0;
-        	 	
         	 	Integer currentWeight= new Integer(mapWeights.get(pairs.getKey()).toString());
             	logger.debug("currentWeight:" + currentWeight);
         	 	
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java
===================================================================
diff -u -r61b5e4280bd941e994fbb7f9f5d3ad39b5ff570c -r013916c3b654081a3b835d3561e2aa316498c346
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	(.../McStarterAction.java)	(revision 61b5e4280bd941e994fbb7f9f5d3ad39b5ff570c)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	(.../McStarterAction.java)	(revision 013916c3b654081a3b835d3561e2aa316498c346)
@@ -124,6 +124,7 @@
 		 *   CURRENT_TAB == 3 defines Instructions Tab
 		 * */ 
 		request.getSession().setAttribute(CURRENT_TAB, new Long(1));
+		request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
 		
 		/**  needs to run only once per tool*/ 
 		/** McUtils.configureContentRepository(request, mcService); */
Index: lams_tool_lamc/web/authoringMaincontent.jsp
===================================================================
diff -u -r61b5e4280bd941e994fbb7f9f5d3ad39b5ff570c -r013916c3b654081a3b835d3561e2aa316498c346
--- lams_tool_lamc/web/authoringMaincontent.jsp	(.../authoringMaincontent.jsp)	(revision 61b5e4280bd941e994fbb7f9f5d3ad39b5ff570c)
+++ lams_tool_lamc/web/authoringMaincontent.jsp	(.../authoringMaincontent.jsp)	(revision 013916c3b654081a3b835d3561e2aa316498c346)
@@ -85,6 +85,11 @@
 
 <!-- end tab buttons -->
 
+current tab <c:out value="${sessionScope.currentTab}"/>
+
+edit mode <c:out value="${sessionScope.editOptionsMode}"/>
+
+
 <html:form  action="/authoring?method=loadQ&validate=false" enctype="multipart/form-data" method="POST" target="_self">
  <!-- tab content one (basic)-->
 <div id='content_b' class="tabbody content_b" >
@@ -99,17 +104,17 @@
 
 	<h2><bean:message key="label.authoring.mc.basic"/></h2>
 	
-	<div id="formtablecontainer1">
-			<c:if test="${sessionScope.editOptionsMode == 0}"> 			
-				<jsp:include page="BasicContent.jsp" />
-			</c:if> 				
-			<c:if test="${sessionScope.editOptionsMode == 1}"> 			
-				<jsp:include page="OptionsContent.jsp" />
-			</c:if> 				
-			<c:if test="${sessionScope.editOptionsMode == 2}"> 			
-				<jsp:include page="InstructionsContent.jsp" />
-			</c:if> 				
-	</div>
+	<c:if test="${sessionScope.currentTab == 1}"> 
+		<div id="formtablecontainer1">
+				<c:if test="${sessionScope.editOptionsMode == 0}"> 			
+					<jsp:include page="BasicContent.jsp" />
+				</c:if> 				
+				<c:if test="${sessionScope.editOptionsMode == 1}"> 			
+					<jsp:include page="OptionsContent.jsp" />
+				</c:if> 				
+		</div>
+	</c:if> 				
+	
 	<hr>
 	<a href="javascript:;" class="button">Cancel</a>
 	
@@ -125,15 +130,24 @@
 	</div>
 
 
+
 	<div id='content_i'  class="tabbody content_i">
-		<h2>Instructions</h2>
-		<div id="formtablecontainer3">
-				<jsp:include page="InstructionsContent.jsp" />
-		</div>
-		<hr>
+			<h2>Instructions</h2>
+			<div id="formtablecontainer3">
+					<jsp:include page="InstructionsContent.jsp" />
+			</div>
+			<hr>
 	</div>
+	
+	<c:if test="${sessionScope.currentTab == 3}"> 
+		<div id="formtablecontainer4">
+					<h2>Instructions</h2>
+					<jsp:include page="InstructionsContent.jsp" />
+		</div>
+	</c:if> 	
+	
+	
 
-
 </html:form>
 <p></p>