Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
===================================================================
diff -u -r4447ae1bb802ba8a16df65d880f25575d1174003 -r27a3ba4f41698f83ce6320d5b855329b1addd5eb
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	(.../QaAppConstants.java)	(revision 4447ae1bb802ba8a16df65d880f25575d1174003)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	(.../QaAppConstants.java)	(revision 27a3ba4f41698f83ce6320d5b855329b1addd5eb)
@@ -101,6 +101,8 @@
     public static final String USER_ID									="userId";
     public static final String RICHTEXT_OFFLINEINSTRUCTIONS				="richTextOfflineInstructions";
     public static final String RICHTEXT_ONLINEINSTRUCTIONS				="richTextOnlineInstructions";
+    public static final String RICHTEXT_TITLE							="richTextTitle";
+    public static final String RICHTEXT_INSTRUCTIONS					="richTextInstructions";
     
     
     /**
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java
===================================================================
diff -u -r65dbef6ba8b7c63e1b36662a6ddfb2f352c0dce6 -r27a3ba4f41698f83ce6320d5b855329b1addd5eb
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java	(.../QaUtils.java)	(revision 65dbef6ba8b7c63e1b36662a6ddfb2f352c0dce6)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java	(.../QaUtils.java)	(revision 27a3ba4f41698f83ce6320d5b855329b1addd5eb)
@@ -355,30 +355,35 @@
 	
 	public static void persistRichText(HttpServletRequest request)
 	{
-		String richTextOfflineInstructions="";
-    	String richTextOnlineInstructions="";
-    	richTextOfflineInstructions = (String)request.getSession().getAttribute(RICHTEXT_OFFLINEINSTRUCTIONS);
-    	logger.debug("richTextOfflineInstructions from session: " + richTextOfflineInstructions);
-    	
-    	richTextOnlineInstructions = (String)request.getSession().getAttribute(RICHTEXT_ONLINEINSTRUCTIONS);
-    	logger.debug("richTextOnlineInstructions from session: " + richTextOnlineInstructions);
-    	
-    	if ((richTextOfflineInstructions == null) || (richTextOfflineInstructions.equals("")))
-    	{
-    		richTextOfflineInstructions=request.getParameter(RICHTEXT_OFFLINEINSTRUCTIONS);
-    		logger.debug("read aparameter richTextOfflineInstructions: " + richTextOfflineInstructions);
-    	}
+		String richTextOfflineInstructions=request.getParameter(RICHTEXT_OFFLINEINSTRUCTIONS);
+		logger.debug("read parameter richTextOfflineInstructions: " + richTextOfflineInstructions);
+		String richTextOnlineInstructions=request.getParameter(RICHTEXT_ONLINEINSTRUCTIONS);
+		logger.debug("read parameter richTextOnlineInstructions: " + richTextOnlineInstructions);
 		
-    	if ((richTextOnlineInstructions == null) || (richTextOnlineInstructions.equals("")))
-    	{
-    		richTextOnlineInstructions=request.getParameter(RICHTEXT_ONLINEINSTRUCTIONS);
-    		logger.debug("read aparameter richTextOnlineInstructions: " + richTextOnlineInstructions);
-    	}
-	    
-	    logger.debug("final richTextOfflineInstructions: " + richTextOfflineInstructions);
-	    logger.debug("final richTextOnlineInstructions: " + richTextOnlineInstructions);
-	    request.getSession().setAttribute(RICHTEXT_OFFLINEINSTRUCTIONS,richTextOfflineInstructions);
-	    request.getSession().setAttribute(RICHTEXT_ONLINEINSTRUCTIONS,richTextOnlineInstructions);
+		if ((richTextOfflineInstructions != null) && (richTextOfflineInstructions.length() > 0))
+		{
+			request.getSession().setAttribute(RICHTEXT_OFFLINEINSTRUCTIONS,richTextOfflineInstructions);	
+		}
+		
+		if ((richTextOnlineInstructions != null) && (richTextOnlineInstructions.length() > 0))
+		{
+			request.getSession().setAttribute(RICHTEXT_ONLINEINSTRUCTIONS,richTextOnlineInstructions);	
+		}
+		
+		String richTextTitle=request.getParameter(RICHTEXT_TITLE);
+		logger.debug("read parameter richTextTitle: " + richTextTitle);
+		String richTextInstructions=request.getParameter(RICHTEXT_INSTRUCTIONS);
+		logger.debug("read parameter richTextInstructions: " + richTextInstructions);
+		
+		if ((richTextTitle != null) && (richTextTitle.length() > 0))
+		{
+			request.getSession().setAttribute(RICHTEXT_TITLE,richTextTitle);
+		}
+		
+		if ((richTextInstructions != null) && (richTextInstructions.length() > 0))
+		{
+			request.getSession().setAttribute(RICHTEXT_INSTRUCTIONS,richTextInstructions);
+		}
 	}
-	   	
+
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java
===================================================================
diff -u -rd231fdf18f3da49f3ca42f543c784f4d09a59332 -r27a3ba4f41698f83ce6320d5b855329b1addd5eb
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision d231fdf18f3da49f3ca42f543c784f4d09a59332)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision 27a3ba4f41698f83ce6320d5b855329b1addd5eb)
@@ -14,19 +14,18 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.lamsfoundation.lams.usermanagement.User;
 
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionMapping;
-import org.lamsfoundation.lams.tool.exception.DataMissingException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.qa.QaAppConstants;
 import org.lamsfoundation.lams.tool.qa.QaComparator;
 import org.lamsfoundation.lams.tool.qa.QaContent;
 import org.lamsfoundation.lams.tool.qa.QaQueContent;
 import org.lamsfoundation.lams.tool.qa.QaUtils;
 import org.lamsfoundation.lams.tool.qa.service.IQaService;
+import org.lamsfoundation.lams.usermanagement.User;
 
 /**
  * 
@@ -325,7 +324,7 @@
 		    /**
 		     * read and persist rich text parameters
 		     */
