Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
diff -u -r9c3a64b840753192b333afb73c8fe7bdb54be638 -rb1ee7c7d55795c2b920bef41137748a8a95873b6
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision 9c3a64b840753192b333afb73c8fe7bdb54be638)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision b1ee7c7d55795c2b920bef41137748a8a95873b6)
@@ -302,7 +302,7 @@
 		if (question.equals(confidenceLevelDto.getQuestion().replaceAll("(\\r|\\n)", ""))) {
 
 		    //find according answer
-		    for (ScratchieAnswer answer : (Set<ScratchieAnswer>) item.getAnswers()) {
+		    for (ScratchieAnswer answer : item.getAnswers()) {
 			String answerText = answer.getQbOption().getName().replaceAll("(\\r|\\n)", "");
 			if (answerText.equals(confidenceLevelDto.getAnswer().replaceAll("(\\r|\\n)", ""))) {
 			    answer.getConfidenceLevelDtos().add(confidenceLevelDto);
@@ -1179,7 +1179,7 @@
 	    // find out the correct answer's sequential letter - A,B,C...
 	    String correctAnswerLetter = "";
 	    int answerCount = 1;
-	    for (ScratchieAnswer answer : (Set<ScratchieAnswer>) item.getAnswers()) {
+	    for (ScratchieAnswer answer : item.getAnswers()) {
 		if (answer.getQbOption().isCorrect()) {
 		    correctAnswerLetter = String.valueOf((char) ((answerCount + 'A') - 1));
 		    break;
@@ -1803,7 +1803,7 @@
 	String sequencialLetter = "";
 
 	int answerCount = 1;
-	for (ScratchieAnswer answer : (Set<ScratchieAnswer>) item.getAnswers()) {
+	for (ScratchieAnswer answer : item.getAnswers()) {
 	    if (answer.getQbOption().getUid().equals(asnwer.getUid())) {
 		sequencialLetter = String.valueOf((char) ((answerCount + 'A') - 1));
 		break;
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
===================================================================
diff -u -rfba7287887f6dd83d3098100af6320cccf1f3e36 -rb1ee7c7d55795c2b920bef41137748a8a95873b6
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java	(.../TblMonitorController.java)	(revision fba7287887f6dd83d3098100af6320cccf1f3e36)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java	(.../TblMonitorController.java)	(revision b1ee7c7d55795c2b920bef41137748a8a95873b6)
@@ -41,6 +41,7 @@
 
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.qb.model.QbOption;
 import org.lamsfoundation.lams.tool.scratchie.ScratchieConstants;
 import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionDTO;
 import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionItemDTO;
@@ -168,8 +169,10 @@
 		    String correctAnswerLetter = correctAnswersRow[i].getCellValue().toString();
 
 		    ScratchieAnswer answer = new ScratchieAnswer();
-		    answer.getQbOption().setName(answerLetter);
-		    answer.getQbOption().setCorrect(correctAnswerLetter.equals(answerLetter));
+		    QbOption qbOption = new QbOption();
+		    answer.setQbOption(qbOption);
+		    qbOption.setName(answerLetter);
+		    qbOption.setCorrect(correctAnswerLetter.equals(answerLetter));
 
 		    answers.add(answer);
 		}
Index: lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp
===================================================================
diff -u -rfba7287887f6dd83d3098100af6320cccf1f3e36 -rb1ee7c7d55795c2b920bef41137748a8a95873b6
--- lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp	(.../itemSummary.jsp)	(revision fba7287887f6dd83d3098100af6320cccf1f3e36)
+++ lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp	(.../itemSummary.jsp)	(revision b1ee7c7d55795c2b920bef41137748a8a95873b6)
@@ -57,7 +57,7 @@
 	  				
 	  	   	        <c:forEach var="answer" items="${summary.answers}" varStatus="i">
 	  	   	     		jQuery("#session${summary.sessionId}").addRowData(${i.index + 1}, {
-	  	   	     			answer:"${answer.description}<c:if test='${answer.correct}'> (<fmt:message key='label.monitoring.item.summary.correct' />)</c:if>"
+	  	   	     			answer:"${answer.qbOption.name}<c:if test='${answer.qbOption.correct}'> (<fmt:message key='label.monitoring.item.summary.correct' />)</c:if>"
 	  	   	     			
 	  	   	     			<c:forEach var="j" begin="0" end="${fn:length(summary.answers)}">
 	  	   	     				,choice${j}:"${answer.attempts[j]}"
@@ -99,10 +99,11 @@
 		</c:set>
 		<lams:Page type="learning" title="${title}">
 		
-			<h3>
-				<c:out value="${item.description}" escapeXml="false"/>
-			</h3>	
-			<lams:errors/>
+			<h4>
+				<c:out value="${item.qbQuestion.name}" escapeXml="false"/>
+			</h4>
+			<c:out value="${item.qbQuestion.description}" escapeXml="false"/>
+			<br>
 			
 			<c:forEach var="summary" items="${summaryList}" varStatus="status">
 				<div class="panel panel-default" >
Index: lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp
===================================================================
diff -u -r0f2a9541ca3ef58a59337f32a5c375ae457c399c -rb1ee7c7d55795c2b920bef41137748a8a95873b6
--- lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp	(.../burningQuestions.jsp)	(revision 0f2a9541ca3ef58a59337f32a5c375ae457c399c)
+++ lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp	(.../burningQuestions.jsp)	(revision b1ee7c7d55795c2b920bef41137748a8a95873b6)
@@ -24,15 +24,15 @@
 					<c:choose>
 						<c:when test="${burningQsCount != 0}">
 							<a data-toggle="collapse" data-itemuid="${item.uid}" class="collapsed burning-question-title">
-								Q${i.index+1}) <c:out value="${item.title}" escapeXml="false"/>
+								Q${i.index+1}) <c:out value="${item.qbQuestion.name}" escapeXml="false"/>
 							</a>
 						</c:when>
 						<c:otherwise>
-							Q${i.index+1}) <c:out value="${item.title}" escapeXml="false"/> 
+							Q${i.index+1}) <c:out value="${item.qbQuestion.name}" escapeXml="false"/> 
 						</c:otherwise>
 					</c:choose>
 					<span class="burning-question-description">
-						<c:out value="${item.description}" escapeXml="false"/> 
+						<c:out value="${item.qbQuestion.description}" escapeXml="false"/> 
 					</span>
                     <c:if test="${burningQsCount > 0}">
 					   <span class="badge pull-right" style="margin-right: 4px">${burningQsCount}</span>
Index: lams_tool_scratchie/web/pages/tblmonitoring/teams.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb1ee7c7d55795c2b920bef41137748a8a95873b6
--- lams_tool_scratchie/web/pages/tblmonitoring/teams.jsp	(.../teams.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scratchie/web/pages/tblmonitoring/teams.jsp	(.../teams.jsp)	(revision b1ee7c7d55795c2b920bef41137748a8a95873b6)
@@ -6,7 +6,7 @@
 		<div class="panel-heading">
 			<h4 class="panel-title">
 				<span class="float-left space-right">Q${i.index+1})</span> 
-				<c:out value="${item.title}" escapeXml="false"/>
+				<c:out value="${item.qbQuestion.name}" escapeXml="false"/>
 			</h4> 
 		</div>
 				
@@ -22,10 +22,10 @@
 										${ALPHABET[j.index]}.
 									</td>
 									<td>
-										<c:out value="${answer.description}" escapeXml="false"/>
+										<c:out value="${answer.qbOption.name}" escapeXml="false"/>
 										
 										<c:choose>
-											<c:when test="${answer.correct}">
+											<c:when test="${answer.qbOption.correct}">
 												<i class="fa fa-check-square"></i>
 											</c:when>
 											<c:otherwise>
Index: lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp
===================================================================
diff -u -re7ba02fbd771cb86ff621168fed50bd21d00d0d1 -rb1ee7c7d55795c2b920bef41137748a8a95873b6
--- lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp	(.../tra.jsp)	(revision e7ba02fbd771cb86ff621168fed50bd21d00d0d1)
+++ lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp	(.../tra.jsp)	(revision b1ee7c7d55795c2b920bef41137748a8a95873b6)
@@ -78,7 +78,7 @@
 	<div class="panel panel-default">
 		<div class="panel-heading">
 			<h4 class="panel-title">
-				Q${i.index+1}) <c:out value="${item.description}" escapeXml="false"/>
+				Q${i.index+1}) <c:out value="${item.qbQuestion.description}" escapeXml="false"/>
 			</h4> 
 		</div>
 		
@@ -92,7 +92,7 @@
 									${ALPHABET[j.index]}.
 								</td>
 								<td>
-									<c:out value="${answer.description}" escapeXml="false"/>
+									<c:out value="${answer.qbOption.name}" escapeXml="false"/>
 								</td>
 							</tr>
 						</c:forEach>
Index: lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp
===================================================================
diff -u -re7ba02fbd771cb86ff621168fed50bd21d00d0d1 -rb1ee7c7d55795c2b920bef41137748a8a95873b6
--- lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp	(.../traStudentChoices.jsp)	(revision e7ba02fbd771cb86ff621168fed50bd21d00d0d1)
+++ lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp	(.../traStudentChoices.jsp)	(revision b1ee7c7d55795c2b920bef41137748a8a95873b6)
@@ -107,9 +107,9 @@
 							<c:forEach var="itemDto" items="${sessionDto.itemDtos}">
 								<td class="text-center">
 									<c:forEach var="answer" items="${itemDto.answers}">
-										<c:if test="${answer.description != ''}">
-											<span class="user-response <c:if test="${answer.correct}">successful-response</c:if> <c:if test="${!answer.correct}">wrong-response</c:if>">
-												<c:out value="${answer.description}"></c:out>
+										<c:if test="${answer.qbOption.name != ''}">
+											<span class="user-response <c:if test="${answer.qbOption.correct}">successful-response</c:if> <c:if test="${!answer.qbOption.correct}">wrong-response</c:if>">
+												<c:out value="${answer.qbOption.name}"></c:out>
 											</span>
 										</c:if>
 									</c:forEach>
@@ -144,26 +144,26 @@
 	
 		<div class="panel panel-default">
 			<div class="panel-heading">
-				<h4 class="panel-title"><span class="float-left space-right">Q${i.index+1})</span> ${item.title}</h4>
+				<h4 class="panel-title"><span class="float-left space-right">Q${i.index+1})</span> ${item.qbQuestion.name}</h4>
 			</div>
 			<div class="panel-body">
 			
 				<div>
-					${item.description}
+					${item.qbQuestion.description}
 				</div>
 			
 				<div class="table-responsive voffset10">
 					<table class="table table-striped table-hover">
 						<tbody>
 						
 							<c:forEach var="answer" items="${item.answers}" varStatus="j">
-								<c:set var="cssClass"><c:if test='${answer.correct}'>bg-success</c:if></c:set>
+								<c:set var="cssClass"><c:if test='${answer.qbOption.correct}'>bg-success</c:if></c:set>
 								<tr>
 									<td width="5px" class="${cssClass}">
 										${ALPHABET[j.index]}.
 									</td>
 									<td class="${cssClass}">
-										<c:out value="${answer.description}" escapeXml="false"/>
+										<c:out value="${answer.qbOption.name}" escapeXml="false"/>
 									</td>
 								</tr>
 							</c:forEach>