Index: lams_tool_laqa/.mymetadata
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/.mymetadata,v
diff -u -r1.2 -r1.3
Binary files differ
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaResources.properties,v
diff -u -r1.21 -r1.22
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties	5 Mar 2006 13:23:14 -0000	1.21
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties	5 Mar 2006 23:08:48 -0000	1.22
@@ -92,6 +92,7 @@
 label.learning.qa						=Answers for Q/A
 label.question							=Question
 label.answers							=Answers:
+label.answer							=Answer:
 button.endLearning						=Finish
 label.learning.user						=User
 label.learning.attemptTime				=Attempt Date/Time
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/MonitoringUtil.java,v
diff -u -r1.17 -r1.18
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java	4 Mar 2006 05:42:42 -0000	1.17
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java	5 Mar 2006 23:08:48 -0000	1.18
@@ -149,6 +149,14 @@
 		List sessionsList=qaService.getSessionNamesFromContent(qaContent);
     	logger.debug("sessionsList size is:..." + sessionsList.size());
     	
+		if (sessionsList.isEmpty())
+		{
+			/* inform in the Summary tab that the tool has no active sessions */
+			request.getSession().setAttribute(USER_EXCEPTION_NO_TOOL_SESSIONS, new Boolean(true).toString());
+			logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to true");
+		}
+
+    	
     	Map sessionsMap=QaUtils.convertToStringMap(sessionsList, "String");
     	logger.debug("generated sessionsMap:..." + sessionsMap);
     	logger.debug("sessionsMap size:..." + sessionsMap.size());
@@ -375,6 +383,7 @@
 		}
 		return map;
 	}
+	
 }
 
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/QAction.java,v
diff -u -r1.28 -r1.29
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java	5 Mar 2006 19:09:03 -0000	1.28
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java	5 Mar 2006 23:08:48 -0000	1.29
@@ -236,14 +236,28 @@
     }
 
     
+    public ActionForward editActivity(ActionMapping mapping,
+            ActionForm form,
+            HttpServletRequest request,
+            HttpServletResponse response) throws IOException,
+                                         ServletException
+	{
+    	logger.debug("dispatching proxy editActivity...");
+    	//QaMonitoringAction qaMonitoringAction= new QaMonitoringAction();
+	    //return qaMonitoringAction.editActivity(mapping, form, request, response);
+    	return null;
+	}
+
+    
     public ActionForward getSummary(ActionMapping mapping,
             ActionForm form,
             HttpServletRequest request,
             HttpServletResponse response) throws IOException,
                                          ServletException
 	{
     	logger.debug("dispatching proxy getSummary...start with monitoringStarter" + request);
- 		return null;
+    	QaMonitoringAction qaMonitoringAction= new QaMonitoringAction();
+    	return qaMonitoringAction.getSummary(mapping, form, request, response);
 	}
 
     