-		    QaUtils.persistRichText(request);
+		    //QaUtils.persistRichText(request);
 		 
 		    endLearningMessage=qaAuthoringForm.getEndLearningMessage();
 		}
@@ -334,6 +333,7 @@
 			creationDate=new Date(System.currentTimeMillis()).toString();
 		
 		
+		/** read rich text vallues */
 		String richTextOfflineInstructions="";
     	richTextOfflineInstructions = (String)request.getSession().getAttribute(RICHTEXT_OFFLINEINSTRUCTIONS);
     	logger.debug("createContent:  richTextOfflineInstructions from session: " + richTextOfflineInstructions);
@@ -343,7 +343,17 @@
     	richTextOnlineInstructions = (String)request.getSession().getAttribute(RICHTEXT_ONLINEINSTRUCTIONS);
     	logger.debug("createContent richTextOnlineInstructions from session: " + richTextOnlineInstructions);
     	if (richTextOnlineInstructions == null) richTextOnlineInstructions="";
-		
+    	
+    	String richTextTitle="";
+    	richTextTitle = (String)request.getSession().getAttribute(RICHTEXT_TITLE);
+    	logger.debug("createContent richTextTitle from session: " + richTextTitle);
+    	if (richTextTitle == null) richTextTitle="";
+    	
+    	String richTextInstructions="";
+    	richTextInstructions = (String)request.getSession().getAttribute(RICHTEXT_INSTRUCTIONS);
+    	logger.debug("createContent richTextInstructions from session: " + richTextInstructions);
+    	if (richTextInstructions == null) richTextInstructions="";
+    	
 			
     	/**obtain user object from the session*/
     	User toolUser=(User)request.getSession().getAttribute(TOOL_USER);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java
