Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java
===================================================================
diff -u -ra0a9178bf6d243c07a461753a4434fb1f997142a -re743566518bd5c53d6574987565cfb8581a92c66
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java	(.../DokumaranUserDAOHibernate.java)	(revision a0a9178bf6d243c07a461753a4434fb1f997142a)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java	(.../DokumaranUserDAOHibernate.java)	(revision e743566518bd5c53d6574987565cfb8581a92c66)
@@ -77,6 +77,7 @@
 	return this.doFind(FIND_BY_SESSION_ID, sessionId);
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public List<DokumaranUser> getLeadersBySessionId(Long sessionId) {
 	return this.doFind(FIND_LEADERS_BY_SESSION_ID, sessionId);
Index: lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r3c3e6d09ccfbfd0b279a5c2a0363d482d2eb77d4 -re743566518bd5c53d6574987565cfb8581a92c66
--- lams_tool_scratchie/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 3c3e6d09ccfbfd0b279a5c2a0363d482d2eb77d4)
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e743566518bd5c53d6574987565cfb8581a92c66)
@@ -269,5 +269,7 @@
 label.authoring.advanced.question.etherpad = Include discussion pad for questions
 label.etherpad.discussion = Discussion
 label.options.show = Show question options
+label.authoring.advanced.question.etherpad = Include discussion pad for questions
+label.etherpad.discussion = Discussion
 
 #======= End labels: Exported 260 labels for en AU =====
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
===================================================================
diff -u -r2e61eefa786c0411376091c504812a8931395186 -re743566518bd5c53d6574987565cfb8581a92c66
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java	(.../IScratchieService.java)	(revision 2e61eefa786c0411376091c504812a8931395186)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java	(.../IScratchieService.java)	(revision e743566518bd5c53d6574987565cfb8581a92c66)
@@ -326,7 +326,7 @@
      *            whether it should include questions that don't have any burning questions
      * @return
      */
-    List<BurningQuestionItemDTO> getBurningQuestionDtos(Scratchie scratchie, Long sessionId, boolean includeEmptyItems);
+    List<BurningQuestionItemDTO> getBurningQuestionDtos(Scratchie scratchie, Long sessionId, boolean includeEmptyItems, boolean prepareForHTML);
 
     boolean addLike(Long burningQuestionUid, Long sessionId);
 
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
diff -u -r3c3e6d09ccfbfd0b279a5c2a0363d482d2eb77d4 -re743566518bd5c53d6574987565cfb8581a92c66
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision 3c3e6d09ccfbfd0b279a5c2a0363d482d2eb77d4)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision e743566518bd5c53d6574987565cfb8581a92c66)
@@ -1168,7 +1168,7 @@
 
     @Override
     public List<BurningQuestionItemDTO> getBurningQuestionDtos(Scratchie scratchie, Long sessionId,
-	    boolean includeEmptyItems) {
+	    boolean includeEmptyItems, boolean prepareForHTML) {
 
 	Set<ScratchieItem> items = new TreeSet<>(new ScratchieItemComparator());
 	items.addAll(scratchie.getScratchieItems());
@@ -1230,8 +1230,11 @@
 		String escapedSessionName = StringEscapeUtils.escapeJavaScript(burningQuestionDto.getSessionName());
 		burningQuestionDto.setSessionName(escapedSessionName);
 
-		String escapedBurningQuestion = StringEscapeUtils
-			.escapeJavaScript(burningQuestionDto.getBurningQuestion().getQuestion());
+		String escapedBurningQuestion = burningQuestionDto.getBurningQuestion().getQuestion();
+		if (prepareForHTML) {
+		    escapedBurningQuestion = escapedBurningQuestion.replaceAll("\n", "<br>");
+		}
+		escapedBurningQuestion = StringEscapeUtils.escapeJavaScript(escapedBurningQuestion);
 		burningQuestionDto.setEscapedBurningQuestion(escapedBurningQuestion);
 	    }
 	}
@@ -1891,7 +1894,7 @@
 	    row.addCell(getMessage("label.burning.questions"), IndexedColors.BLUE);
 	    row.addCell(getMessage("label.count"), IndexedColors.BLUE);
 
