Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java
===================================================================
diff -u -r42e6c9c7220f8baf3b245d73b57aca9be08191ea -re2f4b14e2d8f0ef1feef10abdc21f3d446fca2a5
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java	(.../ScratchieBurningQuestionDAOHibernate.java)	(revision 42e6c9c7220f8baf3b245d73b57aca9be08191ea)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java	(.../ScratchieBurningQuestionDAOHibernate.java)	(revision e2f4b14e2d8f0ef1feef10abdc21f3d446fca2a5)
@@ -45,9 +45,6 @@
     private static final String FIND_BY_SESSION = "from " + ScratchieBurningQuestion.class.getName()
 	    + " as r where r.sessionId=?";
 
-    private static final String FIND_BY_ITEM_UID = "from " + ScratchieBurningQuestion.class.getName()
-	    + " as r where r.scratchieItem.uid=? order by r.sessionId asc";
-
     @Override
     @SuppressWarnings("unchecked")
     public List<BurningQuestionDTO> getBurningQuestionsByContentId(Long scratchieUid, Long sessionId) {
@@ -90,6 +87,9 @@
 	    if (sessionId != null) {
 		boolean userLiked = (Integer) rawObject[3] == 1;
 		burningQuestionDTO.setUserLiked(userLiked);
+		
+		//sets whether the leader of specified group created this burningQuestion
+		burningQuestionDTO.setUserAuthor(sessionId.equals(burningQuestion.getSessionId()));
 	    }
 	    burningQuestionDTO.setSessionName(sessionName);
 	    results.add(burningQuestionDTO);
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/BurningQuestionDTO.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -re2f4b14e2d8f0ef1feef10abdc21f3d446fca2a5
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/BurningQuestionDTO.java	(.../BurningQuestionDTO.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/BurningQuestionDTO.java	(.../BurningQuestionDTO.java)	(revision e2f4b14e2d8f0ef1feef10abdc21f3d446fca2a5)
@@ -31,7 +31,10 @@
     private String sessionName;
 
     private Integer likeCount;
+    //whether the leader of specified group liked this burningQuestion
     private boolean userLiked;
+    //whether the leader of specified group created this burningQuestion
+    private boolean userAuthor;
 
     public ScratchieBurningQuestion getBurningQuestion() {
 	return burningQuestion;
@@ -72,4 +75,15 @@
     public void setUserLiked(boolean userLiked) {
 	this.userLiked = userLiked;
     }
+    
+    /**
+     * @return whether the leader of specified group created this burningQuestion
+     */
+    public boolean isUserAuthor() {
+	return userAuthor;
+    }
+
+    public void setUserAuthor(boolean userAuthor) {
+	this.userAuthor = userAuthor;
+    }
 }
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
diff -u -r3d40a7e98de7bcd2cb744cdb8dc13c0022fb7bdb -re2f4b14e2d8f0ef1feef10abdc21f3d446fca2a5
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision 3d40a7e98de7bcd2cb744cdb8dc13c0022fb7bdb)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision e2f4b14e2d8f0ef1feef10abdc21f3d446fca2a5)
@@ -944,7 +944,7 @@
 	    }
 	}
 	generalBurningQuestionItemDto.setBurningQuestionDtos(burningQuestionDtosOfSpecifiedItem);
-	//don't display general burning question if it's empty and such rule is enforced
+	//skip empty item if required
 	if (!burningQuestionDtosOfSpecifiedItem.isEmpty() || includeEmptyItems) {
 	    burningQuestionItemDtos.add(generalBurningQuestionItemDto);
 	}