@@ -254,8 +268,8 @@
                                          ServletException
 	{
     	logger.debug("dispatching proxy getInstructions..." + request);
- 		return null;
-
+    	QaMonitoringAction qaMonitoringAction= new QaMonitoringAction();
+    	return qaMonitoringAction.getInstructions(mapping, form, request, response);
 	}
 
     public ActionForward getStats(ActionMapping mapping,
@@ -265,7 +279,8 @@
                                          ServletException
 	{
     	logger.debug("dispatching proxy getStats..." + request);
- 		return null;
+    	QaMonitoringAction qaMonitoringAction= new QaMonitoringAction();
+    	return qaMonitoringAction.getStats(mapping, form, request, response);
 	}
 
     
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java,v
diff -u -r1.17 -r1.18
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java	5 Mar 2006 19:09:03 -0000	1.17
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java	5 Mar 2006 23:08:48 -0000	1.18
@@ -88,6 +88,8 @@
                                          ServletException
 	{
     	logger.debug("dispatching getStats..." + request);
+    	
+    	refreshStatsData(request);
     	request.getSession().setAttribute(EDIT_RESPONSE, new Boolean(false));
     	
     	request.getSession().setAttribute(CURRENT_MONITORING_TAB, "stats");
@@ -118,6 +120,23 @@
                                          ServletException
 	{
     	logger.debug("dispatching getInstructions..." + request);
+
+    	IQaService qaService = (IQaService)request.getSession().getAttribute(TOOL_SERVICE);
+		logger.debug("qaService: " + qaService);
+		if (qaService == null)
+		{
+			logger.debug("will retrieve qaService");
+			qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
+			logger.debug("retrieving qaService from session: " + qaService);
+		}
+
+	    Long toolContentId =(Long) request.getSession().getAttribute(TOOL_CONTENT_ID);
+	    logger.debug("toolContentId: " + toolContentId);
+	    
+	    QaContent qaContent=qaService.loadQa(toolContentId.longValue());
+		logger.debug("existing qaContent:" + qaContent);
+
+    	refreshInstructionsData(request, qaContent);
     	request.getSession().setAttribute(EDIT_RESPONSE, new Boolean(false));
 
     	request.getSession().setAttribute(CURRENT_MONITORING_TAB, "instructions");
@@ -132,8 +151,7 @@
                                          ServletException
 	{
     	logger.debug("dispatching editActivity...");
-    	QaMonitoringForm qaMonitoringForm = (QaMonitoringForm) form;
-
+    	
     	IQaService qaService = (IQaService)request.getSession().getAttribute(TOOL_SERVICE);
 		logger.debug("qaService: " + qaService);
 		if (qaService == null)
@@ -200,8 +218,14 @@
     	logger.debug("dispatching getSummary..." + request);
     	request.getSession().setAttribute(EDIT_RESPONSE, new Boolean(false));
     	
-    	IQaService qaService = (IQaService)request.getSession().getAttribute(TOOL_SERVICE);
-    	logger.debug("qaService: " + qaService);
+		IQaService qaService = (IQaService)request.getSession().getAttribute(TOOL_SERVICE);
+		logger.debug("qaService: " + qaService);
+		if (qaService == null)
+		{
+			logger.debug("will retrieve qaService");
+			qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
+			logger.debug("retrieving qaService from session: " + qaService);
+		}
 		
     	Long toolContentId =(Long) request.getSession().getAttribute(TOOL_CONTENT_ID);
 	    logger.debug("toolContentId: " + toolContentId);
@@ -215,7 +239,8 @@
 		if (summaryToolSessions.isEmpty())
 		{
 			/* inform in the Summary tab that the tool has no active sessions */
-			request.setAttribute(USER_EXCEPTION_NO_TOOL_SESSIONS, new Boolean(true));
+			request.getSession().setAttribute(USER_EXCEPTION_NO_TOOL_SESSIONS, new Boolean(true).toString());
+			logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to true");
 		}
 		 
 		request.getSession().setAttribute(SUMMARY_TOOL_SESSIONS, summaryToolSessions);
@@ -435,5 +460,44 @@
             return false;
         }
     }
+    
+    
+	public void refreshStatsData(HttpServletRequest request)
+	{
+		/* it is possible that no users has ever logged in for the activity yet*/
+		IQaService qaService = (IQaService)request.getSession().getAttribute(TOOL_SERVICE);
+		logger.debug("qaService: " + qaService);
+		if (qaService == null)
+		{
+			logger.debug("will retrieve qaService");
+			qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
+			logger.debug("retrieving qaService from session: " + qaService);
+		}
 
+		
+	    int countAllUsers=qaService.getTotalNumberOfUsers();
+		logger.debug("countAllUsers: " + countAllUsers);
+		
+		if (countAllUsers == 0)
+		{
+	    	logger.debug("error: countAllUsers is 0");
+	    	request.getSession().setAttribute(USER_EXCEPTION_NO_STUDENT_ACTIVITY, new Boolean(true));
+		}
+		
+		request.getSession().setAttribute(COUNT_ALL_USERS, new Integer(countAllUsers).toString());
+		
+		int countSessionComplete=qaService.countSessionComplete();
+		logger.debug("countSessionComplete: " + countSessionComplete);
+		request.getSession().setAttribute(COUNT_SESSION_COMPLETE, new Integer(countSessionComplete).toString());
+	}
+	
+	
+	public void refreshInstructionsData(HttpServletRequest request, QaContent qaContent)
+	{
+	    request.getSession().setAttribute(RICHTEXT_ONLINEINSTRUCTIONS,qaContent.getOnlineInstructions());
+	    request.getSession().setAttribute(RICHTEXT_OFFLINEINSTRUCTIONS,qaContent.getOfflineInstructions());
+	}
+
+    
+
 }
\ No newline at end of file
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java,v
diff -u -r1.20 -r1.21
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java	4 Mar 2006 19:39:16 -0000	1.20
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java	5 Mar 2006 23:08:48 -0000	1.21
@@ -104,7 +104,8 @@
 		if (summaryToolSessions.isEmpty())
 		{
 			/* inform in the Summary tab that the tool has no active sessions */
-			request.setAttribute(USER_EXCEPTION_NO_TOOL_SESSIONS, new Boolean(true));
+			request.setAttribute(USER_EXCEPTION_NO_TOOL_SESSIONS, new Boolean(true).toString());
+			logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to true");
 		}
 		 
 		request.getSession().setAttribute(SUMMARY_TOOL_SESSIONS, summaryToolSessions);
@@ -127,31 +128,18 @@
 	    logger.debug("LIST_MONITORED_ANSWERS_CONTAINER_DTO: " + request.getSession().getAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO));
 	    /* ends here. */
 
