Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaExportPortfolioStarterAction.java
===================================================================
diff -u -r5583b96031dbb65e91d200b7121cc5cd49e26003 -r1213de28fa1704749c2b8cc7029667a5e944cef8
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaExportPortfolioStarterAction.java	(.../QaExportPortfolioStarterAction.java)	(revision 5583b96031dbb65e91d200b7121cc5cd49e26003)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaExportPortfolioStarterAction.java	(.../QaExportPortfolioStarterAction.java)	(revision 1213de28fa1704749c2b8cc7029667a5e944cef8)
@@ -17,6 +17,9 @@
 	to differentiate between learner and teacher modes.
 */
 
+/**
+ * Revisit when user management service is ready to include current user's name in the jsp. 
+ */
 
 package org.lamsfoundation.lams.tool.qa.web;
 import java.io.IOException;
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java
===================================================================
diff -u -r183fd9b105d8f11b7ab038be49e542499d28b970 -r1213de28fa1704749c2b8cc7029667a5e944cef8
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java	(.../QaMonitoringStarterAction.java)	(revision 183fd9b105d8f11b7ab038be49e542499d28b970)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java	(.../QaMonitoringStarterAction.java)	(revision 1213de28fa1704749c2b8cc7029667a5e944cef8)
@@ -94,7 +94,7 @@
 			userId=request.getParameter(USER_ID);
 		    try
 			{
-		    	User user=QaUtils.createAuthoringUser(new Integer(userId));
+		    	User user=QaUtils.createSimpleUser(new Integer(userId));
 		    	request.getSession().setAttribute(TOOL_USER, user);
 			}
 		    catch(NumberFormatException e)
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java
===================================================================
diff -u -r183fd9b105d8f11b7ab038be49e542499d28b970 -r1213de28fa1704749c2b8cc7029667a5e944cef8
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java	(.../QaStarterAction.java)	(revision 183fd9b105d8f11b7ab038be49e542499d28b970)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java	(.../QaStarterAction.java)	(revision 1213de28fa1704749c2b8cc7029667a5e944cef8)
@@ -201,7 +201,7 @@
 		    try
 			{
 		    	/* Check QaUtils.createAuthoringUser again User Management Service is ready */
-		    	User user=QaUtils.createAuthoringUser(new Integer(userId)); 
+		    	User user=QaUtils.createSimpleUser(new Integer(userId)); 
 		    	request.getSession().setAttribute(TOOL_USER, user);
 			}
 		    catch(NumberFormatException e)
Index: lams_tool_laqa/web/BasicContent.jsp
===================================================================
diff -u -r0cfced761d50756a1945b9387d28031f3f6f6ab4 -r1213de28fa1704749c2b8cc7029667a5e944cef8
--- lams_tool_laqa/web/BasicContent.jsp	(.../BasicContent.jsp)	(revision 0cfced761d50756a1945b9387d28031f3f6f6ab4)
+++ lams_tool_laqa/web/BasicContent.jsp	(.../BasicContent.jsp)	(revision 1213de28fa1704749c2b8cc7029667a5e944cef8)
@@ -10,7 +10,7 @@
 		<c:if test="${(requestScope.startMonitoringSummaryRequest != 'true')  || (sessionScope.editActivityEditMode=='true') }"> 			
 			<c:if test="${requestScope.stopRenderingQuestions != 'true'}"> 			
 			<tr> <td>
-					<table> 
+					<table align=center> 
 						<tr> 
 					 		<td> <bean:message key="label.authoring.title"/>: </td>
 					 		<td NOWRAP width=700> <!-- Dave,I found width was necessary to present all the elements of the editor, feel free to change -->
@@ -93,7 +93,7 @@
 			<c:if test="${requestScope.startMonitoringSummaryRequest == 'true'}"> 
 			<c:if test="${requestScope.stopRenderingQuestions != 'true'}"> 			
 			<tr> <td>