@@ -956,7 +956,7 @@
 		burningQuestionDto.setSessionName(escapedSessionName);
 
 		String escapedBurningQuestion = StringEscapeUtils.escapeJavaScript(
-			burningQuestionDto.getBurningQuestion().getQuestion().replaceAll("\\n", "<br>"));
+			burningQuestionDto.getBurningQuestion().getQuestion());
 		burningQuestionDto.setEscapedBurningQuestion(escapedBurningQuestion);
 	    }
 	}
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
===================================================================
diff -u -r3d40a7e98de7bcd2cb744cdb8dc13c0022fb7bdb -re2f4b14e2d8f0ef1feef10abdc21f3d446fca2a5
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	(.../LearningAction.java)	(revision 3d40a7e98de7bcd2cb744cdb8dc13c0022fb7bdb)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	(.../LearningAction.java)	(revision e2f4b14e2d8f0ef1feef10abdc21f3d446fca2a5)
@@ -40,6 +40,7 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.Action;
@@ -111,6 +112,9 @@
 	if (param.equals("showResults")) {
 	    return showResults(mapping, form, request, response);
 	}
+	if (param.equals("editBurningQuestion")) {
+	    return editBurningQuestion(mapping, form, request, response);
+	}
 	if (param.equals("like")) {
 	    return like(mapping, form, request, response);
 	}
@@ -513,7 +517,27 @@
 
 	return mapping.findForward(ScratchieConstants.SUCCESS);
     }
+    
+    /**
+     * Saves newly entered burning question. Used by jqGrid cellediting feature.
+     */
+    private ActionForward editBurningQuestion(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
 
+	if (!StringUtils.isEmpty(request.getParameter(ScratchieConstants.ATTR_ITEM_UID))
+		&& !StringUtils.isEmpty(request.getParameter(ScratchieConstants.PARAM_SESSION_ID))) {
+	    initializeScratchieService();
+
+	    Long itemUid = WebUtil.readLongParam(request, ScratchieConstants.ATTR_ITEM_UID) == 0 ? null
+		    : WebUtil.readLongParam(request, ScratchieConstants.ATTR_ITEM_UID);
+	    Long sessionId = WebUtil.readLongParam(request, ScratchieConstants.PARAM_SESSION_ID);
+	    String question = request.getParameter(ScratchieConstants.ATTR_BURNING_QUESTION_PREFIX);
+	    service.saveBurningQuestion(sessionId, itemUid, question);
+	}
+
+	return null;
+    }
+
     private ActionForward like(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response)
 	    throws JSONException, IOException, ServletException, ScratchieApplicationException {
Index: lams_tool_scratchie/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r868cbadb5ccd51c7172a97cfd02b31edbaa9d97a -re2f4b14e2d8f0ef1feef10abdc21f3d446fca2a5
--- lams_tool_scratchie/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 868cbadb5ccd51c7172a97cfd02b31edbaa9d97a)
+++ lams_tool_scratchie/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision e2f4b14e2d8f0ef1feef10abdc21f3d446fca2a5)
@@ -224,6 +224,10 @@
 			parameter="showResults" >
 			<forward name="success" path="/pages/learning/results.jsp" />		
 		</action>
+		<action path="/learning/editBurningQuestion"
+			type="org.lamsfoundation.lams.tool.scratchie.web.action.LearningAction"
+			parameter="editBurningQuestion" >
+		</action>
 		<action path="/learning/finish"
 			type="org.lamsfoundation.lams.tool.scratchie.web.action.LearningAction"
 			input="/pages/learning/learning.jsp"
Index: lams_tool_scratchie/web/pages/learning/results.jsp
===================================================================
diff -u -r97c904db50165d55330d46cf940debea735ea16e -re2f4b14e2d8f0ef1feef10abdc21f3d446fca2a5
--- lams_tool_scratchie/web/pages/learning/results.jsp	(.../results.jsp)	(revision 97c904db50165d55330d46cf940debea735ea16e)
+++ lams_tool_scratchie/web/pages/learning/results.jsp	(.../results.jsp)	(revision e2f4b14e2d8f0ef1feef10abdc21f3d446fca2a5)
@@ -18,30 +18,31 @@
 <lams:head>
 	<title><fmt:message key="label.learning.title" /></title>
 	<%@ include file="/common/header.jsp"%>