+		QaMonitoringAction qaMonitoringAction= new QaMonitoringAction();
+		logger.debug("refreshing stats data...");
+		qaMonitoringAction.refreshStatsData(request);
+		logger.debug("refreshing instructions data...");
+		qaMonitoringAction.refreshInstructionsData(request, qaContent);
 		
-		/* this section is related to Stats tab. Starts here. */
-		/* it is possible that no users has ever logged in for the activity yet*/ 
-	    int countAllUsers=qaService.getTotalNumberOfUsers();
-		logger.debug("countAllUsers: " + countAllUsers);
-		
-		if (countAllUsers == 0)
-		{
-	    	logger.debug("error: countAllUsers is 0");
-	    	request.getSession().setAttribute(USER_EXCEPTION_NO_STUDENT_ACTIVITY, new Boolean(true));
-		}
-		request.getSession().setAttribute(COUNT_ALL_USERS, new Integer(countAllUsers).toString());
-		
-		int countSessionComplete=qaService.countSessionComplete();
-		logger.debug("countSessionComplete: " + countSessionComplete);
-		request.getSession().setAttribute(COUNT_SESSION_COMPLETE, new Integer(countSessionComplete).toString());
-		/* ends here. */
-		
 		/* this section is related to instructions tab. Starts here. */
-	    request.getSession().setAttribute(RICHTEXT_ONLINEINSTRUCTIONS,qaContent.getOnlineInstructions());
-	    request.getSession().setAttribute(RICHTEXT_OFFLINEINSTRUCTIONS,qaContent.getOfflineInstructions());
 	    /* ends here. */
 		return true;
 	}
 
