Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
===================================================================
diff -u -r91a0b9b037fb6c122cc88b7a20f78c826089dbdc -r4cae7b4193c4421a86dac3eb9f4bddc9e0cbf2bb
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	(.../McAppConstants.java)	(revision 91a0b9b037fb6c122cc88b7a20f78c826089dbdc)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	(.../McAppConstants.java)	(revision 4cae7b4193c4421a86dac3eb9f4bddc9e0cbf2bb)
@@ -35,6 +35,12 @@
      * This will be replaced when the deploy logic automatically assigns a default content id in the deploy script.
      */
 	
+	
+	public static final String ROOT 									="root";
+	public static final String ROOT_PATH								="rootPath";
+	public static final String PATH_TO_LAMS 							="pathToLams";
+	
+	
 	public static final String MY_SIGNATURE 							="lamc11";
 	public static final long DEFAULT_CONTENT_ID 						=0;
     public static final long DEFAULT_QUE_CONTENT_ID 					=1;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
diff -u -r91a0b9b037fb6c122cc88b7a20f78c826089dbdc -r4cae7b4193c4421a86dac3eb9f4bddc9e0cbf2bb
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision 91a0b9b037fb6c122cc88b7a20f78c826089dbdc)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision 4cae7b4193c4421a86dac3eb9f4bddc9e0cbf2bb)
@@ -243,6 +243,39 @@
 			request.getSession().setAttribute(SELECTED_QUESTION,selectedQuestion);
 			logger.debug("updated SELECTED_QUESTION");
 		}
+		
+		
+		mcAuthoringForm.setAddQuestion(null);
+		mcAuthoringForm.setRemoveQuestion(null);
+		mcAuthoringForm.setEditOptions(null);
+		
+		
+		String addQuestion=request.getParameter("addQuestion");
+		logger.debug("parameter addQuestion" + addQuestion);
+		if ((addQuestion != null) && addQuestion.equals("1"))
+		{
+			logger.debug("parameter addQuestion is selected " + addQuestion);
+			mcAuthoringForm.setAddQuestion("1");
+		}
+		
+		
+		String editOptions=request.getParameter("editOptions");
+		logger.debug("parameter editOptions" + editOptions);
+		if ((editOptions != null) && editOptions.equals("1"))
+		{
+			logger.debug("parameter editOptions is selected " + editOptions);
+			mcAuthoringForm.setEditOptions("1");
+		}
+		
+		String removeQuestion=request.getParameter("removeQuestion");
+		logger.debug("parameter removeQuestion" + removeQuestion);
+		if ((removeQuestion != null) && removeQuestion.equals("1"))
+		{
+			logger.debug("parameter removeQuestion is selected " + removeQuestion);
+			mcAuthoringForm.setRemoveQuestion("1");
+		}
+		
+		
 
 		String userAction=null;
 	 	if (mcAuthoringForm.getAddQuestion() != null)
@@ -275,6 +308,7 @@
         	if (weightsValid == false)
         	{
         		request.getSession().setAttribute(CURRENT_TAB, new Long(1));
+        		mcAuthoringForm.resetUserAction();
 				return (mapping.findForward(LOAD_QUESTIONS));
         	}
 	 		
@@ -764,6 +798,7 @@
         	if (weightsValid == false)
         	{
     			request.getSession().setAttribute(CURRENT_TAB, new Long(1));
+    			mcAuthoringForm.resetUserAction();
 				return (mapping.findForward(LOAD_QUESTIONS));
         	}
         	