-	
-	<link type="text/css" href="${lams}css/jquery-ui-smoothness-theme.css" rel="stylesheet">
-	<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
+
+	<link type="text/css" href="<lams:LAMSURL/>css/free.ui.jqgrid.min.css" rel="stylesheet">
 	<link rel="stylesheet" href="<lams:LAMSURL />/includes/font-awesome/css/font-awesome.min.css">
-	<style media="screen,projection" type="text/css">
+	<style type="text/css">
 		#reflections-div {
-			padding: 10px 0 20px;
+			padding-bottom: 20px;
 		}
 		.burning-question-dto {
 			padding-bottom: 5px; 
 		}
-		.ui-jqgrid tr.jqgrow td {
-		    white-space: normal !important;
-		    height:auto;
-		    vertical-align:text-top;
-		    padding-top:2px;
-		}
-		.ui-jqgrid tr.jqgrow td {
-			vertical-align:middle !important
-		}
+	    .ui-jqgrid tr.jqgrow td {
+	        word-wrap: break-word; /* IE 5.5+ and CSS3 */
+	        white-space: pre-wrap; /* CSS3 */
+	        white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
+	        white-space: -pre-wrap; /* Opera 4-6 */
+	        white-space: -o-pre-wrap; /* Opera 7 */
+	        overflow: hidden;
+	        height: auto;
+	        vertical-align: middle;
+	        padding-top: 3px;
+	        padding-bottom: 3px
+	    }
 	</style>
 
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/free.jquery.jqgrid.min.js"></script>
 	<script type="text/javascript">
 		function likeEntry(scratchieItemUid, rowid, burningQuestionUid) {
 			
@@ -108,28 +109,48 @@
 					height: 'auto',
 					autowidth: true,
 					shrinkToFit: false,
+					guiStyle: "bootstrap",
+					iconSet: 'fontAwesome',
 				   	colNames:[
 						'#',
+						'isUserAuthor',
 						"<fmt:message key='label.monitoring.summary.user.name' />",
 						"<fmt:message key='label.burning.questions' />",
 						"<fmt:message key='label.like' />",
 						"<fmt:message key='label.count' />"
 					],
 				   	colModel:[
 				   		{name:'id', index:'id', width:0, sorttype:"int", hidden: true},
+				   		{name:'isUserAuthor', width:0, hidden: true},
 				   		{name:'groupName', index:'groupName', width:200},
-				   		{name:'feedback', index:'feedback', width:401},
-				   		{name:'like', index:'like', width:60, align: "center"},
+				   		{name:'burningQuestion', index:'burningQuestion', width:401, edittype: 'textarea', editoptions:{rows:"5"},
+				   			editable: function (options) {
+				   	            var item = $(this).jqGrid("getLocalRow", options.rowid);
+				   	            return ${isUserLeader} && eval(item.isUserAuthor);
+				   	        }
+						},
+				   		{name:'like', index:'like', width:60, align: "center", 
+					   		formatter:function(cellvalue, options, rowObject) {
+								return cellvalue;
+			   				}
+						},
 				   		{name:'count', index:'count', width:50, align:"right"}
 				   	],
-				   	caption: "${scratchieItem.title}"
+				   	caption: "${scratchieItem.title}",
+					cellurl: '<c:url value="/learning/editBurningQuestion.do"/>?sessionId=${toolSessionID}&itemUid=${scratchieItem.uid}',
+	  				cellEdit: true,
+	  				beforeSubmitCell : function (rowid,name,val,iRow,iCol){
+	  					var itemUid = jQuery("#list${summary.sessionId}").getCell(rowid, 'userId');
+	  					return {itemUid:itemUid};
+	  				}
 				});
 				
 			    <c:forEach var="burningQuestionDto" items="${burningQuestionItemDto.burningQuestionDtos}" varStatus="i">			    