+
 	
 	/**
 	 * validates request paramaters based on tool contract
Index: lams_tool_laqa/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/struts-config.xml,v
diff -u -r1.17 -r1.18
--- lams_tool_laqa/web/WEB-INF/struts-config.xml	5 Mar 2006 19:09:03 -0000	1.17
+++ lams_tool_laqa/web/WEB-INF/struts-config.xml	5 Mar 2006 23:08:48 -0000	1.18
@@ -94,6 +94,12 @@
 	        path="/AuthoringMaincontent.jsp"
 	        redirect="true"
       />
+
+	  	<forward
+		    name="loadMonitoring"
+		    path="/monitoring/MonitoringMaincontent.jsp"
+		    redirect="true"
+	  	/>
       
         <forward
           name="loadViewOnly"
Index: lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	5 Mar 2006 19:09:03 -0000	1.2
+++ lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	5 Mar 2006 23:08:47 -0000	1.3
@@ -152,7 +152,7 @@
 
 					<b> <font size=2> <bean:message key="label.monitoring"/> </font></b>
 			        <jsp:include page="/monitoring/MonitoringTabsHeader.jsp" />
-			        <div class="tabbody" id="tabbody1">
+			        <div class="tabbody content_b" id="tabbody1">
 				        <jsp:include page="/authoring/BasicContentViewOnly.jsp" />
    				    </div>
 				</c:if> 											  				
@@ -174,7 +174,7 @@
 							  }"> 			
 					<b> <font size=2> <bean:message key="label.monitoring"/> </font></b>
 			        <jsp:include page="/monitoring/MonitoringTabsHeader.jsp" />
-			        <div class="tabbody" id="tabbody1">
+			        <div class="tabbody content_b" id="tabbody1">
 				        <jsp:include page="/authoring/AuthoringTabs.jsp" />				
    				    </div>			        
 			    </c:if> 											  						
Index: lams_tool_laqa/web/learning/CombinedAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/CombinedAnswersContent.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	5 Mar 2006 13:23:15 -0000	1.5
+++ lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	5 Mar 2006 23:08:48 -0000	1.6
@@ -31,12 +31,12 @@
 			<table>
 				<c:forEach var="questionEntry" items="${sessionScope.mapQuestionContentLearner}">
 						  <tr>
-						  	<td colspan=2 NOWRAP class="input" valign=top> <font size=2> <bean:message key="label.question"/> <c:out value="${questionEntry.key}" escapeXml="false"/>: 
+						  	<td colspan=2 NOWRAP class="input" valign=top> <font size=2> <b> <bean:message key="label.question"/> <c:out value="${questionEntry.key}" escapeXml="false"/>: </b> 
 						  		<c:out value="${questionEntry.value}" escapeXml="false"/> 
 						  	</font> </td>
 						  </tr>
 						  <tr> 
-					 		<td NOWRAP class="input" valign=top > <font size=2> <bean:message key="label.answers"/>  </font> </td>
+					 		<td NOWRAP class="input" valign=top > <font size=2> <b> <bean:message key="label.answer"/> </b> </font> </td>
 					 		<td  NOWRAP class="input" valign=top>
 					 			<input type="text" name="answer<c:out value="${questionEntry.key}"  escapeXml="false"/>" size="60" maxlength="255" value=""/> 
 					 		</td>
Index: lams_tool_laqa/web/learning/SequentialAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/SequentialAnswersContent.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	24 Feb 2006 15:06:00 -0000	1.4
+++ lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	5 Mar 2006 23:08:48 -0000	1.5
@@ -34,12 +34,12 @@
 			  		<c:if test="${questionEntry.key == sessionScope.currentQuestionIndex}"> 			
 					  <tr>
 					  	<td colspan=2 NOWRAP class="input" valign=top> <font size=2> 
-					  		<bean:message key="label.question"/> 
-						  	<c:out value="${questionEntry.key}" escapeXml="false"/>: <c:out value="${questionEntry.value}" escapeXml="false"/>
+					  		<b> <bean:message key="label.question"/> 
+						  	<c:out value="${questionEntry.key}" escapeXml="false"/>:</b> <c:out value="${questionEntry.value}" escapeXml="false"/>
 					  	</font>
 					  </tr>
 					  <tr> 
-				 		<td NOWRAP class="input" valign=top> <font size=2> <bean:message key="label.answers"/> </font> </td>
+				 		<td NOWRAP class="input" valign=top> <font size=2> <b> <bean:message key="label.answer"/> </b> </font> </td>
 				 		<td NOWRAP class="input" valign=top> 
 				 			<html:text property="answer" size="60" maxlength="255" value="${sessionScope.currentAnswer}"/>
 				 			<html:hidden property="currentQuestionIndex" value="${questionEntry.key}"/>
Index: lams_tool_laqa/web/monitoring/MonitoringTabsHeader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/Attic/MonitoringTabsHeader.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/web/monitoring/MonitoringTabsHeader.jsp	5 Mar 2006 19:09:37 -0000	1.1
+++ lams_tool_laqa/web/monitoring/MonitoringTabsHeader.jsp	5 Mar 2006 23:08:47 -0000	1.2
@@ -30,6 +30,10 @@
 <c:set var="lams"><lams:LAMSURL/></c:set>
 <c:set var="tool"><lams:WebAppURL/></c:set>
 
+		<c:set var="authoringURL">
+			<html:rewrite page="/authoring.do" />
+		</c:set>
+
 	        	<tr><td>
 				<!-- start tabs -->
 				<!-- tab holder table -->
@@ -44,10 +48,10 @@
 							  <tr>
 								<td><img src="<c:out value="${lams}"/>images/aqua_tab_s_left.gif" name="tab_left_su" width="8" height="25" border="0" id="tab_left_su"/></td>
 								<td NOWRAP class="tab tabcentre_selected" width="90" id="tab_tbl_centre_su" ><label>
-								<a href="?method=getSummary" id="su" >
+								<a href="<c:out value='${authoringURL}'/>?dispatch=getSummary" id="su" >
 									<font size=2> 	<bean:message key="label.summary"/> </font>
 								</a></label></td>
-								<td><a href="?method=getSummary">
+								<td><a href="<c:out value='${authoringURL}'/>?dispatch=getSummary">
 									<img src="<c:out value="${lams}"/>images/aqua_tab_s_right.gif"  name="tab_right_su" width="8" height="25" border="0" id="tab_right_su"/></a></td>
 							  </tr>
 							</table>
@@ -58,10 +62,10 @@
 							  <tr>
 								<td><img src="<c:out value="${lams}"/>images/aqua_tab_s_left.gif" name="tab_left_i" width="8" height="25" border="0" id="tab_left_i"/></td>
 								<td NOWRAP class="tab tabcentre_selected" width="90" id="tab_tbl_centre_i" ><label>
-								<a href="?method=getInstructions" id="i" >
+								<a href="<c:out value='${authoringURL}'/>?dispatch=getInstructions" id="i" >
 										<font size=2>  <bean:message key="label.instructions"/> </font>
 									</a></label></td>
-								<td><a href="?method=getInstructions">
+								<td><a href="<c:out value='${authoringURL}'/>?dispatch=getInstructions">
 									<img src="<c:out value="${lams}"/>images/aqua_tab_s_right.gif"  name="tab_right_i" width="8" height="25" border="0" id="tab_right_i"/></a></td>
 							  </tr>
 							</table>
@@ -73,10 +77,10 @@
 							  <tr>
 								<td><img src="<c:out value="${lams}"/>images/aqua_tab_s_left.gif" name="tab_left_e" width="8" height="25" border="0" id="tab_left_e"/></td>
 								<td NOWRAP class="tab tabcentre_selected" width="90" id="tab_tbl_centre_e" ><label>
-								<a href="?method=editActivity" id="e" >
+								<a href="" id="e" >
 										<font size=2>  <bean:message key="label.editActivity"/>	 </font>					
 									</a></label></td>
-								<td><a href="?method=editActivity">
+								<td><a href="">
 									<img src="<c:out value="${lams}"/>images/aqua_tab_s_right.gif"  name="tab_right_e" width="8" height="25" border="0" id="tab_right_e"/></a></td>
 							  </tr>
 							</table>
@@ -88,10 +92,10 @@
 							  <tr>
 								<td><img src="<c:out value="${lams}"/>images/aqua_tab_s_left.gif" name="tab_left_s" width="8" height="25" border="0" id="tab_left_s"/></td>
 								<td NOWRAP class="tab tabcentre_selected" width="90" id="tab_tbl_centre_s" ><label>
-									<a href="?method=getStats" id="e" >
+									<a href="<c:out value='${authoringURL}'/>?dispatch=getStats" id="e" >
 										<font size=2>  <bean:message key="label.stats"/> </font>								
 									</a></label></td>
-								<td><a href="?method=getStats">
+								<td><a href="<c:out value='${authoringURL}'/>?dispatch=getStats">
 									<img src="<c:out value="${lams}"/>images/aqua_tab_s_right.gif"  name="tab_right_s" width="8" height="25" border="0" id="tab_right_s"/></a></td>
 							  </tr>
 							</table>
Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/SummaryContent.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_laqa/web/monitoring/SummaryContent.jsp	3 Mar 2006 16:51:29 -0000	1.5
+++ lams_tool_laqa/web/monitoring/SummaryContent.jsp	5 Mar 2006 23:08:47 -0000	1.6
@@ -38,17 +38,18 @@
 	
 	<h2><font size=2> <bean:message key="button.summary"/> </font> </h2>
 	<div id="datatablecontainer">
-		<c:if test="${sessionScope.userExceptionNoStudentActivity == 'true'}"> 	
+		<c:if test="${(userExceptionNoStudentActivity == 'true') || (userExceptionNoToolSessions == 'true') }"> 	
 				<table class="forms" align="center">
 					<tr> 
 						<td NOWRAP valign=top align=center> 
 							<b> <font size=2> <bean:message key="error.noLearnerActivity"/> </font></b>
 						</td> 
 					<tr>
 				</table>
-		</c:if>						
+		</c:if>			
+					
 
-		<c:if test="${sessionScope.userExceptionNoStudentActivity != 'true'}"> 	
+		<c:if test="${(userExceptionNoStudentActivity != 'true')  && (userExceptionNoToolSessions  != 'true') }"> 	
 			<html:hidden property="selectedToolSessionId"/>							
 			<input type="hidden" name="isToolSessionChanged"/>
 				<table class="forms">
@@ -93,7 +94,7 @@
 			  	 		</tr>
 						<tr>			
 							<td NOWRAP valign=top align=left><b> <font size=2> <bean:message key="label.question.col"/> </b>
-								<c:out value="${currentDto.question}"/>
+								<c:out value="${currentDto.question}" escapeXml="false"/>
 							</font> </td>
 						</tr>