===================================================================
diff -u -rd231fdf18f3da49f3ca42f543c784f4d09a59332 -r27a3ba4f41698f83ce6320d5b855329b1addd5eb
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java	(.../QAction.java)	(revision d231fdf18f3da49f3ca42f543c784f4d09a59332)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java	(.../QAction.java)	(revision 27a3ba4f41698f83ce6320d5b855329b1addd5eb)
@@ -36,8 +36,6 @@
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.actions.DispatchAction;
-import org.lamsfoundation.lams.tool.exception.DataMissingException;
-import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.qa.QaAppConstants;
 import org.lamsfoundation.lams.tool.qa.QaContent;
 import org.lamsfoundation.lams.tool.qa.QaSession;
@@ -228,12 +226,6 @@
     	QaAuthoringForm qaAuthoringForm = (QaAuthoringForm) form;
     	
     	/**
-	     * read and persist rich text parameters
-	     */
-	    QaUtils.persistRichText(request);
-	    logger.debug("QAction: rich text set to session scope");
-	    
-    	/**
     	 * the status of define later is determined from the property inspector and 
     	 * by now, we know whether it is on or off
     	 * 
@@ -306,8 +298,7 @@
         {
         	logger.debug("user is done with this tab.");
         	QaUtils.persistRichText(request);
-    	    logger.debug("SUBMIT_TAB_DONE: rich text set to session scope");
-        	qaAuthoringForm.resetUserAction();
+    	    qaAuthoringForm.resetUserAction();
         	return (mapping.findForward(LOAD_QUESTIONS));
         }/**submit questions contained in the Map*/
         else if (userAction.equalsIgnoreCase(SUBMIT_ALL_CONTENT))
@@ -396,6 +387,7 @@
         else
         {
         	logger.debug("Warning!: Uncatered-for user action: " + userAction);
+        	QaUtils.persistRichText(request);
         }
 
         /**reset all user actions*/
Index: lams_tool_laqa/web/AdvancedContent.jsp
===================================================================
diff -u -r16e844de3f7c34b44baee1b28e67e708f42d00bf -r27a3ba4f41698f83ce6320d5b855329b1addd5eb
--- lams_tool_laqa/web/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 16e844de3f7c34b44baee1b28e67e708f42d00bf)
+++ lams_tool_laqa/web/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 27a3ba4f41698f83ce6320d5b855329b1addd5eb)
@@ -4,6 +4,7 @@
 <%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
 <%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %>
 
+<div id="advancedTabContainer">
 		<tr> <td>
 			<table>
 				<tr>
@@ -49,7 +50,7 @@
 						 <bean:message key="option.off"/>
 						</html:radio>
 	      			</td>
-		         </tr>
+		        </tr>
 		         
 		         <tr> 
 			 		<td> <fmt:message key="label.report.title"/>: </td>
@@ -83,8 +84,9 @@
 					</td> 
 				</tr>
   			</table>
-		</td>
-		</tr>
+		
+		</td></tr>
+</div>
 
 
 		
Index: lams_tool_laqa/web/BasicContent.jsp
===================================================================
diff -u -r16e844de3f7c34b44baee1b28e67e708f42d00bf -r27a3ba4f41698f83ce6320d5b855329b1addd5eb
--- lams_tool_laqa/web/BasicContent.jsp	(.../BasicContent.jsp)	(revision 16e844de3f7c34b44baee1b28e67e708f42d00bf)
+++ lams_tool_laqa/web/BasicContent.jsp	(.../BasicContent.jsp)	(revision 27a3ba4f41698f83ce6320d5b855329b1addd5eb)
@@ -3,152 +3,155 @@
 <%@ taglib uri="/WEB-INF/struts-logic-el.tld" prefix="logic-el" %>
 <%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
 <%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %>
+<%@ taglib uri="fck-editor" prefix="FCK" %>
 
