Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
===================================================================
diff -u -r1268ec552ee72a22db3a5df680d46de7db79e0c0 -rff37a5fb4bf9a24adde51ee67eb408f0790e128f
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java	(.../ScratchieItem.java)	(revision 1268ec552ee72a22db3a5df680d46de7db79e0c0)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java	(.../ScratchieItem.java)	(revision ff37a5fb4bf9a24adde51ee67eb408f0790e128f)
@@ -65,6 +65,8 @@
     private List<OptionDTO> optionDtos = null;
     @Transient
     private int mark;
+    @Transient
+    private String correctAnswerLetter;
 
     @Override
     public Object clone() {
@@ -121,4 +123,11 @@
 	this.mark = mark;
     }
 
+    public String getCorrectAnswerLetter() {
+	return correctAnswerLetter;
+    }
+
+    public void setCorrectAnswerLetter(String correctAnswerLetters) {
+	this.correctAnswerLetter = correctAnswerLetters;
+    }
 }
\ No newline at end of file
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
diff -u -r2db58f73e88ecef930d486c60cc53fb3fa483415 -rff37a5fb4bf9a24adde51ee67eb408f0790e128f
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision 2db58f73e88ecef930d486c60cc53fb3fa483415)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision ff37a5fb4bf9a24adde51ee67eb408f0790e128f)
@@ -1324,8 +1324,7 @@
     /**
      * Return list of correct AnswerLetters, one per each item
      */
-    public static List<String> getCorrectAnswerLetters(Collection<ScratchieItem> items) {
-	List<String> correctAnswerLetters = new ArrayList<>();
+    public static void fillCorrectAnswerLetters(Collection<ScratchieItem> items) {
 	for (ScratchieItem item : items) {
 	    boolean isMcqItem = item.getQbQuestion().getType() == QbQuestion.TYPE_MULTIPLE_CHOICE;
 
@@ -1347,10 +1346,8 @@
 		    correctAnswerLetter = options.get(0).isCorrect() ? "A" : "B";
 		}
 	    }
-	    correctAnswerLetters.add(correctAnswerLetter);
+	    item.setCorrectAnswerLetter(correctAnswerLetter);
 	}
-
-	return correctAnswerLetters;
     }
 
     @Override
@@ -1444,8 +1441,9 @@
 
 	row = reportByTeamSheet.initRow();
 	row.addCell(getMessage("label.correct.answer"));