-	    List<BurningQuestionItemDTO> burningQuestionItemDtos = getBurningQuestionDtos(scratchie, null, true);
+	    List<BurningQuestionItemDTO> burningQuestionItemDtos = getBurningQuestionDtos(scratchie, null, true, false);
 	    int index = 1;
 	    for (BurningQuestionItemDTO burningQuestionItemDto : burningQuestionItemDtos) {
 		ScratchieItem item = burningQuestionItemDto.getScratchieItem();
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
===================================================================
diff -u -rcb6c263502cb557374502608fd07cc8c317d22c7 -re743566518bd5c53d6574987565cfb8581a92c66
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java	(.../LearningController.java)	(revision cb6c263502cb557374502608fd07cc8c317d22c7)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java	(.../LearningController.java)	(revision e743566518bd5c53d6574987565cfb8581a92c66)
@@ -585,7 +585,7 @@
 	// display other groups' BurningQuestions
 	if (isBurningQuestionsEnabled) {
 	    List<BurningQuestionItemDTO> burningQuestionItemDtos = scratchieService.getBurningQuestionDtos(scratchie,
-		    toolSessionId, true);
+		    toolSessionId, true, true);
 	    request.setAttribute(ScratchieConstants.ATTR_BURNING_QUESTION_ITEM_DTOS, burningQuestionItemDtos);
 	}
 
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
===================================================================
diff -u -r3a4e0fbc4b00ff567f1dc7561cf9596fedab7c8e -re743566518bd5c53d6574987565cfb8581a92c66
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 3a4e0fbc4b00ff567f1dc7561cf9596fedab7c8e)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision e743566518bd5c53d6574987565cfb8581a92c66)
@@ -132,7 +132,7 @@
 	// Create BurningQuestionsDtos if BurningQuestions is enabled.
 	if (scratchie.isBurningQuestionsEnabled()) {
 	    List<BurningQuestionItemDTO> burningQuestionItemDtos = scratchieService.getBurningQuestionDtos(scratchie,
-		    null, true);
+		    null, true, true);
 	    sessionMap.put(ScratchieConstants.ATTR_BURNING_QUESTION_ITEM_DTOS, burningQuestionItemDtos);
 	}
 
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
===================================================================
diff -u -rac33d20fb7883183fe443062a74f163abc98f012 -re743566518bd5c53d6574987565cfb8581a92c66
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java	(.../TblMonitorController.java)	(revision ac33d20fb7883183fe443062a74f163abc98f012)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java	(.../TblMonitorController.java)	(revision e743566518bd5c53d6574987565cfb8581a92c66)
@@ -183,7 +183,7 @@
 	//find available burningQuestionDtos, if any
 	if (scratchie.isBurningQuestionsEnabled()) {
 	    List<BurningQuestionItemDTO> burningQuestionItemDtos = scratchieService.getBurningQuestionDtos(scratchie,
-		    null, true);
+		    null, true, true);
 
 	    //unescape previously escaped session names
 	    for (BurningQuestionItemDTO burningQuestionItemDto : burningQuestionItemDtos) {
Index: lams_tool_scratchie/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r3a4e0fbc4b00ff567f1dc7561cf9596fedab7c8e -re743566518bd5c53d6574987565cfb8581a92c66
--- lams_tool_scratchie/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 3a4e0fbc4b00ff567f1dc7561cf9596fedab7c8e)
+++ lams_tool_scratchie/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision e743566518bd5c53d6574987565cfb8581a92c66)
@@ -138,6 +138,7 @@
 				height: 'auto',
 				autowidth: true,
 				shrinkToFit: false,
+				autoencode: false,
 				guiStyle: "bootstrap",
 				iconSet: 'fontAwesome',
 			   	colNames:['#',
Index: lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp
===================================================================
diff -u -r3c3e6d09ccfbfd0b279a5c2a0363d482d2eb77d4 -re743566518bd5c53d6574987565cfb8581a92c66
--- lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp	(.../burningQuestions.jsp)	(revision 3c3e6d09ccfbfd0b279a5c2a0363d482d2eb77d4)
+++ lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp	(.../burningQuestions.jsp)	(revision e743566518bd5c53d6574987565cfb8581a92c66)
@@ -111,15 +111,14 @@
 							<fmt:message key='label.options.show' />
 						</a>
 						<div  id="options-${item.uid}" class="table-responsive" style="display: none">
-							<table class="table table-striped table-bordered table-hover">
-								<tr>
-									<th>
-										<fmt:message key='label.scratchie.options' />
-									</th>
-								</tr>
+							<table class="table table-striped table-hover">
 								<c:forEach var="answer" items="${item.qbQuestion.qbOptions}">
+									<c:set var="cssClass"><c:if test='${answer.correct}'>bg-success</c:if></c:set>
 									<tr>
-										<td>
+										<td width="5px" class="${cssClass}">
+											${ALPHABET[j.index]}.
+										</td>
+										<td class="${cssClass}">
 											<c:out value="${answer.name}" escapeXml="false"/> 
 										</td>
 									</tr>