-					<table>
+					<table align=center>
 						<tr> 
 					 		<td> <bean:message key="label.authoring.title"/>: </td>
 					 		<td NOWRAP width=700> <!-- Dave,I found width was necessary to present all the elements of the editor, feel free to change -->
Index: lams_tool_laqa/web/InstructionsContent.jsp
===================================================================
diff -u -r0cfced761d50756a1945b9387d28031f3f6f6ab4 -r1213de28fa1704749c2b8cc7029667a5e944cef8
--- lams_tool_laqa/web/InstructionsContent.jsp	(.../InstructionsContent.jsp)	(revision 0cfced761d50756a1945b9387d28031f3f6f6ab4)
+++ lams_tool_laqa/web/InstructionsContent.jsp	(.../InstructionsContent.jsp)	(revision 1213de28fa1704749c2b8cc7029667a5e944cef8)
@@ -7,7 +7,7 @@
 
 <div id="richTextContainer">
 		<tr> <td>
-			<table>
+			<table align=center>
 				<tr> 
 					<td>
           				<fmt:message key="label.offlineInstructions" />:
Index: lams_tool_laqa/web/learnerReport.jsp
===================================================================
diff -u -rb767cd01abafe96e9ba61d83ba88cacb5a622558 -r1213de28fa1704749c2b8cc7029667a5e944cef8
--- lams_tool_laqa/web/learnerReport.jsp	(.../learnerReport.jsp)	(revision b767cd01abafe96e9ba61d83ba88cacb5a622558)
+++ lams_tool_laqa/web/learnerReport.jsp	(.../learnerReport.jsp)	(revision 1213de28fa1704749c2b8cc7029667a5e944cef8)
@@ -14,133 +14,18 @@
 			<c:out value="${sessionScope.reportTitleLearner}"/>
 		</td></tr>
 
-		<tr><td> &nbsp
-		</td></tr>
+		<tr><td> &nbsp </td></tr>
 
-		<tr> <td>
-		<table>
-	 		<c:set var="queIndex" scope="request" value="0"/>
-			<c:forEach var="mainEntry" items="${sessionScope.mapMainReport}">
-				<c:set var="queIndex" scope="request" value="${queIndex +1}"/>
-					  	<tr>
-					  		<td colspan=2> <fmt:message key="label.question"/> <c:out value="${queIndex}"/> : <c:out value="${mainEntry.key}"/>
-					  	</tr>
-					  
-	  				 	<tr> 
-							 <td> &nbsp&nbsp&nbsp <fmt:message key="label.learning.user"/>	</td>  
-	  						 <td> &nbsp&nbsp&nbsp <fmt:message key="label.learning.attemptTime"/></td>
- 	  						 <td> &nbsp&nbsp&nbsp <fmt:message key="label.learning.timezone"/></td>
-	  						 <td> &nbsp&nbsp&nbsp <fmt:message key="label.learning.response"/></td>
-			  			</tr>				 
-			  			
-							<c:set var="ansIndex" scope="request" value="0"/>
-					  		<c:forEach var="subEntry" items="${mainEntry.value}">
-								<c:set var="ansIndex" scope="request" value="${ansIndex +1}"/>
-								
-							  	<%String fullName	="fullName" + request.getAttribute("queIndex") + request.getAttribute("ansIndex");
-							  	  String aTime		="aTime" + request.getAttribute("queIndex") + request.getAttribute("ansIndex");
-							  	  String formattedAtime="formattedAtime" + request.getAttribute("queIndex") + request.getAttribute("ansIndex");
-							  	  String timeZoneId	="timeZoneId" + request.getAttribute("queIndex") + request.getAttribute("ansIndex");
-								  String answer		="answer" + request.getAttribute("queIndex") + request.getAttribute("ansIndex");
-							   	  String currentLearnerFullname=(String) request.getSession().getAttribute("currentLearnerFullname");
-							   	  								  
-								  fullName			= (String) request.getSession().getAttribute(fullName);
-						 	   	  java.util.Date attemptTime= (java.util.Date) request.getSession().getAttribute(aTime);
-						 	   	  formattedAtime 	=(String) request.getSession().getAttribute(formattedAtime);
-  						 	   	  timeZoneId		= (String) request.getSession().getAttribute(timeZoneId);
-						 	   	  answer			= (String) request.getSession().getAttribute(answer);
-						 	   	  
-								  request.setAttribute("fullName", fullName);
-						 	   	  request.setAttribute("attemptTime", attemptTime);
-						 	   	  request.setAttribute("formattedAtime", formattedAtime);
-						 	   	  request.setAttribute("timeZoneId", timeZoneId);
-						 	   	  request.setAttribute("answer", answer);
-						 	   	  request.setAttribute("currentLearnerFullname", currentLearnerFullname);
-								%>
-									<tr> 
-								   		<c:if test="${sessionScope.targetMode == 'Learning'}"> 			
+		<jsp:include page="singleLearnerReport.jsp" />
 