-			    	jQuery("#burningQuestions${scratchieItem.uid}").addRowData(${i.index + 1}, {
+			    		jQuery("#burningQuestions${scratchieItem.uid}").addRowData(${i.index + 1}, {
 			   			id:"${i.index + 1}",
+			   			isUserAuthor:"${burningQuestionDto.userAuthor}",
 			   	     	groupName:"${burningQuestionDto.sessionName}",
-				   	    feedback:"${burningQuestionDto.escapedBurningQuestion}",
+				   	    burningQuestion:"${burningQuestionDto.escapedBurningQuestion}",
 				   	 	<c:choose>
 				   			<c:when test="${!isUserLeader && burningQuestionDto.userLiked}">
 				   				like:'<span class="fa fa-thumbs-up fa-2x"></span>',
@@ -160,9 +181,12 @@
 				height: 'auto',
 				autowidth: true,
 				shrinkToFit: false,
-			   	colNames:['#',
-						"<fmt:message key='label.monitoring.summary.user.name' />",
-					    "<fmt:message key='label.learners.feedback' />"
+				guiStyle: "bootstrap",
+				iconSet: 'fontAwesome',
+			   	colNames:[
+				   	'#',
+					"<fmt:message key='label.monitoring.summary.user.name' />",
+					"<fmt:message key='label.learners.feedback' />"
 				],
 			   	colModel:[
 			   		{name:'id', index:'id', width:0, sorttype:"int", hidden: true},
@@ -172,7 +196,7 @@
 			   	caption: "<fmt:message key='label.other.groups' />"
 			});
 		    <c:forEach var="reflectDTO" items="${reflections}" varStatus="i">
-		    	jQuery("#reflections").addRowData(${i.index + 1}, {
+		    		jQuery("#reflections").addRowData(${i.index + 1}, {
 		   			id:"${i.index + 1}",
 		   	     	groupName:"${reflectDTO.groupName}",
 			   	    feedback:"<lams:out value='${reflectDTO.reflection}' escapeHtml='true' />"
@@ -259,7 +283,7 @@
 
 		<!-- Display reflections -->
 		<c:if test="${sessionMap.reflectOn}">
-			<div class="voffset10">
+			<div class="voffset20">
 				<div class="panel panel-default">
 					<div class="panel-heading-sm  bg-success">
 						<fmt:message key="monitor.summary.td.notebookInstructions" />
Index: lams_tool_scratchie/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r83ca314c18ea866bb79570b6e7da25eb8729b3b4 -re2f4b14e2d8f0ef1feef10abdc21f3d446fca2a5
--- lams_tool_scratchie/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 83ca314c18ea866bb79570b6e7da25eb8729b3b4)
+++ lams_tool_scratchie/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision e2f4b14e2d8f0ef1feef10abdc21f3d446fca2a5)
@@ -46,13 +46,14 @@
 			   		var userSummaryUrl = "<c:url value='/learning/start.do'/>?userID=" + userId + "&toolSessionID=" + toolSessionId + "&mode=teacher&reqId=" + (new Date()).getTime();
 					launchPopup(userSummaryUrl, "MonitoringReview");		
 			  	},
-			   	colNames:['#',
-						'userId',
-						'sessionId',
-						"<fmt:message key="label.monitoring.summary.user.name" />",
-						"<fmt:message key="label.monitoring.summary.attempts" />",
-					    "<fmt:message key="label.monitoring.summary.mark" />",
-					    'portraitId'
+			   	colNames:[
+				   	'#',
+					'userId',
+					'sessionId',
+					"<fmt:message key="label.monitoring.summary.user.name" />",
+					"<fmt:message key="label.monitoring.summary.attempts" />",
+					"<fmt:message key="label.monitoring.summary.mark" />",
+					'portraitId'
 				],
 			   	colModel:[
 			   		{name:'id', index:'id', width:0, sorttype:"int", hidden: true},