-	<c:set var="formIndex" scope="session" value="${requestScope.formIndex}"/>
-
-	<c:if test="${(requestScope.startMonitoringSummaryRequest != 'true')  || (sessionScope.editActivityEditMode=='true') }"> 			
-	<c:if test="${requestScope.stopRenderingQuestions != 'true'}"> 			
-		<tr> <td>
-			<table>
-				<tr> 
-			 		<td> <bean:message key="label.authoring.title"/>: </td>
-			 		<td> 
-			 			<html:text property="title" size="60" maxlength="100" value="${sessionScope.title}" />
-			 		</td>
-			  	</tr>
-			  	<tr> 
-			 		<td> <bean:message key="label.authoring.instructions"/>: </td>
-			 		<td> 
-			 			<html:text property="instructions" size="60" maxlength="255" value="${sessionScope.instructions}" />
-			 		</td>
-			  	</tr>
-		
-	 		<!--default question content, this entry can not be deleted but can be updated -->
-
-			 		<tr> 
-					  	<td> 
-					  		<bean:message key="label.question1"/> : </td>
-					  		<td>
-							  	<input type="text" name="questionContent0" size="50" 
-							  	maxlength="255" value="<c:out value="${sessionScope.defaultQuestionContent}"/>"> 
-							  	&nbsp
-								<html:submit property="addContent" styleClass="linkbutton" disabled="${sessionScope.isDefineLater}"
-								onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-								<bean:message key="button.addNewQuestion"/>
-								</html:submit>
-					  		</td>
-				  	</tr>
-
-		  	<!--end of default question content -->
-		  	
-	  		<!-- if there is more than just the default content start presenting them -->
-	  	 		<c:set var="queIndex" scope="session" value="1"/>
-				<c:forEach var="questionEntry" items="${sessionScope.mapQuestionContent}">
-			  		<c:if test="${questionEntry.key > 1}"> 			
-						<c:set var="queIndex" scope="session" value="${queIndex +1}"/>
-						  <tr>
-						  	<td> <c:out value="Question ${queIndex}"/> : </td>
-						  		<td> <input type="text" name="questionContent<c:out value="${queIndex-1}"/>" value="<c:out value="${questionEntry.value}"/>"   
-							  		size="50" maxlength="255"> 
-							  	&nbsp
- 								<html:submit property="removeContent" styleClass="linkbutton"  onclick="removeQuestion(${formIndex}, ${queIndex});"
- 								disabled="${sessionScope.isDefineLater}" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-									<bean:message key="button.removeQuestion"/>
-								</html:submit>
-							  	</td>
-						  </tr>
-					</c:if> 			
-				</c:forEach>
-				<html:hidden property="toolContentId" value="${sessionScope.toolContentId}"/>
-				<html:hidden property="questionIndex"/>
-				<html:hidden property="isRemoveContent"/>
-			</tr>
-			</table>
-
-			<hr>
-			<table>
-					<tr>
-							 <td> 
-								 <html:submit property="submitAllContent" styleClass="linkbutton" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-									<bean:message key="button.submitAllContent"/>
-								</html:submit>
+<div id="basicTabContainer">	
+		<c:set var="formIndex" scope="session" value="${requestScope.formIndex}"/>
+		<c:if test="${(requestScope.startMonitoringSummaryRequest != 'true')  || (sessionScope.editActivityEditMode=='true') }"> 			
+			<c:if test="${requestScope.stopRenderingQuestions != 'true'}"> 			
+			<tr> <td>
+					<table>
+						<tr> 
+					 		<td> <bean:message key="label.authoring.title"/>: </td>
+					 		<td NOWRAP width=700>
+							<FCK:editor id="richTextTitle" basePath="/lams/fckEditor/"
+							      height="200"
+								  width="100%">
+								  <c:out value="${sessionScope.richTextTitle}" escapeXml="false" />						  
+							</FCK:editor>
 							</td> 