-											 <%								   		
-											   if ((fullName != null) && (!fullName.equalsIgnoreCase(currentLearnerFullname)))
-											   {
-											  %>
-												<td>  
-												  		<c:if test="${sessionScope.isUsernameVisible == 'false'}"> 			
-													  		&nbsp&nbsp&nbsp ( ) 
-												  		</c:if>
-												  		<c:if test="${sessionScope.isUsernameVisible == 'true'}"> 			
-															&nbsp&nbsp&nbsp  <c:out value="${requestScope.fullName}"/> 
-												  		</c:if>
-												  		
-												</td>  
-												<%}
-												else  if ((fullName != null) && (fullName.equalsIgnoreCase(currentLearnerFullname)))
-												 {%>
-												<td> 
-													&nbsp&nbsp&nbsp  <c:out value="${requestScope.fullName}"/> 
-												</td>  
-											 <%}
-											 	else  if ((fullName == null))
-												 {%>
-												<td>  
-												  		&nbsp&nbsp&nbsp ( )
-												</td>  
-											 <%}%>
-										</c:if>							
-								   		
-										
-										 <% if (fullName != null)
-										 	{
-										 %>
-										<c:if test="${sessionScope.targetMode == 'Monitoring'}"> 			
-											<td>  
-												&nbsp&nbsp&nbsp  <c:out value="${requestScope.fullName}"/> 
-											</td>  
-										</c:if>		
-										<%}%>					
+		<tr> <td> 
+			<c:out value="${sessionScope.endLearningMessage}"/>
+		</td> </tr>
+		
+		<tr> <td> 
+			&nbsp&nbsp&nbsp&nbsp
+		</td> </tr>
 
-										
-
-										 <% if (formattedAtime != null)
-										 	{
-										 %>
-											<td>  
-												&nbsp&nbsp&nbsp  
-												 <!-- <fmt:formatDate value="${requestScope.attemptTime}" type="both" timeStyle="long"/> -->
-												 <c:out value="${requestScope.formattedAtime}"/> 
-											</td>  
-										<%}%>					
-
-										 <% if (timeZoneId != null)
-										 	{
-										 %>
-											<td>  
-												&nbsp&nbsp&nbsp  <c:out value="${requestScope.timeZoneId}"/> 
-											</td>  
-										<%}%>					
-
-
-										 <% if (answer != null)
-										 	{
-										 %>
-											<td>  
-												&nbsp&nbsp&nbsp  <c:out value="${requestScope.answer}"/> 
-											</td>  
-										<%}%>					
-							  		</tr>	
-					  		</c:forEach>
-				  	  <tr><td> &nbsp </td> </tr>
-			</c:forEach>
-	</table>
-	</td> </tr>
-
-	<tr> <td> 
-		<c:out value="${sessionScope.endLearningMessage}"/>
-	</td> </tr>
-
-	<tr> <td>
-	<hr>
-	<table>
 		<tr>
 			 <td> 
 			 	 <html:submit property="endLearning" styleClass="linkbutton" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