@@ -905,6 +940,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));
+    			mcAuthoringForm.resetUserAction();
     			return (mapping.findForward(LOAD_QUESTIONS));
     		}
     		
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java
===================================================================
diff -u -r91a0b9b037fb6c122cc88b7a20f78c826089dbdc -r4cae7b4193c4421a86dac3eb9f4bddc9e0cbf2bb
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	(.../McStarterAction.java)	(revision 91a0b9b037fb6c122cc88b7a20f78c826089dbdc)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	(.../McStarterAction.java)	(revision 4cae7b4193c4421a86dac3eb9f4bddc9e0cbf2bb)
@@ -107,6 +107,22 @@
 	 */
 	public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
   								throws IOException, ServletException, McApplicationException {
+
+		
+		String protocol = request.getProtocol();
+		if(protocol.startsWith("HTTPS")){
+			protocol = "https://";
+		}else{
+			protocol = "http://";
+		}
+		String root = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/";
+		String pathToLams = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/../..";
+		request.getSession().setAttribute(ROOT, root);
+		request.getSession().setAttribute(ROOT_PATH, root);
+		request.getSession().setAttribute(PATH_TO_LAMS, pathToLams);
+		
+		logger.debug("setting root to: " + request.getSession().getAttribute(ROOT));
+		
 		/**
 		 * retrive the service
 		 */
Index: lams_tool_lamc/web/BasicContent.jsp
===================================================================
diff -u -r4104892571edba09bbe5854515ef4b40d37b9c20 -r4cae7b4193c4421a86dac3eb9f4bddc9e0cbf2bb
--- lams_tool_lamc/web/BasicContent.jsp	(.../BasicContent.jsp)	(revision 4104892571edba09bbe5854515ef4b40d37b9c20)
+++ lams_tool_lamc/web/BasicContent.jsp	(.../BasicContent.jsp)	(revision 4cae7b4193c4421a86dac3eb9f4bddc9e0cbf2bb)
@@ -7,57 +7,57 @@
 
 					<table class="forms" align=left>
  						<tr> 
-					 		<td class="formlabel"> <bean:message key="label.authoring.title"/>: </td>
-							<td class="formcontrol">
+					 		<td class="formlabel" valign=top> <bean:message key="label.authoring.title"/>: </td>
+							<td class="formcontrol" valign=top>
 								<FCK:editor id="richTextTitle" basePath="/lams/fckeditor/">
 									  <c:out value="${sessionScope.richTextTitle}" escapeXml="false" />						  
 								</FCK:editor>
 							</td> 
 					  	</tr>
 					  	
 					  	<tr> 
-					 		<td class="formlabel"> <bean:message key="label.authoring.instructions"/>: </td>
-							<td class="formcontrol">
+					 		<td class="formlabel" valign=top> <bean:message key="label.authoring.instructions"/>: </td>
+							<td class="formcontrol" valign=top>
 								<FCK:editor id="richTextInstructions" basePath="/lams/fckeditor/">
 									  <c:out value="${sessionScope.richTextInstructions}" escapeXml="false" />						  
 								</FCK:editor>
 							</td>
 						</tr>
 				
 					<tr>
-					 	<td colspan=2 align=center>								
+					 	<td colspan=2 align=center valign=top>								
 							&nbsp&nbsp
 					  	</td>
 					</tr>
 				
-					<tr> <td colspan=2 align=center>
+					<tr> <td colspan=2 align=center valign=top>
 					
 					<table align=center>
 					<tr>
-						<td class="formlabel">
+						<td class="formlabel" valign=top>
 						</td>
-						<td class="input" align="center">
+						<td class="input" align="center" valign=top>
 							 <bean:message key="label.Questions"/> 
 						</td>
-						<td class="input" align="center">
+						<td class="input" align="center" valign=top>
 							 <bean:message key="label.weight"/> 
 						</td>
-						<td class="input" colspan=2 align="center">
+						<td class="input" colspan=2 align="center" valign=top>
 							 <bean:message key="label.actions"/> 
 						</td>
 					</tr>
 			  	 		<c:set var="queIndex" scope="session" value="1"/>
 						<c:forEach var="questionEntry" items="${sessionScope.mapQuestionsContent}">
 									<c:if test="${questionEntry.key == 1}"> 			
 									    <tr>
-										  	<td class="formlabel"> <c:out value="Question ${queIndex}"/> : </td>
+										  	<td class="formlabel" valign=top> <c:out value="Question ${queIndex}"/> : </td>
 										  	
-									  		<td class="input"> 
+									  		<td class="input" valign=top> 
 									  			<input type="text" name="questionContent<c:out value="${queIndex}"/>" value="<c:out value="${questionEntry.value}"/>"
 										  		size="50" maxlength="255" >
 										  	</td>
 
-                                            <td class="input" align=center>										  	
+                                            <td class="input" align=center valign=top>										  	
 	                                            &nbsp&nbsp
 												<c:forEach var="weightsEntry" items="${sessionScope.mapWeights}">                                            
 														<c:if test="${questionEntry.key == weightsEntry.key}"> 			
@@ -70,32 +70,27 @@
                                             </td>
 
 											                                                   
-                                            <td class="input">										  	
-			  										<html:submit property="addQuestion" styleClass="linkbutton" 
-													onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-														<bean:message key="button.addNewQuestion"/>
-													</html:submit>
+                                            <td class="input" valign=top>								
+                   								    <img src="images/add.gif" align=left onclick="javascript:document.forms[0].addQuestion.value=1; document.forms[0].submit();">		  	
 											</td>	
+											
 											&nbsp&nbsp&nbsp
-                                            <td class="input">										  	
-					 								<html:submit property="editOptions" styleClass="linkbutton"  onclick="javascript:document.forms[0].questionIndex.value=${queIndex};"
-					 								onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-														<bean:message key="label.edit"/>
-													</html:submit>
+                                            <td class="input" valign=top>								
+												  <img src="images/edit.gif" align=left onclick="javascript:document.forms[0].questionIndex.value=<c:out value="${queIndex}"/>; document.forms[0].editOptions.value=1; document.forms[0].submit();">		  	
 											</td>
 										  </tr>
 									</c:if> 			
 									
 							  		<c:if test="${questionEntry.key > 1}"> 			
 										<c:set var="queIndex" scope="session" value="${queIndex +1}"/>
 										  <tr>
-										  	<td class="formlabel"> <c:out value="Question ${queIndex}"/> : </td>
+										  	<td class="formlabel" valign=top> <c:out value="Question ${queIndex}"/> : </td>
 										  	
-										  		<td class="input"> 
+										  		<td class="input" valign=top> 
 										  			<input type="text" name="questionContent<c:out value="${queIndex}"/>" value="<c:out value="${questionEntry.value}"/>"  size="50" maxlength="255" > 
 												</td>											
 
-	                                            <td class="input" align=center>										  	
+	                                            <td class="input" align=center valign=top>										  	
 		                                            &nbsp&nbsp
 													<c:forEach var="weightsEntry" items="${sessionScope.mapWeights}">                                            
 															<c:if test="${questionEntry.key == weightsEntry.key}"> 			
@@ -107,23 +102,20 @@
 	 											 &nbsp&nbsp&nbsp&nbsp
 	                                            </td>
 											
-                                               <td class="input">										  	
-				 								<html:submit property="removeQuestion" styleClass="linkbutton"  onclick="javascript:document.forms[0].questionIndex.value=${queIndex};"
-					 								onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-														<bean:message key="button.removeQuestion"/>
-													</html:submit>
+                                               <td class="input" valign=top>								
+													<img src="images/delete.gif" align=left onclick="javascript:document.forms[0].questionIndex.value=<c:out value="${queIndex}"/>; document.forms[0].removeQuestion.value=1; document.forms[0].submit();">                                               		  	
 												</td>
 												&nbsp&nbsp&nbsp
-	                                            <td class="input">										  	
-					 								<html:submit property="editOptions" styleClass="linkbutton"  onclick="javascript:document.forms[0].questionIndex.value=${queIndex};"
-					 								onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-														<bean:message key="label.edit"/>
-													</html:submit>
+	                                            <td class="input" valign=top>							
+												    <img src="images/edit.gif" align=left onclick="javascript:document.forms[0].questionIndex.value=<c:out value="${queIndex}"/>; document.forms[0].editOptions.value=1; document.forms[0].submit();">	                                            			  	
 											  	</td>
 										  </tr>
 									</c:if> 
 						</c:forEach>
 							<html:hidden property="questionIndex"/>
+							<html:hidden property="addQuestion"/>
+							<html:hidden property="editOptions"/>
+							<html:hidden property="removeQuestion"/>
 
 					<tr>
 	 				 	<td colspan=5 align=center>
@@ -132,27 +124,27 @@
 					</tr>		
 					
 					<tr>
-					  	<td class="formlabel"><bean:message key="radiobox.passmark"/>: </td>
-						<td class="input"> 
+					  	<td class="formlabel" valign=top><bean:message key="radiobox.passmark"/>: </td>
+						<td class="input" valign=top> 
 							  <html:text property="passmark"  size="3" maxlength="3"/>							
 						</td>
-						<td> &nbsp</td> <td>&nbsp </td>
+						<td valign=top> &nbsp</td> <td valign=top>&nbsp </td>
 					</tr>
 					
 					<tr>
-	 				 	<td colspan=5 align=center>
+	 				 	<td colspan=5 align=center valign=top>
 							&nbsp&nbsp
 					  	</td>
 					</tr>
 						
 					<tr>
-	 				 	<td colspan=5 align=center>								
+	 				 	<td colspan=5 align=center valign=top>								
 							&nbsp&nbsp
 					  	</td>
 					</tr>
 
 	 				 <tr>
-	 				 	<td colspan=5 align=left>								
+	 				 	<td colspan=5 align=left valign=top>								
 							<html:submit property="submitQuestions" styleClass="linkbutton" 
 							onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
 								<bean:message key="button.submit"/>
Index: lams_tool_lamc/web/WEB-INF/images/icon_noticeboard.swf
===================================================================
diff -u -rb9d979e7f1478db56c700664c515c4036557f29f -r4cae7b4193c4421a86dac3eb9f4bddc9e0cbf2bb
Binary files differ
Index: lams_tool_lamc/web/images/Thumbs.db
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/images/add.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/images/bar1.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/images/bar2.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/images/bar3.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/images/bar4.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/images/bar5.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/images/columnchart.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/images/customer_logo.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/images/delete.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/images/down.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/images/edit.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/images/error.jpg
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/images/icon_survey.swf
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/images/lams_welcome_header.jpg
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/images/launch_page_graphic.jpg
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/images/ld_logo.jpg
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/images/learner_footer.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/images/learner_header_logo.jpg
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/images/learner_header_right.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/images/piechart.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/images/questiontype_checkbox.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/images/questiontype_radio.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/images/questiontype_textarea.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/images/spacer.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/images/success.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/images/tick_red.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/images/up.gif
===================================================================
diff -u
Binary files differ