-					</tr>
-			</table>
+					  	</tr>
+					  	<tr> 
+					 		<td> <bean:message key="label.authoring.instructions"/>: </td>
+							<td NOWRAP width=700>
+							<FCK:editor id="richTextInstructions" basePath="/lams/fckEditor/"
+							      height="200"
+								  width="100%">
+								  <c:out value="${sessionScope.richTextInstructions}" escapeXml="false" />						  
+							</FCK:editor>
+							</td>
+						</tr>
+				
+			 		<!--default question content, this entry can not be deleted but can be updated -->
+				 		<tr> 
+						  	<td> 
+						 		<bean:message key="label.question1"/> : 
+						 	</td>
+						  	<td>
+								  	<input type="text" name="questionContent0" size="50" 
+								  	maxlength="255" value="<c:out value="${sessionScope.defaultQuestionContent}"/>"> 
+								  	&nbsp
+									<html:submit property="addContent" styleClass="linkbutton" disabled="${sessionScope.isDefineLater}"
+									onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
+									<bean:message key="button.addNewQuestion"/>
+									</html:submit>
+						  	</td>
+					  	</tr>
 		
-		</td>
-		</tr>
-	</c:if>	
-	</c:if>	
-
-	<c:if test="${sessionScope.editActivityEditMode=='false'}"> 			
-	<c:if test="${requestScope.startMonitoringSummaryRequest == 'true'}"> 			
-	<c:if test="${requestScope.stopRenderingQuestions != 'true'}"> 			
-		<tr> <td> 
-			<table>
-				<tr> 
-			 		<td> <fmt:message key="label.authoring.title"/>: </td>
-			 		<td> 
-						<c:out value="${sessionScope.title}"/>
-			 		</td>
-			  	</tr>
-			  	<tr> 
-			 		<td> <fmt:message key="label.authoring.instructions"/>: </td>
-			 		<td> 
-						<c:out value="${sessionScope.instructions}"/>			 		
-			 		</td>
-			  	</tr>
-		
-	 		<!--default question content, this entry can not be deleted but can be updated -->
-
-			 		<tr> 
-					  	<td> 
-					  		<c:out value="Question 1"/> : </td>
-					  		<td>
-								<c:out value="${sessionScope.defaultQuestionContent}"/>
-					  		</td>
-				  	</tr>
-
-		  	<!--end of default question content -->
-		  	
-	  		<!-- if there is more than just the default content start presenting them -->
-	  	 		<c:set var="queIndex" scope="session" value="1"/>
-				<c:forEach var="questionEntry" items="${sessionScope.mapQuestionContent}">
-			  		<c:if test="${questionEntry.key > 1}"> 			
-						<c:set var="queIndex" scope="session" value="${queIndex +1}"/>
-						  <tr>
-						  	<td> <c:out value="Question ${queIndex}"/> : </td>
-						  		<td> <c:out value="${questionEntry.value}"/>
-							  	&nbsp
-							  	</td>
-						  </tr>
-					</c:if> 			
-				</c:forEach>
-				<html:hidden property="toolContentId" value="${sessionScope.toolContentId}"/>
-				<html:hidden property="questionIndex"/>
-				<html:hidden property="isRemoveContent"/>
-			</tr>
-			</table>
-
-			<hr>
-			<table>
-					<tr>
-							 <td> 
-								 <html:submit property="edit" styleClass="linkbutton" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-									<bean:message key="label.edit"/>
-								</html:submit>
-							</td> 
+				  	<!--end of default question content -->
+				  	
+			  		<!-- if there is more than just the default content start presenting them -->
+			  	 		<c:set var="queIndex" scope="session" value="1"/>
+						<c:forEach var="questionEntry" items="${sessionScope.mapQuestionContent}">
+					  		<c:if test="${questionEntry.key > 1}"> 			
+								<c:set var="queIndex" scope="session" value="${queIndex +1}"/>
+								  <tr>
+								  	<td> <c:out value="Question ${queIndex}"/> : </td>
+								  		<td> <input type="text" name="questionContent<c:out value="${queIndex-1}"/>" value="<c:out value="${questionEntry.value}"/>"   
+									  		size="50" maxlength="255"> 
+									  	&nbsp
+		 								<html:submit property="removeContent" styleClass="linkbutton"  onclick="removeQuestion(${formIndex}, ${queIndex});"
+		 								disabled="${sessionScope.isDefineLater}" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
+											<bean:message key="button.removeQuestion"/>
+										</html:submit>
+									  	</td>
+								  </tr>
+							</c:if> 			
+						</c:forEach>
+						<html:hidden property="toolContentId" value="${sessionScope.toolContentId}"/>
+						<html:hidden property="questionIndex"/>
+						<html:hidden property="isRemoveContent"/>
 					</tr>