@@ -149,10 +34,7 @@
 			</td> 
 		</tr>
 	</table>
-	</td> </tr>	
 
-
-</table>
 </html:form>
 	
 	
Index: lams_tool_laqa/web/monitoringReport.jsp
===================================================================
diff -u -r16e844de3f7c34b44baee1b28e67e708f42d00bf -r1213de28fa1704749c2b8cc7029667a5e944cef8
--- lams_tool_laqa/web/monitoringReport.jsp	(.../monitoringReport.jsp)	(revision 16e844de3f7c34b44baee1b28e67e708f42d00bf)
+++ lams_tool_laqa/web/monitoringReport.jsp	(.../monitoringReport.jsp)	(revision 1213de28fa1704749c2b8cc7029667a5e944cef8)
@@ -19,13 +19,13 @@
 		</table>
 	</c:if>						
 	
-	<c:if test="${requestScope.userExceptionWrongFormat 		!= 'true'  && 
-				  requestScope.userExceptionUncompatibleIds 	!= 'true'  && 
-				  requestScope.userExceptionContentDoesNotExist != 'true' &&
-				  requestScope.userExceptionUserIdNotNumeric 	!= 'true' &&
-				  requestScope.userExceptionUserIdNotAvailable 	!= 'true' &&				  				  
+	<c:if test="${requestScope.userExceptionWrongFormat 			!= 'true' && 
+				  requestScope.userExceptionUncompatibleIds 		!= 'true' && 
+				  requestScope.userExceptionContentDoesNotExist 	!= 'true' &&
+				  requestScope.userExceptionUserIdNotNumeric 		!= 'true' &&
+				  requestScope.userExceptionUserIdNotAvailable 		!= 'true' &&				  				  
 				  requestScope.userExceptionToolSessionDoesNotExist != 'true' &&				  
-				  requestScope.userExceptionNumberFormat 		!= true}"> 	
+				  requestScope.userExceptionNumberFormat 			!= true}"> 	
 		<!-- this form is exists temporarily to represent tool icon, remove this form once the tool is deployed into authoring environment -->
 		<html:form  action="/monitoring?method=generateToolSessionDataMap&validate=false" method="POST" target="_self">
 		
Index: lams_tool_laqa/web/portfolioReport.jsp
===================================================================
diff -u -r9d15b7d0b741f4f9a2f3f3a0f04c0d14c6f92795 -r1213de28fa1704749c2b8cc7029667a5e944cef8
--- lams_tool_laqa/web/portfolioReport.jsp	(.../portfolioReport.jsp)	(revision 9d15b7d0b741f4f9a2f3f3a0f04c0d14c6f92795)
+++ lams_tool_laqa/web/portfolioReport.jsp	(.../portfolioReport.jsp)	(revision 1213de28fa1704749c2b8cc7029667a5e944cef8)
@@ -5,15 +5,16 @@
 <%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %>
 
 
-	<c:if test="${requestScope.userExceptionUserIdNotNumeric 	== 'true' || 
-				requestScope.userExceptionUserIdNotAvailable 	== 'true' ||
-				requestScope.userExceptionModeRequired			== 'true' ||
-				requestScope.userExceptionNumberFormat 			== 'true' ||
-				requestScope.userExceptionToolSessionIdRequired	== 'true' ||
-				requestScope.userExceptionContentIdRequired		== 'true' ||
-				requestScope.userExceptionNoToolSessions		== 'true' ||
-				requestScope.userExceptionToolSessionDoesNotExist == 'true' ||
-				requestScope.userExceptionContentDoesNotExist	== 'true' }"> 	
+	<c:if test="${requestScope.userExceptionUserIdNotNumeric 		== 'true' || 
+				requestScope.userExceptionUserIdNotAvailable 		== 'true' ||
+				requestScope.userExceptionModeRequired				== 'true' ||
+				requestScope.userExceptionNumberFormat 				== 'true' ||
+				requestScope.userExceptionToolSessionIdRequired		== 'true' ||
+				requestScope.userExceptionContentIdRequired			== 'true' ||
+				requestScope.userExceptionNoToolSessions			== 'true' ||
+				requestScope.userExceptionUserDoesNotExist			== 'true' ||
+				requestScope.userExceptionToolSessionDoesNotExist 	== 'true' ||
+				requestScope.userExceptionContentDoesNotExist		== 'true' }"> 	
 		<table align=center> <!-- Dave to take off-->
 			<tr> <td class="error">   
 				<html:errors/>
