Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
===================================================================
diff -u -r823871bf3fd2d695c40bc974a24e66b4100d731b -r5ea8d7c50cb8fb41465061d8f5f3eade1d9fb179
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	(.../QaLearningStarterAction.java)	(revision 823871bf3fd2d695c40bc974a24e66b4100d731b)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	(.../QaLearningStarterAction.java)	(revision 5ea8d7c50cb8fb41465061d8f5f3eade1d9fb179)
@@ -308,9 +308,13 @@
     	while (contentIterator.hasNext())
     	{
     		QaQueContent qaQueContent=(QaQueContent)contentIterator.next();
+    		logger.debug("qaQueContent: " + qaQueContent);
+    		logger.debug("question: " + qaQueContent.getQuestion());
     		if (qaQueContent != null)
     		{
     			int displayOrder=qaQueContent.getDisplayOrder();
+    			logger.debug("displayOrder: " + displayOrder);
+    			
         		if (displayOrder != 0)
         		{
         			/*
@@ -320,21 +324,22 @@
         		}
     		}
     	}
+    	logger.debug("mapQuestions: " + mapQuestions);
+    	generalLearnerFlowDTO.setMapQuestions(mapQuestions);
+    	generalLearnerFlowDTO.setMapQuestionContentLearner(mapQuestions);
 		
-    	mapAnswers=mapQuestions;
-    	Iterator itMap = mapAnswers.entrySet().iterator();
+    	Iterator itMapQuestions = mapQuestions.entrySet().iterator();
     	
-    	while (itMap.hasNext()) 
+    	while (itMapQuestions.hasNext()) 
     	{
-        	Map.Entry pairs = (Map.Entry)itMap.next();
-            pairs.setValue("");
+        	Map.Entry pairs = (Map.Entry)itMapQuestions.next();
+        	mapAnswers.put(pairs.getKey(), "");
+
     	}
     	logger.debug("mapAnswers : " + mapAnswers);
-    	
-    	
     	generalLearnerFlowDTO.setMapAnswers(mapAnswers);
-    	generalLearnerFlowDTO.setMapQuestionContentLearner(mapQuestions);
-    	generalLearnerFlowDTO.setMapQuestions(mapQuestions);
+    	logger.debug("mapQuestions: " + mapQuestions);
+
     	logger.debug("mapQuestions has : " + mapQuestions.size() + " entries.");
     	
     	generalLearnerFlowDTO.setTotalQuestionCount(new Integer(mapQuestions.size()));
Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp
===================================================================
diff -u -r9c4928c6239819759ecc6682ff954ffe5d6200fb -r5ea8d7c50cb8fb41465061d8f5f3eade1d9fb179
--- lams_tool_laqa/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 9c4928c6239819759ecc6682ff954ffe5d6200fb)
+++ lams_tool_laqa/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 5ea8d7c50cb8fb41465061d8f5f3eade1d9fb179)
@@ -95,12 +95,14 @@
 	  	 									<c:if test="${currentQuestionId == userData.questionUid}"> 			
 													<c:if test="${qaGeneralMonitoringDTO.editResponse != 'true'}">	  	 									 			
 														<tr> 
-															 <td  valign=top>   <c:out value="${userData.userName}"/>   </td>  
+															 <td  valign=top>  <c:out value="${userData.userName}"/>   </td>  
 															 <td  valign=top>   <lams:Date value="${userData.attemptTime}"/> </td>														 
 															 
-															  <td align=right valign=top> 
+															  <td align=right valign=top width="150"> 
 																<b> <bean:message key="label.edit"/> </b>
-																<img src="<c:out value="${tool}"/>images/edit.gif" align=left onclick="javascript:submitEditResponse('<c:out value="${userData.uid}"/>','editResponse');">	 																
+																<a title="<bean:message key='label.tooltip.edit'/>" href="javascript:;" onclick="javascript:submitEditResponse('<c:out value="${userData.uid}"/>','editResponse');">
+							                                                <img src="<c:out value="${tool}"/>images/edit.gif" border="0">
+																</a> 
 															  </td>
 
 		   													 <td align=right valign=top> 				 
@@ -137,12 +139,15 @@
 													<c:if test="${qaGeneralMonitoringDTO.editResponse == 'true'}">	  	
 														<c:if test="${editableResponseId == responseUid}">	  	 									 			
 															<tr> 
-																 <td valign=top>   <c:out value="${userData.userName}"/>   </td>  
+																 <td valign=top>  <c:out value="${userData.userName}"/>   </td>  
 																 <td valign=top>   <lams:Date value="${userData.attemptTime}"/> </td>														 
 													
-																  <td align=right valign=top>  
+																  <td align=right valign=top width="150">  
 																  	<b> <bean:message key="label.save"/> </b>
-																  	<img src="<c:out value="${tool}"/>images/tick.gif" align=left onclick="javascript:submitEditResponse('<c:out value="${userData.uid}"/>','updateResponse');">	
+
+																	<a title="<bean:message key='label.tooltip.tick'/>" href="javascript:;" onclick="javascript:submitEditResponse('<c:out value="${userData.uid}"/>','updateResponse');">
+								                                                <img src="<c:out value="${tool}"/>images/tick.gif" border="0">
+																	</a> 
 																  </td>	  	 																	
 													
 
@@ -180,12 +185,14 @@
 
 														<c:if test="${editableResponseId != responseUid}">	  	 									 			
 															<tr> 
-																 <td valign=top>   <c:out value="${userData.userName}"/>   </td>  
+																 <td valign=top>  <c:out value="${userData.userName}"/>   </td>  
 																 <td valign=top>   <lams:Date value="${userData.attemptTime}"/> </td>														 
 
-																  <td align=right valign=top> 
+																  <td align=right valign=top width="150"> 
 																	 <b> <bean:message key="label.edit"/> </b>
-																	<img src="<c:out value="${tool}"/>images/edit.gif" align=left onclick="javascript:submitEditResponse('<c:out value="${userData.uid}"/>','editResponse');">	
+																	<a title="<bean:message key='label.tooltip.edit'/>" href="javascript:;" onclick="javascript:submitEditResponse('<c:out value="${userData.uid}"/>','editResponse');">
+								                                                <img src="<c:out value="${tool}"/>images/edit.gif" border="0">
+																	</a> 
 																  </td>	  	 
 
 			   													 <td align=right valign=top> 				 
@@ -212,7 +219,7 @@
 																	<c:if test="${userData.visible != 'true' }"> 			
 														                         <i><bean:message key="label.response.hidden"/> </i> 
 																	</c:if> 								
-																	<input type="text" name="updatedResponse" value='<c:out value="${userData.response}"/>'> 																	 
+																	 <c:out value="${userData.response}"/> 
 																 </td>
 															</tr>