-
-			</table>
+					</table>
 		
-		</td>
-		</tr>
-	</c:if>	
-	</c:if>	
-	</c:if>	
+					<hr>
+					<table>
+							<tr>
+									 <td> 
+										 <html:submit property="submitAllContent" styleClass="linkbutton" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
+											<bean:message key="button.submitAllContent"/>
+										</html:submit>
+									</td> 
+							</tr>
+					</table>
+			</td></tr>			
+			</c:if>	
+		</c:if>	
 	
-	
+		
+		<c:if test="${sessionScope.editActivityEditMode=='false'}"> 			
+			<c:if test="${requestScope.startMonitoringSummaryRequest == 'true'}"> 			
+			<c:if test="${requestScope.stopRenderingQuestions != 'true'}"> 			
+			<tr> <td>
+					<table>
+						<tr> 
+					 		<td> <fmt:message key="label.authoring.title"/>: </td>
+					 		<td> 
+								<c:out value="${sessionScope.title}"/>
+					 		</td>
+					  	</tr>
+					  	<tr> 
+					 		<td> <fmt:message key="label.authoring.instructions"/>: </td>
+					 		<td> 
+								<c:out value="${sessionScope.instructions}"/>			 		
+					 		</td>
+					  	</tr>
+				
+			 		<!--default question content, this entry can not be deleted but can be updated -->
+		
+				 		<tr> 
+						  	<td> 
+						  		<c:out value="Question 1"/> : </td>
+						  		<td>
+									<c:out value="${sessionScope.defaultQuestionContent}"/>
+						  		</td>
+					  	</tr>
+		
+				  	<!--end of default question content -->
+				  	
+			  		<!-- if there is more than just the default content start presenting them -->
+			  	 		<c:set var="queIndex" scope="session" value="1"/>
+						<c:forEach var="questionEntry" items="${sessionScope.mapQuestionContent}">
+					  		<c:if test="${questionEntry.key > 1}"> 			
+								<c:set var="queIndex" scope="session" value="${queIndex +1}"/>
+								  <tr>
+								  	<td> <c:out value="Question ${queIndex}"/> : </td>
+								  		<td> <c:out value="${questionEntry.value}"/>
+									  	&nbsp
+									  	</td>
+								  </tr>
+							</c:if> 			
+						</c:forEach>
+						<html:hidden property="toolContentId" value="${sessionScope.toolContentId}"/>
+						<html:hidden property="questionIndex"/>
+						<html:hidden property="isRemoveContent"/>
+					</table>
+		
+					<hr>
+					<table>
+							<tr>
+									 <td> 
+										 <html:submit property="edit" styleClass="linkbutton" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
+											<bean:message key="label.edit"/>
+										</html:submit>
+									</td> 
+							</tr>
+					</table>
+			</td></tr>			
+			</c:if>	
+			</c:if>	
+		</c:if>	
+</div>	
 
 <SCRIPT language="JavaScript"> 
 
Index: lams_tool_laqa/web/InstructionsContent.jsp
===================================================================
diff -u -r4447ae1bb802ba8a16df65d880f25575d1174003 -r27a3ba4f41698f83ce6320d5b855329b1addd5eb
--- lams_tool_laqa/web/InstructionsContent.jsp	(.../InstructionsContent.jsp)	(revision 4447ae1bb802ba8a16df65d880f25575d1174003)
+++ lams_tool_laqa/web/InstructionsContent.jsp	(.../InstructionsContent.jsp)	(revision 27a3ba4f41698f83ce6320d5b855329b1addd5eb)
@@ -5,17 +5,16 @@
 <%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %>
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 
+<div id="richTextContainer">
 		<tr> <td>
 			<table>
 				<tr> 
 					<td>
           				<fmt:message key="label.offlineInstructions" />
           			</td>