-	for (String correctAnswerLetter : ScratchieServiceImpl.getCorrectAnswerLetters(items)) {
-	    row.addCell(correctAnswerLetter);
+	ScratchieServiceImpl.fillCorrectAnswerLetters(items);
+	for (ScratchieItem item : items) {
+	    row.addCell(item.getCorrectAnswerLetter());
 	}
 
 	row = reportByTeamSheet.initRow();
@@ -1967,11 +1965,11 @@
 
 	Set<ScratchieItem> items = new TreeSet<>(new ScratchieItemComparator());
 	items.addAll(scratchie.getScratchieItems());
-	model.put("items", items);
+	List<ScratchieItem> itemList = new LinkedList<>(items);
+	model.put("items", itemList);
 
 	//correct answers row
-	List<String> correctAnswerLetters = ScratchieServiceImpl.getCorrectAnswerLetters(items);
-	model.put("correctAnswerLetters", correctAnswerLetters);
+	ScratchieServiceImpl.fillCorrectAnswerLetters(itemList);
 
 	Map<String, ScratchieSession> sessionsByName = scratchieSessionDao.getByContentId(scratchie.getContentId())
 		.stream().filter(s -> s.getGroupLeader() != null)
@@ -1993,7 +1991,7 @@
 		List<OptionDTO> optionDtos = new LinkedList<>();
 		for (int j = 0; j < optionLetters.length; j++) {
 		    String optionLetter = optionLetters[j];
-		    String correctOptionLetter = correctAnswerLetters.get(i);
+		    String correctOptionLetter = itemList.get(i).getCorrectAnswerLetter();
 
 		    OptionDTO optionDto = new OptionDTO();
 		    optionDto.setAnswer(optionLetter);
Index: lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp
===================================================================
diff -u -r3c3e6d09ccfbfd0b279a5c2a0363d482d2eb77d4 -rff37a5fb4bf9a24adde51ee67eb408f0790e128f
--- lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp	(.../studentChoices.jsp)	(revision 3c3e6d09ccfbfd0b279a5c2a0363d482d2eb77d4)
+++ lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp	(.../studentChoices.jsp)	(revision ff37a5fb4bf9a24adde51ee67eb408f0790e128f)
@@ -38,6 +38,10 @@
 	  color: white;
 	  border-radius: 3px; }
 	
+	span.user-response .fa, .question-detail-modal .fa {
+	  cursor: default;
+	}
+	
 	span.successful-response {
 	  background-color: #5cb85c; }
 	
@@ -128,9 +132,11 @@
 						<fmt:message key="label.correct.answer"/>
 					</b>
 				</th>
-				<c:forEach var="correctAnswerLetter"  items="${correctAnswerLetters}" varStatus="status">
+				<c:forEach var="item" items="${items}">
 					<td class="text-center">
-						${correctAnswerLetter}
+						<c:if test="${item.qbQuestion.type == 1}">
+							${item.correctAnswerLetter}
+						</c:if>
 					</td>
 				</c:forEach>
 				
@@ -152,7 +158,7 @@
 						<c:if test="${not showStudentChoicesTableOnly or sessionMap.isGroupedActivity}">
 							<c:choose>
 								<c:when test="${empty sessionDto.leaderUid}">
-							${sessionDto.sessionName}
+									{sessionDto.sessionName}
 								</c:when>
 								<c:otherwise>
 									<c:url var="userSummaryUrl" value='/learning/start.do'>
@@ -180,7 +186,14 @@
 									<c:forEach var="optionDto" items="${itemDto.optionDtos}">
 										<c:if test="${optionDto.answer != ''}">
 											<span class="user-response <c:if test="${optionDto.correct}">successful-response</c:if> <c:if test="${!optionDto.correct}">wrong-response</c:if>">
-												<c:out value="${optionDto.answer}" escapeXml="${!optionDto.mcqType}"/>
+												<c:choose>
+													<c:when test="${itemDto.type == 1}">
+														<c:out value="${optionDto.answer}" escapeXml="false"/>
+													</c:when>
+													<c:when test="${optionDto.correct}"><i class="fa fa-check"></i></c:when>
+													<c:otherwise><i class="fa fa-close"></i></c:otherwise>
+												</c:choose>
+												
 											</span>
 										</c:if>
 									</c:forEach>
@@ -209,7 +222,7 @@
 
 <!-- Question detail modal -->
 <c:forEach var="item" items="${items}" varStatus="i">
-	<div class="modal fade" id="question${i.index}Modal">
+	<div class="modal fade question-detail-modal" id="question${i.index}Modal">
 	<div class="modal-dialog">
 	<div class="modal-content">
 	<div class="modal-body">
@@ -230,24 +243,34 @@
 						
 							<c:forEach var="qbOption" items="${item.qbQuestion.qbOptions}" varStatus="j">
 								<c:set var="cssClass"><c:if test='${qbOption.correct}'>bg-success</c:if></c:set>
-								
-								<tr>
-									<td width="5px" class="${cssClass}">
-										${ALPHABET[j.index]}.
-									</td>									
-									<td class="${cssClass}">
+									<tr>
 										<c:choose>
 											<c:when test="${item.qbQuestion.type == 1}">
-												<c:out value="${qbOption.name}" escapeXml="false"/>
+												<td width="5px" class="${cssClass}">
+													${ALPHABET[j.index]}.
+												</td>
+												<td class="${cssClass}">
+													<c:out value="${qbOption.name}" escapeXml="false"/>
+												</td>
 											</c:when>
 											<c:otherwise>
-												${fn:replace(qbOption.name, newLineChar, ', ')}
+												<td width="5px" class="${cssClass}">
+													<c:choose>
+														<c:when test="${qbOption.correct}">
+															<i class="fa fa-check"></i>
+														</c:when>
+														<c:otherwise>
+															<i class="fa fa-close"></i>
+														</c:otherwise>
+													</c:choose>
+												</td>
+												<td class="${cssClass}">
+													${fn:replace(qbOption.name, newLineChar, ', ')}
+												</td>
 											</c:otherwise>
 										</c:choose>
-									</td>
-								</tr>					
+									</tr>
 							</c:forEach>
-							
 						</tbody>
 					</table>
 				</div>
Index: lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp
===================================================================
diff -u -re4ab7517268533520c11b8cb076abd74d7721d89 -rff37a5fb4bf9a24adde51ee67eb408f0790e128f
--- lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp	(.../tra.jsp)	(revision e4ab7517268533520c11b8cb076abd74d7721d89)
+++ lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp	(.../tra.jsp)	(revision ff37a5fb4bf9a24adde51ee67eb408f0790e128f)
@@ -94,20 +94,33 @@
 				<table class="table table-striped">
 					<tbody>
 						<c:forEach var="qbOption" items="${item.qbQuestion.qbOptions}" varStatus="j">
+							<c:set var="cssClass"><c:if test='${qbOption.correct}'>bg-success</c:if></c:set>
 							<tr>
-								<td width="5px">
-									${ALPHABET[j.index]}.
-								</td>									
-								<td>
-									<c:choose>
-										<c:when test="${item.qbQuestion.type == 1}">
+								<c:choose>
+									<c:when test="${item.qbQuestion.type == 1}">
+										<td width="5px" class="${cssClass}">
+											${ALPHABET[j.index]}.
+										</td>
+										<td class="${cssClass}">
 											<c:out value="${qbOption.name}" escapeXml="false"/>
-										</c:when>
-										<c:otherwise>
+										</td>
+									</c:when>
+									<c:otherwise>
+										<td width="5px" class="${cssClass}">
+											<c:choose>
+												<c:when test="${qbOption.correct}">
+													<i class="fa fa-check"></i>
+												</c:when>
+												<c:otherwise>
+													<i class="fa fa-close"></i>
+												</c:otherwise>
+											</c:choose>
+										</td>
+										<td class="${cssClass}">
 											${fn:replace(qbOption.name, newLineChar, ', ')}
-										</c:otherwise>
-									</c:choose>
-								</td>
+										</td>
+									</c:otherwise>
+								</c:choose>
 							</tr>					
 						</c:forEach>
 					</tbody>
Fisheye: Tag ff37a5fb4bf9a24adde51ee67eb408f0790e128f refers to a dead (removed) revision in file `lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?