@@ -29,13 +30,21 @@
 				  requestScope.userExceptionContentIdRequired	  	!= 'true' &&
 				  requestScope.userExceptionNoToolSessions		  	!= 'true' &&
   				  requestScope.userExceptionToolSessionDoesNotExist != 'true' &&
+  				  requestScope.userExceptionUserDoesNotExist		!= 'true' &&
 				  requestScope.userExceptionContentDoesNotExist   	!= 'true' 
 				}"> 	
-		<table align=center> <!-- Dave to take off-->
-				<jsp:include page="groupsReport.jsp" />	
-		</table>
+				
+		<c:if test="${sessionScope.targetMode 	== 'Monitoring'}">		
+			<table align=center> <!-- Dave to take off-->
+					<jsp:include page="groupsReport.jsp" />	
+			</table>
+		</c:if>						
+		<c:if test="${sessionScope.targetMode 	== 'Learning'}">		
+			<table align=center> <!-- Dave to take off-->
+				<jsp:include page="singleLearnerReport.jsp" />
+			</table>			
+		</c:if>						
 	</c:if>						
-		
-	
+			
 
 	
\ No newline at end of file
Index: lams_tool_laqa/web/singleLearnerReport.jsp
===================================================================
diff -u
--- lams_tool_laqa/web/singleLearnerReport.jsp	(revision 0)
+++ lams_tool_laqa/web/singleLearnerReport.jsp	(revision 1213de28fa1704749c2b8cc7029667a5e944cef8)
@@ -0,0 +1,122 @@
+<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
+<%@ 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" %>
+
+		<tr> <td>
+		<table>
+	 		<c:set var="queIndex" scope="request" value="0"/>
+			<c:forEach var="mainEntry" items="${sessionScope.mapMainReport}">
+				<c:set var="queIndex" scope="request" value="${queIndex +1}"/>
+					  	<tr>
+					  		<td colspan=2> <fmt:message key="label.question"/> <c:out value="${queIndex}"/> : <c:out value="${mainEntry.key}"/>
+					  	</tr>
+					  
+	  				 	<tr> 
+							 <td> &nbsp&nbsp&nbsp <fmt:message key="label.learning.user"/>	</td>  
+	  						 <td> &nbsp&nbsp&nbsp <fmt:message key="label.learning.attemptTime"/></td>
+ 	  						 <td> &nbsp&nbsp&nbsp <fmt:message key="label.learning.timezone"/></td>
+	  						 <td> &nbsp&nbsp&nbsp <fmt:message key="label.learning.response"/></td>
+			  			</tr>				 
+			  			
+							<c:set var="ansIndex" scope="request" value="0"/>
+					  		<c:forEach var="subEntry" items="${mainEntry.value}">
+								<c:set var="ansIndex" scope="request" value="${ansIndex +1}"/>
+								
+							  	<%String fullName	="fullName" + request.getAttribute("queIndex") + request.getAttribute("ansIndex");
+							  	  String aTime		="aTime" + request.getAttribute("queIndex") + request.getAttribute("ansIndex");
+							  	  String formattedAtime="formattedAtime" + request.getAttribute("queIndex") + request.getAttribute("ansIndex");
+							  	  String timeZoneId	="timeZoneId" + request.getAttribute("queIndex") + request.getAttribute("ansIndex");
+								  String answer		="answer" + request.getAttribute("queIndex") + request.getAttribute("ansIndex");
+							   	  String currentLearnerFullname=(String) request.getSession().getAttribute("currentLearnerFullname");
+							   	  								  
+								  fullName			= (String) request.getSession().getAttribute(fullName);
+						 	   	  java.util.Date attemptTime= (java.util.Date) request.getSession().getAttribute(aTime);
+						 	   	  formattedAtime 	=(String) request.getSession().getAttribute(formattedAtime);
+  						 	   	  timeZoneId		= (String) request.getSession().getAttribute(timeZoneId);
+						 	   	  answer			= (String) request.getSession().getAttribute(answer);
+						 	   	  
+								  request.setAttribute("fullName", fullName);
+						 	   	  request.setAttribute("attemptTime", attemptTime);
+						 	   	  request.setAttribute("formattedAtime", formattedAtime);
+						 	   	  request.setAttribute("timeZoneId", timeZoneId);
+						 	   	  request.setAttribute("answer", answer);
+						 	   	  request.setAttribute("currentLearnerFullname", currentLearnerFullname);
+								%>
+									<tr> 
+								   		<c:if test="${sessionScope.targetMode == 'Learning'}"> 			
+
+											 <%								   		
+											   if ((fullName != null) && (!fullName.equalsIgnoreCase(currentLearnerFullname)))
+											   {
+											  %>
+												<td>  
+												  		<c:if test="${sessionScope.isUsernameVisible == 'false'}"> 			
+													  		&nbsp&nbsp&nbsp ( ) 
+												  		</c:if>
+												  		<c:if test="${sessionScope.isUsernameVisible == 'true'}"> 			
+															&nbsp&nbsp&nbsp  <c:out value="${requestScope.fullName}"/> 
+												  		</c:if>
+												  		
+												</td>  
+												<%}
+												else  if ((fullName != null) && (fullName.equalsIgnoreCase(currentLearnerFullname)))
+												 {%>
+												<td> 
+													&nbsp&nbsp&nbsp  <c:out value="${requestScope.fullName}"/> 
+												</td>  
+											 <%}
+											 	else  if ((fullName == null))
+												 {%>
+												<td>  
+												  		&nbsp&nbsp&nbsp ( )
+												</td>  
+											 <%}%>
+										</c:if>							
+								   		
+										
+										 <% if (fullName != null)
+										 	{
+										 %>
+										<c:if test="${sessionScope.targetMode == 'Monitoring'}"> 			
+											<td>  
+												&nbsp&nbsp&nbsp  <c:out value="${requestScope.fullName}"/> 
+											</td>  
+										</c:if>		
+										<%}%>					
+
+										
+
+										 <% if (formattedAtime != null)
+										 	{
+										 %>
+											<td>  
+												&nbsp&nbsp&nbsp  
+												 <!-- <fmt:formatDate value="${requestScope.attemptTime}" type="both" timeStyle="long"/> -->
+												 <c:out value="${requestScope.formattedAtime}"/> 
+											</td>  
+										<%}%>					
+
+										 <% if (timeZoneId != null)
+										 	{
+										 %>
+											<td>  
+												&nbsp&nbsp&nbsp  <c:out value="${requestScope.timeZoneId}"/> 
+											</td>  
+										<%}%>					
+
+
+										 <% if (answer != null)
+										 	{
+										 %>
+											<td>  
+												&nbsp&nbsp&nbsp  <c:out value="${requestScope.answer}"/> 
+											</td>  
+										<%}%>					
+							  		</tr>	
+					  		</c:forEach>
+				  	  <tr><td> &nbsp </td> </tr>
+			</c:forEach>
+	</table>
+	</td> </tr>