-					<td> 
+					<td NOWRAP width=700>
 					<FCK:editor id="richTextOfflineInstructions" basePath="/lams/fckEditor/"
-					      imageBrowserURL="/lams/fckEditor/editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector"
-					      linkBrowserURL="/lams/fckEditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector"
-						  height="300"
+					      height="200"
 						  width="100%">
 						  <c:out value="${sessionScope.richTextOfflineInstructions}" escapeXml="false" />						  
 					</FCK:editor>
@@ -26,11 +25,9 @@
           			<td>
           				<fmt:message key="label.onlineInstructions" />
           			</td>
-					<td> 
+					<td NOWRAP width=700>
 					<FCK:editor id="richTextOnlineInstructions" basePath="/lams/fckEditor/"
-					      imageBrowserURL="/lams/fckEditor/editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector"
-					      linkBrowserURL="/lams/fckEditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector"
-						  height="300"
+					      height="200"
 						  width="100%">
   						  <c:out value="${sessionScope.richTextOnlineInstructions}" escapeXml="false" />						  
 					</FCK:editor>
@@ -40,13 +37,14 @@
 
 			  	<hr>
 				<table>
-          		<tr>
-					 <td colspan=2> 
-						 <html:submit property="submitTabDone" styleClass="linkbutton" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-							<bean:message key="button.done"/>
-						</html:submit>
-					</td> 
-				</tr>
-			</table>
-		</td>
-		</tr>
\ No newline at end of file
+	          		<tr>
+						 <td colspan=2> 
+							 <html:submit property="submitTabDone" styleClass="linkbutton" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
+								<bean:message key="button.done"/>
+							</html:submit>
+						</td> 
+					</tr>
+				</table>
+
+		</td></tr>
+</div>
\ No newline at end of file
Index: lams_tool_laqa/web/baseContent.jsp
===================================================================
diff -u -r16e844de3f7c34b44baee1b28e67e708f42d00bf -r27a3ba4f41698f83ce6320d5b855329b1addd5eb
--- lams_tool_laqa/web/baseContent.jsp	(.../baseContent.jsp)	(revision 16e844de3f7c34b44baee1b28e67e708f42d00bf)
+++ lams_tool_laqa/web/baseContent.jsp	(.../baseContent.jsp)	(revision 27a3ba4f41698f83ce6320d5b855329b1addd5eb)
@@ -18,5 +18,4 @@
 
 http://www.gnu.org/licenses/gpl.txt
 -->
-
 <H1>Base Content</H1>
Index: lams_tool_laqa/web/footer.jsp
===================================================================
diff -u -r16e844de3f7c34b44baee1b28e67e708f42d00bf -r27a3ba4f41698f83ce6320d5b855329b1addd5eb
--- lams_tool_laqa/web/footer.jsp	(.../footer.jsp)	(revision 16e844de3f7c34b44baee1b28e67e708f42d00bf)
+++ lams_tool_laqa/web/footer.jsp	(.../footer.jsp)	(revision 27a3ba4f41698f83ce6320d5b855329b1addd5eb)
@@ -18,13 +18,3 @@
 
 http://www.gnu.org/licenses/gpl.txt
 -->
-<tr>
-	<td>
-		<table width="100%" border="0" cellspacing="0" cellpadding="0">
-		  <tr bgcolor="#282871"> 
-		    <td width="136" height="8"></td>
-		    <td width="92%" height="8" align="right" ></td>
-		  </tr>
-		</table>
-	</td>
-</tr>
\ No newline at end of file
Index: lams_tool_laqa/web/header.jsp
===================================================================
diff -u -r16e844de3f7c34b44baee1b28e67e708f42d00bf -r27a3ba4f41698f83ce6320d5b855329b1addd5eb
--- lams_tool_laqa/web/header.jsp	(.../header.jsp)	(revision 16e844de3f7c34b44baee1b28e67e708f42d00bf)
+++ lams_tool_laqa/web/header.jsp	(.../header.jsp)	(revision 27a3ba4f41698f83ce6320d5b855329b1addd5eb)
@@ -28,28 +28,4 @@
 	protocol = "http://";
 }
 String pathToRoot = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/";
-
 %>
-<tr>
-<td>
-<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="This table is being used for layout purposes only">
-  <tr> 
-    <td width="136" height="10"></td>
-    <td width="92%" height="10"></td>
-  </tr>
-  <tr bgcolor="#282871"> 
-    <td width="50%" height="15" align="left">
-    		<img height=8 width=8 src="<%=pathToRoot%>/images/spacer.gif">
-    		<font color="#FFFFFF" size="1" face="Verdana, Arial, Helvetica, sans-serif"><c:out value="${pageheader}" />
-</font>
-    </td>        
-    <td width="50%" height="15" align="right" > 
-    		<a href="<%=pathToRoot%>/doc/LAMS_Learner_Guide_b60.pdf" target = 0>
-    			<font color="#FFFFFF" size="1" face="Verdana, Arial, Helvetica, sans-serif">[HELP]</font>
-    		</a>
-    		<img height=8 width=8 src="<%=pathToRoot%>/images/spacer.gif"  alt="space image">
-    </td>
-  </tr>
-</table>
-</td>
-</tr>
Index: lams_tool_laqa/web/questionsContent.jsp
===================================================================
diff -u -r4447ae1bb802ba8a16df65d880f25575d1174003 -r27a3ba4f41698f83ce6320d5b855329b1addd5eb
--- lams_tool_laqa/web/questionsContent.jsp	(.../questionsContent.jsp)	(revision 4447ae1bb802ba8a16df65d880f25575d1174003)
+++ lams_tool_laqa/web/questionsContent.jsp	(.../questionsContent.jsp)	(revision 27a3ba4f41698f83ce6320d5b855329b1addd5eb)
@@ -5,6 +5,8 @@
 <%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %>
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 
+<tr>
+<td>
 	<c:if test="${requestScope.userExceptionNumberFormat == 'true' || 
 			 	requestScope.userExceptionDefaultContentNotAvailable == 'true' || 
 			 	requestScope.userExceptionUserIdNotAvailable == 'true' || 
@@ -118,3 +120,5 @@
 			</html:form>
 	</c:if>						
 	
+ <td> </tr>
+	
\ No newline at end of file
Index: lams_tool_laqa/web/template.jsp
===================================================================
diff -u -r16e844de3f7c34b44baee1b28e67e708f42d00bf -r27a3ba4f41698f83ce6320d5b855329b1addd5eb
--- lams_tool_laqa/web/template.jsp	(.../template.jsp)	(revision 16e844de3f7c34b44baee1b28e67e708f42d00bf)
+++ lams_tool_laqa/web/template.jsp	(.../template.jsp)	(revision 27a3ba4f41698f83ce6320d5b855329b1addd5eb)
@@ -43,17 +43,17 @@
     </head>
     
     <body bgcolor="#9DC5EC" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
-      <table width="95%" border="0" cellspacing="0" cellpadding="0" align="center">
-        <!-- header -->
-        <c:set var="pageheader" scope="session"><tiles:getAsString name="pageHeader"/></c:set>
-		<tiles:insert attribute="header" />
-        <!-- end of header -->
-        <!-- main content -->
-        <tiles:insert attribute="content" />
-        <!--end of main content-->
-        <!--footer-->
-        <tiles:insert attribute="footer" />
-        <!-- end of footer -->
+      <table width="100%" border="0" cellspacing="0" cellpadding="0" align="center"> 
+	        <!-- header -->
+	        <c:set var="pageheader" scope="session"><tiles:getAsString name="pageHeader"/></c:set>
+			<tiles:insert attribute="header" />
+	        <!-- end of header -->
+	        <!-- main content -->
+	        <tiles:insert attribute="content" />
+	        <!--end of main content-->
+	        <!--footer-->
+	        <tiles:insert attribute="footer" />
+	        <!-- end of footer -->
       </table>
     </body>
 </html:html>