Index: lams_tool_scratchie/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/conf/xdoclet/struts-actions.xml,v
diff -u -r1.20.2.2 -r1.20.2.3
--- lams_tool_scratchie/conf/xdoclet/struts-actions.xml	3 Jul 2015 15:42:12 -0000	1.20.2.2
+++ lams_tool_scratchie/conf/xdoclet/struts-actions.xml	5 Apr 2016 17:24:33 -0000	1.20.2.3
@@ -212,6 +212,14 @@
 			<forward name="notebook" path="/pages/learning/notebook.jsp" />
 			<forward name="success" path="/pages/learning/results.jsp" />
 		</action>
+		<action path="/learning/like"
+			type="org.lamsfoundation.lams.tool.scratchie.web.action.LearningAction"
+			parameter="like" >
+		</action>
+		<action path="/learning/removeLike"
+			type="org.lamsfoundation.lams.tool.scratchie.web.action.LearningAction"
+			parameter="removeLike" >
+		</action>
 		
 		<!--  ========= Reflection =============== -->
 		<action path="/learning/newReflection"
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java,v
diff -u -r1.21.2.3 -r1.21.2.4
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java	3 Jul 2015 20:24:51 -0000	1.21.2.3
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java	5 Apr 2016 17:24:33 -0000	1.21.2.4
@@ -61,6 +61,8 @@
     public static final String PARAM_NOT_A_NUMBER = "nan";
     
     public static final String PARAM_MARK = "mark";
+    
+    public static final String PARAM_BURNING_QUESTION_UID = "burningQuestionUid";
 
     // for request attribute name
     public static final String ATTR_TOOL_CONTENT_ID = "toolContentID";
@@ -149,7 +151,7 @@
     
     public static final String ATTR_REFLECTIONS = "reflections";
     
-    public static final String ATTR_BURNING_QUESTIONS_DTOS = "burningQuestionDtos";
+    public static final String ATTR_BURNING_QUESTION_ITEM_DTOS = "burningQuestionItemDtos";
 
     public static final String ATTR_USER_UID = "userUid";
     
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml,v
diff -u -r1.16.2.8 -r1.16.2.9
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml	10 Aug 2015 15:24:18 -0000	1.16.2.8
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml	5 Apr 2016 17:24:33 -0000	1.16.2.9
@@ -34,6 +34,11 @@
             <ref bean="coreSessionFactory"/>
         </property>
     </bean>
+    <bean id="burningQuestionLikeDao" class="org.lamsfoundation.lams.tool.scratchie.dao.hibernate.BurningQuestionLikeDAOHibernate">
+        <property name="sessionFactory">
+            <ref bean="coreSessionFactory"/>
+        </property>
+    </bean>
 
    <bean id="scratchieUserDao" class="org.lamsfoundation.lams.tool.scratchie.dao.hibernate.ScratchieUserDAOHibernate">
         <property name="sessionFactory">
@@ -75,6 +80,9 @@
         <property name="scratchieBurningQuestionDao">
             <ref bean="scratchieBurningQuestionDao"/>
         </property>
+        <property name="burningQuestionLikeDao">
+            <ref bean="burningQuestionLikeDao"/>
+        </property>
         <property name="scratchieUserDao">
             <ref bean="scratchieUserDao"/>
         </property>
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/BurningQuestionLikeDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieBurningQuestionDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieBurningQuestionDAO.java,v
diff -u -r1.2.2.3 -r1.2.2.4
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieBurningQuestionDAO.java	3 Jul 2015 20:24:51 -0000	1.2.2.3
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieBurningQuestionDAO.java	5 Apr 2016 17:24:33 -0000	1.2.2.4
@@ -25,11 +25,12 @@
 
 import java.util.List;
 
+import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionDTO;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieBurningQuestion;
 
 public interface ScratchieBurningQuestionDAO extends DAO {
 
-    List<ScratchieBurningQuestion> getBurningQuestionsByItemUid(Long itemUid);
+    List<BurningQuestionDTO> getBurningQuestionsByContentId(Long scratchieUid, Long sessionId);
     
     ScratchieBurningQuestion getBurningQuestionBySessionAndItem(Long sessionId, Long itemUid);
     
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/BurningQuestionLikeDAOHibernate.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java,v
diff -u -r1.2.2.3 -r1.2.2.4
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java	3 Jul 2015 20:24:52 -0000	1.2.2.3
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java	5 Apr 2016 17:24:33 -0000	1.2.2.4
@@ -23,10 +23,17 @@
 /* $Id$ */  
 package org.lamsfoundation.lams.tool.scratchie.dao.hibernate;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import org.hibernate.Hibernate;
+import org.hibernate.SQLQuery;
+import org.hibernate.type.IntegerType;
+import org.hibernate.type.LongType;
+import org.hibernate.type.StringType;
 import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.scratchie.dao.ScratchieBurningQuestionDAO;
+import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionDTO;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieBurningQuestion;
 
 public class ScratchieBurningQuestionDAOHibernate extends LAMSBaseDAO implements ScratchieBurningQuestionDAO {
@@ -49,8 +56,57 @@
 //  }
 
     @Override
-    public List<ScratchieBurningQuestion> getBurningQuestionsByItemUid(Long itemUid) {
-	return (List<ScratchieBurningQuestion>) this.doFind(FIND_BY_ITEM_UID, new Object[] { itemUid});
+    @SuppressWarnings("unchecked")
+    public List<BurningQuestionDTO> getBurningQuestionsByContentId(Long scratchieUid, Long sessionId) {
+	
+	/* Thread based lookups - Returns a complex structure so that the likes information can be passed 
+	 * back with it. */
+	String GET_BURNING_QUESTIONS_WITH_LIKES = 
+	    "SELECT bq.*, ANY_VALUE(session.session_name) sessionName, count(like1.uid) total_likes ";
+	//in case sessionId is provided - we need to also return which burning questions leader has liked 
+	if (sessionId != null) {
+	    GET_BURNING_QUESTIONS_WITH_LIKES += 
+	    ", EXISTS(select * from tl_lascrt11_burning_que_like like2 where bq.uid = like2.burning_question_uid AND like2.session_id=:sessionId) user_liked";
+	}
+	GET_BURNING_QUESTIONS_WITH_LIKES +=
+	      " FROM tl_lascrt11_burning_question bq "
+	    + " JOIN tl_lascrt11_session session"
+	    + " 	ON session.scratchie_uid = :scratchieUid AND bq.session_id = session.session_id "
+	    + " LEFT JOIN tl_lascrt11_burning_que_like like1 ON bq.uid = like1.burning_question_uid "
+	    + " WHERE bq.question IS NOT NULL AND bq.question != ''"
+	    + " GROUP BY bq.uid";
+	
+	SQLQuery query = getSession().createSQLQuery(GET_BURNING_QUESTIONS_WITH_LIKES);
+	query.addEntity("bq", ScratchieBurningQuestion.class)
+		.addScalar("sessionName", StringType.INSTANCE)
+		.addScalar("total_likes", IntegerType.INSTANCE)
+		.setLong("scratchieUid", scratchieUid);
+	if (sessionId != null) {
+	    query.addScalar("user_liked", IntegerType.INSTANCE)
+	    	 .setLong("sessionId", sessionId);
+	}
+	List<Object[]> rawObjects = query.list();
+	
+//	Comparator<Comment> comparator = ICommentService.SORT_BY_LIKE.equals(sortBy) ? new TopicComparatorLike() : new TopicComparator();
+//	SortedSet<Comment> results = new TreeSet<Comment>(comparator);
+	List<BurningQuestionDTO> results = new ArrayList<BurningQuestionDTO>();
+	for ( Object[] rawObject : rawObjects ) {
+	    
+	    ScratchieBurningQuestion burningQuestion = (ScratchieBurningQuestion) rawObject[0];
+	    String sessionName = (String) rawObject[1];
+	    Integer likeCount = (Integer) rawObject[2];
+
+	    BurningQuestionDTO burningQuestionDTO = new BurningQuestionDTO();
+	    burningQuestionDTO.setBurningQuestion(burningQuestion);
+	    burningQuestionDTO.setLikeCount(likeCount != null ? likeCount : 0);
+	    if (sessionId != null) {
+		boolean userLiked = (Integer) rawObject[3] == 1;
+		burningQuestionDTO.setUserLiked(userLiked);
+	    }
+	    burningQuestionDTO.setSessionName(sessionName);
+	    results.add(burningQuestionDTO);
+	}
+	return results;
     }
     
     @Override
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20160329.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/BurningQuestionDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/BurningQuestionDTO.java,v
diff -u -r1.1.2.3 -r1.1.2.4
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/BurningQuestionDTO.java	3 Jul 2015 20:24:52 -0000	1.1.2.3
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/BurningQuestionDTO.java	5 Apr 2016 17:24:33 -0000	1.1.2.4
@@ -23,29 +23,53 @@
 /* $Id$ */  
 package org.lamsfoundation.lams.tool.scratchie.dto;
 
-import java.util.Map;
-
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieBurningQuestion;
-import org.lamsfoundation.lams.tool.scratchie.model.ScratchieItem;
 
 public class BurningQuestionDTO {
-    private ScratchieItem item;
+    private ScratchieBurningQuestion burningQuestion;
+    private String escapedBurningQuestion;
+    private String sessionName;
     
-    private Map<String, String> groupNameToBurningQuestion;
+    private Integer likeCount;
+    private boolean userLiked;
     
-    public ScratchieItem getItem() {
-	return item;
+    public ScratchieBurningQuestion getBurningQuestion() {
+	return burningQuestion;
     }
 
-    public void setItem(ScratchieItem item) {
-	this.item = item;
+    public void setBurningQuestion(ScratchieBurningQuestion burningQuestion) {
+	this.burningQuestion = burningQuestion;
     }
+    
+    public String getEscapedBurningQuestion() {
+	return escapedBurningQuestion;
+    }
 
-    public Map<String, String> getGroupNameToBurningQuestion() {
-	return groupNameToBurningQuestion;
+    public void setEscapedBurningQuestion(String escapedBurningQuestion) {
+	this.escapedBurningQuestion = escapedBurningQuestion;
     }
+    
+    public String getSessionName() {
+	return sessionName;
+    }
 
-    public void setGroupNameToBurningQuestion(Map<String, String> leaderNameToBurningQuestion) {
-	this.groupNameToBurningQuestion = leaderNameToBurningQuestion;
+    public void setSessionName(String sessionName) {
+	this.sessionName = sessionName;
     }
+
+    public Integer getLikeCount() {
+	return likeCount;
+    }
+
+    public void setLikeCount(Integer likeCount) {
+	this.likeCount = likeCount;
+    }
+
+    public boolean isUserLiked() {
+	return userLiked;
+    }
+
+    public void setUserLiked(boolean userLiked) {
+	this.userLiked = userLiked;
+    }
 }
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/BurningQuestionItemDTO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/BurningQuestionLike.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java,v
diff -u -r1.29.2.2 -r1.29.2.3
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java	3 Jul 2015 20:24:52 -0000	1.29.2.2
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java	5 Apr 2016 17:24:33 -0000	1.29.2.3
@@ -31,6 +31,7 @@
 import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionDTO;
+import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionItemDTO;
 import org.lamsfoundation.lams.tool.scratchie.dto.GroupSummary;
 import org.lamsfoundation.lams.tool.scratchie.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.scratchie.model.Scratchie;
@@ -224,13 +225,18 @@
     List<GroupSummary> getQuestionSummary(Long contentId, Long itemUid);
     
     /**
-     * Get BurningQuestionDtos used for summary tab
+     * In order to group BurningQuestions by items, organise them as a list of BurningQuestionItemDTOs.
      * 
      * @param scratchie
+     * @param sessionId optional parameter, if it's specified, BurningQuestionDTOs will also contain information what leader of this group has liked
      * @return
      */
-    List<BurningQuestionDTO> getBurningQuestionDtos(Scratchie scratchie);
+    List<BurningQuestionItemDTO> getBurningQuestionDtos(Scratchie scratchie, Long sessionId);
     
+    boolean addLike(Long burningQuestionUid, Long sessionId);
+    
+    void removeLike(Long burningQuestionUid, Long sessionId);
+    
     /**
      * Export excel spreadheet
      * 
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java,v
diff -u -r1.51.2.16 -r1.51.2.17
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	18 Feb 2016 15:44:46 -0000	1.51.2.16
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	5 Apr 2016 17:24:33 -0000	1.51.2.17
@@ -66,6 +66,7 @@
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.scratchie.ScratchieConstants;
+import org.lamsfoundation.lams.tool.scratchie.dao.BurningQuestionLikeDAO;
 import org.lamsfoundation.lams.tool.scratchie.dao.ScratchieAnswerVisitDAO;
 import org.lamsfoundation.lams.tool.scratchie.dao.ScratchieBurningQuestionDAO;
 import org.lamsfoundation.lams.tool.scratchie.dao.ScratchieConfigItemDAO;
@@ -74,6 +75,7 @@
 import org.lamsfoundation.lams.tool.scratchie.dao.ScratchieSessionDAO;
 import org.lamsfoundation.lams.tool.scratchie.dao.ScratchieUserDAO;
 import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionDTO;
+import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionItemDTO;
 import org.lamsfoundation.lams.tool.scratchie.dto.GroupSummary;
 import org.lamsfoundation.lams.tool.scratchie.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.scratchie.model.Scratchie;
@@ -117,6 +119,8 @@
 
     private ScratchieBurningQuestionDAO scratchieBurningQuestionDao;
 
+    private BurningQuestionLikeDAO burningQuestionLikeDao;
+
     private ScratchieConfigItemDAO scratchieConfigItemDao;
 
     // tool service
@@ -775,68 +779,77 @@
     }
 
     @Override
-    public List<BurningQuestionDTO> getBurningQuestionDtos(Scratchie scratchie) {
+    public List<BurningQuestionItemDTO> getBurningQuestionDtos(Scratchie scratchie, Long sessionId) {
 
 	Set<ScratchieItem> items = new TreeSet<ScratchieItem>(new ScratchieItemComparator());
 	items.addAll(scratchie.getScratchieItems());
 
-	// get all available leaders associated with this content as only leaders have reflections
-	List<ScratchieSession> sessionList = scratchieSessionDao.getByContentId(scratchie.getContentId());
-
-	List<BurningQuestionDTO> burningQuestionDtos = new LinkedList<BurningQuestionDTO>();
+	List<BurningQuestionDTO> burningQuestionDtos = scratchieBurningQuestionDao
+		.getBurningQuestionsByContentId(scratchie.getUid(), sessionId);
+	
+	//in order to group BurningQuestions by items, organise them as a list of BurningQuestionItemDTOs
+	List<BurningQuestionItemDTO> burningQuestionItemDtos = new ArrayList<BurningQuestionItemDTO>();
 	for (ScratchieItem item : items) {
-	    BurningQuestionDTO burningQuestionDTO = new BurningQuestionDTO();
-	    burningQuestionDTO.setItem(item);
 
-	    List<ScratchieBurningQuestion> burningQuestions = scratchieBurningQuestionDao
-		    .getBurningQuestionsByItemUid(item.getUid());
+	    List<BurningQuestionDTO> burningQuestionDtosOfSpecifiedItem = new ArrayList<BurningQuestionDTO>();
 
-	    Map<String, String> groupNameToBurningQuestion = new LinkedHashMap<String, String>();
-	    for (ScratchieBurningQuestion burningQuestion : burningQuestions) {
-
-		// find corresponding session
-		ScratchieSession session = null;
-		for (ScratchieSession sessionIter : sessionList) {
-		    if (burningQuestion.getSessionId().equals(sessionIter.getSessionId())) {
-			session = sessionIter;
-			break;
-		    }
+	    for (BurningQuestionDTO burningQuestionDto : burningQuestionDtos) {
+		ScratchieBurningQuestion burningQuestion = burningQuestionDto.getBurningQuestion();
+		
+		//general burning question is handled further down 
+		if (!burningQuestion.isGeneralQuestion() && item.getUid().equals(burningQuestion.getScratchieItem().getUid())) {
+		    burningQuestionDtosOfSpecifiedItem.add(burningQuestionDto);
 		}
-
-		String groupName = StringEscapeUtils.escapeJavaScript(session.getSessionName());
-		String burningQuestionText = StringEscapeUtils.escapeJavaScript(burningQuestion.getQuestion());
-		groupNameToBurningQuestion.put(groupName, burningQuestionText);
 	    }
-	    burningQuestionDTO.setGroupNameToBurningQuestion(groupNameToBurningQuestion);
-
-	    burningQuestionDtos.add(burningQuestionDTO);
+	    
+	    BurningQuestionItemDTO burningQuestionItemDto = new BurningQuestionItemDTO();
+	    burningQuestionItemDto.setScratchieItem(item);
+	    burningQuestionItemDto.setBurningQuestionDtos(burningQuestionDtosOfSpecifiedItem);
+	    burningQuestionItemDtos.add(burningQuestionItemDto);
 	}
 
-	// general burning question
-	BurningQuestionDTO generalBurningQuestionDTO = new BurningQuestionDTO();
+	// handle general burning question
+	BurningQuestionItemDTO generalBurningQuestionItemDto = new BurningQuestionItemDTO();
 	ScratchieItem generalDummyItem = new ScratchieItem();
 	generalDummyItem.setUid(0L);
 	final String generalQuestionMessage = messageService.getMessage("label.general.burning.question");
 	generalDummyItem.setTitle(generalQuestionMessage);
-	generalBurningQuestionDTO.setItem(generalDummyItem);
-	Map<String, String> groupNameToBurningQuestion = new LinkedHashMap<String, String>();
-	generalBurningQuestionDTO.setGroupNameToBurningQuestion(groupNameToBurningQuestion);
-	for (ScratchieSession session : sessionList) {
-
-	    ScratchieBurningQuestion burningQuestion = scratchieBurningQuestionDao
-		    .getGeneralBurningQuestionBySession(session.getSessionId());
-	    if (burningQuestion == null) {
-		continue;
+	generalBurningQuestionItemDto.setScratchieItem(generalDummyItem);
+	List<BurningQuestionDTO> burningQuestionDtosOfSpecifiedItem = new ArrayList<BurningQuestionDTO>();
+	for (BurningQuestionDTO burningQuestionDto : burningQuestionDtos) {
+	    ScratchieBurningQuestion burningQuestion = burningQuestionDto.getBurningQuestion();
+	    
+	    if (burningQuestion.isGeneralQuestion()) {
+		burningQuestionDtosOfSpecifiedItem.add(burningQuestionDto);
 	    }
+	}
+	generalBurningQuestionItemDto.setBurningQuestionDtos(burningQuestionDtosOfSpecifiedItem);
+	burningQuestionItemDtos.add(generalBurningQuestionItemDto);
+	
+	//escape for Javascript
+	for (BurningQuestionItemDTO burningQuestionItemDto : burningQuestionItemDtos) {
+	    for (BurningQuestionDTO burningQuestionDto : burningQuestionItemDto.getBurningQuestionDtos()) {
+		String escapedSessionName = StringEscapeUtils.escapeJavaScript(burningQuestionDto.getSessionName());
+		burningQuestionDto.setSessionName(escapedSessionName);
 
-	    String groupName = StringEscapeUtils.escapeJavaScript(session.getSessionName());
-	    String burningQuestionText = StringEscapeUtils.escapeJavaScript(burningQuestion.getQuestion());
-	    groupNameToBurningQuestion.put(groupName, burningQuestionText);
+		String escapedBurningQuestion = StringEscapeUtils
+			.escapeJavaScript(burningQuestionDto.getBurningQuestion().getQuestion());
+		burningQuestionDto.setEscapedBurningQuestion(escapedBurningQuestion);
+	    }
 	}
-	burningQuestionDtos.add(generalBurningQuestionDTO);
 
-	return burningQuestionDtos;
+	return burningQuestionItemDtos;
     }
+    
+    @Override
+    public boolean addLike(Long burningQuestionUid, Long sessionId) {
+	return burningQuestionLikeDao.addLike(burningQuestionUid, sessionId);
+    }
+    
+    @Override
+    public void removeLike(Long burningQuestionUid, Long sessionId) {
+	burningQuestionLikeDao.removeLike(burningQuestionUid, sessionId);
+    }
 
     @Override
     public List<ReflectDTO> getReflectionList(Long contentId) {
@@ -1046,7 +1059,8 @@
 	for (int i = 0; i < percentages.length; i++) {
 	    sum += percentages[i];
 	}
-	int avgMean = sum / percentages.length;
+	int percentagesLength = percentages.length == 0 ? 1 : percentages.length;
+	int avgMean = sum / percentagesLength;
 	row = new ExcelCell[numberOfItems + 3];
 	row[0] = new ExcelCell(getMessage("label.avg.mean"), false);
 	row[numberOfItems + 2] = new ExcelCell(avgMean + "%", false);
@@ -1453,31 +1467,38 @@
 
 	ExcelCell[][] fourthPageData = rowList.toArray(new ExcelCell[][] {});
 	dataToExport.put(getMessage("label.spss.analysis"), fourthPageData);
-
+	
 	// ======================================================= Burning questions page
 	// =======================================
-
+	
 	if (scratchie.isBurningQuestionsEnabled()) {
 	    rowList = new LinkedList<ExcelCell[]>();
 
 	    row = new ExcelCell[1];
 	    row[0] = new ExcelCell(getMessage("label.burning.questions"), true);
 	    rowList.add(row);
 	    rowList.add(ScratchieServiceImpl.EMPTY_ROW);
+	    
+	    row = new ExcelCell[3];
+	    row[0] = new ExcelCell(getMessage("label.monitoring.summary.user.name"), IndexedColors.BLUE);
+	    row[1] = new ExcelCell(getMessage("label.burning.questions"), IndexedColors.BLUE);
+	    row[2] = new ExcelCell(getMessage("label.count"), IndexedColors.BLUE);
+	    rowList.add(row);
 
-	    List<BurningQuestionDTO> burningQuestionDtos = getBurningQuestionDtos(scratchie);
-	    for (BurningQuestionDTO burningQuestionDto : burningQuestionDtos) {
-		ScratchieItem item = burningQuestionDto.getItem();
+	    List<BurningQuestionItemDTO> burningQuestionItemDtos = getBurningQuestionDtos(scratchie, null);
+	    for (BurningQuestionItemDTO burningQuestionItemDto : burningQuestionItemDtos) {
+		ScratchieItem item = burningQuestionItemDto.getScratchieItem();
 		row = new ExcelCell[1];
 		row[0] = new ExcelCell(item.getTitle(), false);
 		rowList.add(row);
-
-		Map<String, String> groupNameToBurningQuestion = burningQuestionDto.getGroupNameToBurningQuestion();
-		for (String groupName : groupNameToBurningQuestion.keySet()) {
-		    String burningQuestion = groupNameToBurningQuestion.get(groupName);
-		    row = new ExcelCell[2];
-		    row[0] = new ExcelCell(groupName, false);
+		
+		List<BurningQuestionDTO> burningQuestionDtos = burningQuestionItemDto.getBurningQuestionDtos();
+		for (BurningQuestionDTO burningQuestionDto : burningQuestionDtos) {
+		    String burningQuestion = burningQuestionDto.getBurningQuestion().getQuestion();
+		    row = new ExcelCell[3];
+		    row[0] = new ExcelCell(burningQuestionDto.getSessionName(), false);
 		    row[1] = new ExcelCell(burningQuestion, false);
+		    row[2] = new ExcelCell(burningQuestionDto.getLikeCount(), false);
 		    rowList.add(row);
 		}
 		rowList.add(ScratchieServiceImpl.EMPTY_ROW);
@@ -1643,6 +1664,10 @@
 	this.scratchieBurningQuestionDao = scratchieBurningQuestionDao;
     }
 
+    public void setBurningQuestionLikeDao(BurningQuestionLikeDAO burningQuestionLikeDao) {
+	this.burningQuestionLikeDao = burningQuestionLikeDao;
+    }
+
     public void setScratchieConfigItemDao(ScratchieConfigItemDAO scratchieConfigItemDao) {
 	this.scratchieConfigItemDao = scratchieConfigItemDao;
     }
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java,v
diff -u -r1.44.2.8 -r1.44.2.9
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	13 Aug 2015 10:01:29 -0000	1.44.2.8
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	5 Apr 2016 17:24:33 -0000	1.44.2.9
@@ -55,7 +55,7 @@
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.scratchie.ScratchieConstants;
-import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionDTO;
+import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionItemDTO;
 import org.lamsfoundation.lams.tool.scratchie.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.scratchie.model.Scratchie;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieAnswer;
@@ -116,6 +116,12 @@
 	if (param.equals("showResults")) {
 	    return showResults(mapping, form, request, response);
 	}
+	if (param.equals("like")) {
+	    return like(mapping, form, request, response);
+	}
+	if (param.equals("removeLike")) {
+	    return removeLike(mapping, form, request, response);
+	}
 
 	// ================ Reflection =======================
 	if (param.equals("newReflection")) {
@@ -503,8 +509,8 @@
 	// display other groups' BurningQuestions
 	if (isBurningQuestionsEnabled) {
 	    Scratchie scratchie = toolSession.getScratchie();
-	    List<BurningQuestionDTO> burningQuestionDtos = LearningAction.service.getBurningQuestionDtos(scratchie);
-	    request.setAttribute(ScratchieConstants.ATTR_BURNING_QUESTIONS_DTOS, burningQuestionDtos);
+	    List<BurningQuestionItemDTO> burningQuestionItemDtos = LearningAction.service.getBurningQuestionDtos(scratchie, toolSessionId);
+	    request.setAttribute(ScratchieConstants.ATTR_BURNING_QUESTION_ITEM_DTOS, burningQuestionItemDtos);
 	}
 
 	// display other groups' notebooks
@@ -533,8 +539,66 @@
 
 	return mapping.findForward(ScratchieConstants.SUCCESS);
     }
+    
+    /**
+     * @throws ServletException 
+     * @throws ScratchieApplicationException 
+     */
+    private synchronized ActionForward like(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws JSONException, IOException, ServletException, ScratchieApplicationException {
+	initializeScratchieService();
+	
+	String sessionMapID = WebUtil.readStrParam(request, ScratchieConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+	final Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+	ScratchieSession toolSession = LearningAction.service.getScratchieSessionBySessionId(sessionId);
 
+	Long burningQuestionUid = WebUtil.readLongParam(request, ScratchieConstants.PARAM_BURNING_QUESTION_UID);
+
+	ScratchieUser leader = this.getCurrentUser(sessionId);
+	// only leader is allowed to scratch answers
+	if (!toolSession.isUserGroupLeader(leader.getUid())) {
+	    return null;
+	}
+
+	boolean added = service.addLike(burningQuestionUid, sessionId);
+
+	JSONObject JSONObject = new JSONObject();
+	JSONObject.put("added", added);
+	response.setContentType("application/json;charset=utf-8");
+	response.getWriter().print(JSONObject);
+	return null;
+    }
+    
     /**
+     * @throws ServletException 
+     * @throws ScratchieApplicationException 
+     */
+    private synchronized ActionForward removeLike(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws JSONException, IOException, ServletException, ScratchieApplicationException {
+	initializeScratchieService();
+	
+	String sessionMapID = WebUtil.readStrParam(request, ScratchieConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+	final Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+	ScratchieSession toolSession = LearningAction.service.getScratchieSessionBySessionId(sessionId);
+
+	Long burningQuestionUid = WebUtil.readLongParam(request, ScratchieConstants.PARAM_BURNING_QUESTION_UID);
+
+	ScratchieUser leader = this.getCurrentUser(sessionId);
+	// only leader is allowed to scratch answers
+	if (!toolSession.isUserGroupLeader(leader.getUid())) {
+	    return null;
+	}
+
+	service.removeLike(burningQuestionUid, sessionId);
+
+	return null;
+    }
+
+    /**
      * Finish learning session.
      * 
      * @param mapping
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java,v
diff -u -r1.21.2.1 -r1.21.2.2
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java	13 Feb 2015 23:51:06 -0000	1.21.2.1
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java	5 Apr 2016 17:24:33 -0000	1.21.2.2
@@ -46,6 +46,7 @@
 import org.apache.struts.action.ActionMapping;
 import org.lamsfoundation.lams.tool.scratchie.ScratchieConstants;
 import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionDTO;
+import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionItemDTO;
 import org.lamsfoundation.lams.tool.scratchie.dto.GroupSummary;
 import org.lamsfoundation.lams.tool.scratchie.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.scratchie.model.Scratchie;
@@ -134,8 +135,8 @@
 	
 	// Create BurningQuestionsDtos if BurningQuestions is enabled.
 	if (scratchie.isBurningQuestionsEnabled()) {
-	    List<BurningQuestionDTO> burningQuestionDtos = service.getBurningQuestionDtos(scratchie);
-	    sessionMap.put(ScratchieConstants.ATTR_BURNING_QUESTIONS_DTOS, burningQuestionDtos);
+	    List<BurningQuestionItemDTO> burningQuestionItemDtos = service.getBurningQuestionDtos(scratchie, null);
+	    sessionMap.put(ScratchieConstants.ATTR_BURNING_QUESTION_ITEM_DTOS, burningQuestionItemDtos);
 	}
 
 	// Create reflectList if reflection is enabled.
Index: lams_tool_scratchie/web/pages/learning/results.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/learning/results.jsp,v
diff -u -r1.13.2.6 -r1.13.2.7
--- lams_tool_scratchie/web/pages/learning/results.jsp	7 Mar 2016 23:22:53 -0000	1.13.2.6
+++ lams_tool_scratchie/web/pages/learning/results.jsp	5 Apr 2016 17:24:32 -0000	1.13.2.7
@@ -18,62 +18,131 @@
 <lams:head>
 	<title><fmt:message key="label.learning.title" /></title>
 	<%@ include file="/common/header.jsp"%>
-
+	
 	<link type="text/css" href="${lams}css/jquery-ui-redmond-theme.css" rel="stylesheet">
 	<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
+	<link rel="stylesheet" href="<lams:LAMSURL />/includes/font-awesome/css/font-awesome.min.css">
 	<style media="screen,projection" type="text/css">
-#reflections-div {
-	padding: 10px 0 20px;
-}
+		#reflections-div {
+			padding: 10px 0 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}
+	</style>
 
-.burning-question-dto {
-	padding-bottom: 5px;
-}
-
-.ui-jqgrid tr.jqgrow td {
-	white-space: normal !important;
-	height: auto;
-	vertical-align: text-top;
-	padding-top: 2px;
-}
-</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">
+		function likeEntry(burningQuestionUid) {
+
+			var isLike = $( '#like-'+burningQuestionUid ).hasClass( 'fa-thumbs-o-up' );
+
+			if (isLike) {
+				$.ajax({
+				    url: '<c:url value="/learning/like.do"/>',
+					data: {
+						sessionMapID: "${sessionMapID}",
+						burningQuestionUid: burningQuestionUid
+					}
+				})
+			    .done(function (response) {	       		
+		    		if ( ! burningQuestionUid ) {
+						alert('<fmt:message key="error.cannot.redisplay.please.refresh"/>');
+		  			} else if ( response.added ) {
+		  				var currentCount = eval($('#count-'+burningQuestionUid).html());
+		  				currentCount += 1;
+			       		$('#count-'+burningQuestionUid).html(currentCount);
+					}
+				});
+				
+				$( '#like-'+burningQuestionUid ).removeClass( 'fa-thumbs-o-up' ).addClass( 'fa-thumbs-up' );
+				
+			} else {
+				$.ajax({
+				    url: '<c:url value="/learning/removeLike.do"/>',
+					data: {
+						sessionMapID: "${sessionMapID}",
+						burningQuestionUid: burningQuestionUid
+					}
+				})
+			    .done(function (response) {
+		    		if ( ! burningQuestionUid ) {
+						alert('<fmt:message key="error.cannot.redisplay.please.refresh"/>');
+		  			} else {
+		  				var currentCount = eval($('#count-'+burningQuestionUid).html());
+		  				currentCount -= 1;
+			       		$('#count-'+burningQuestionUid).html(currentCount);
+					}
+				});
+		
+				$( '#like-'+burningQuestionUid ).removeClass( 'fa-thumbs-up' ).addClass( 'fa-thumbs-o-up' );
+			}
+
+		}
+	
 		$(document).ready(function(){
 			
-			<!-- Display burningQuestionDtos -->
-			<c:forEach var="burningQuestionDto" items="${burningQuestionDtos}" varStatus="i">
-				jQuery("#burningQuestions${burningQuestionDto.item.uid}").jqGrid({
+			<!-- Display burningQuestionItemDtos -->
+			<c:forEach var="burningQuestionItemDto" items="${burningQuestionItemDtos}" varStatus="i">
+				<c:set var="scratchieItem" value="${burningQuestionItemDto.scratchieItem}"/>
+			
+				jQuery("#burningQuestions${scratchieItem.uid}").jqGrid({
 					datatype: "local",
 					rowNum: 10000,
 					height: 'auto',
 					autowidth: true,
 					shrinkToFit: false,
-				   	colNames:['#',
-							"<fmt:message key='label.monitoring.summary.user.name' />",
-						    "<fmt:message key='label.burning.questions' />"
+				   	colNames:[
+						'#',
+						"<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:'groupName', index:'groupName', width:200},
-				   		{name:'feedback', index:'feedback', width:522}
+				   		{name:'feedback', index:'feedback', width:374},
+				   		{name:'like', index:'like', width:60, align: "center"},
+				   		{name:'count', index:'count', width:50, align:"right"}
 				   	],
-				   	caption: "${burningQuestionDto.item.title}"
+				   	caption: "${scratchieItem.title}"
 				});
-			    <c:forEach var="entry" items="${burningQuestionDto.groupNameToBurningQuestion}" varStatus="i">
-			    	<c:set var="groupName" value="${entry.key}"/>
-			    	<c:set var="burningQuestion" value="${entry.value}"/>
-			    
-			    	jQuery("#burningQuestions${burningQuestionDto.item.uid}").addRowData(${i.index + 1}, {
+				
+			    <c:forEach var="burningQuestionDto" items="${burningQuestionItemDto.burningQuestionDtos}" varStatus="i">			    
+			    	jQuery("#burningQuestions${scratchieItem.uid}").addRowData(${i.index + 1}, {
 			   			id:"${i.index + 1}",
-			   	     	groupName:"${groupName}",
-				   	    feedback:"<lams:out value='${burningQuestion}' escapeHtml='true' />"
+			   	     	groupName:"${burningQuestionDto.sessionName}",
+				   	    feedback:"<lams:out value='${burningQuestionDto.escapedBurningQuestion}' escapeHtml='true' />",
+				   	 	<c:choose>
+				   			<c:when test="${!isUserLeader && burningQuestionDto.userLiked}">
+				   				like:'<span class="fa fa-thumbs-up fa-2x"></span>',
+				   			</c:when>
+					   		<c:when test="${!isUserLeader}">
+				   				like:'',
+				   			</c:when>
+							<c:when test="${burningQuestionDto.userLiked}">
+								like:'<span class="fa fa-thumbs-up fa-2x" title="<fmt:message key="label.unlike"/>"' +
+										'onclick="javascript:likeEntry(${burningQuestionDto.burningQuestion.uid});" id="like-${burningQuestionDto.burningQuestion.uid}" />',
+							</c:when>
+							<c:otherwise>
+								like:'<span class="fa fa-thumbs-o-up fa-2x" title="<fmt:message key="label.like"/>"' +
+										'onclick="javascript:likeEntry(${burningQuestionDto.burningQuestion.uid});" id="like-${burningQuestionDto.burningQuestion.uid}" />',
+							</c:otherwise>
+						</c:choose>
+				   	 	count:'<span id="count-${burningQuestionDto.burningQuestion.uid}">${burningQuestionDto.likeCount}</span>'
 			   	   	});
 		        </c:forEach>
 
-		        jQuery("#burningQuestions${burningQuestionDto.item.uid}").jqGrid('sortGrid','groupName', false, 'asc');
+		        jQuery("#burningQuestions${scratchieItem.uid}").jqGrid('sortGrid','groupName', false, 'asc');
 	        </c:forEach>
 			
 			<!-- Display reflection entries -->
@@ -116,26 +185,29 @@
 		    
 		})
 	
-		function finishSession(){
+		function finishSession() {
 			document.getElementById("finishButton").disabled = true;
 			document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}"/>';
 			return false;
 		}
-		function continueReflect(){
+		function continueReflect() {
 			document.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
 		}
-		function editBurningQuestions(){
+		function editBurningQuestions() {
 			document.location.href='<c:url value="/learning/showBurningQuestions.do?sessionMapID=${sessionMapID}"/>';
 		}
+		function refresh() {
+			location.reload();
+			return false;
+		}
     </script>
 </lams:head>
 
 <body class="stripes">
 
 	<c:set var="title">
-	${scratchie.title} / <fmt:message key='label.score' />
+		${scratchie.title} / <fmt:message key='label.score' />
 	</c:set>
-
 	<lams:Page type="learner" title="${title}">
 
 		<c:if test="${not empty sessionMap.submissionDeadline}">
@@ -155,26 +227,27 @@
 				<strong><fmt:param>${score}%</fmt:param></strong>
 			</fmt:message>
 		</lams:Alert>
+	
+		<div class="row voffset5" >
+				<html:button property="refreshButton" onclick="return refresh();" styleClass="btn btn-default voffset5 roffset5 pull-right">
+					<fmt:message key="label.refresh" />
+				</html:button>
+		</div>
 
-		<!-- Display burningQuestionDtos -->
+		<!-- Display burningQuestionItemDtos -->
 
 		<c:if test="${sessionMap.isBurningQuestionsEnabled}">
 			<div class="voffset5">
 				<div class="lead">
 					<fmt:message key="label.burning.questions" />
 				</div>
 
-				<c:forEach var="burningQuestionDto" items="${burningQuestionDtos}" varStatus="i">
+				<c:forEach var="burningQuestionItemDto" items="${burningQuestionItemDtos}" varStatus="i">
 					<div class="burning-question-dto">
-						<table id="burningQuestions${burningQuestionDto.item.uid}" class="scroll" cellpadding="0" cellspacing="0"></table>
+						<table id="burningQuestions${burningQuestionItemDto.scratchieItem.uid}" class="scroll" cellpadding="0" cellspacing="0"></table>
 					</div>
 				</c:forEach>
 
-				<!-- General burning question's table -->
-				<div class="burning-question-dto">
-					<table id="burningQuestions0" class="scroll" cellpadding="0" cellspacing="0"></table>
-				</div>
-
 				<c:if test="${(mode != 'teacher') && isUserLeader}">
 					<html:button property="finishButton" onclick="return editBurningQuestions()" styleClass="btn btn-sm btn-default">
 						<fmt:message key="label.edit" />
Index: lams_tool_scratchie/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/monitoring/summary.jsp,v
diff -u -r1.14.2.4 -r1.14.2.5
--- lams_tool_scratchie/web/pages/monitoring/summary.jsp	15 Oct 2015 10:01:14 -0000	1.14.2.4
+++ lams_tool_scratchie/web/pages/monitoring/summary.jsp	5 Apr 2016 17:24:32 -0000	1.14.2.5
@@ -93,37 +93,40 @@
 			
 		</c:forEach>
 		
-		<!-- Display burningQuestionDtos -->
-		<c:forEach var="burningQuestionDto" items="${sessionMap.burningQuestionDtos}" varStatus="i">
-			jQuery("#burningQuestions${burningQuestionDto.item.uid}").jqGrid({
+		<!-- Display burningQuestionItemDtos -->
+		<c:forEach var="burningQuestionItemDto" items="${sessionMap.burningQuestionItemDtos}" varStatus="i">
+			<c:set var="scratchieItem" value="${burningQuestionItemDto.scratchieItem}"/>
+			
+			jQuery("#burningQuestions${scratchieItem.uid}").jqGrid({
 				datatype: "local",
 				rowNum: 10000,
 				height: 'auto',
 				autowidth: true,
 				shrinkToFit: false,
 			   	colNames:['#',
 						"<fmt:message key='label.monitoring.summary.user.name' />",
-					    "<fmt:message key='label.burning.questions' />"
+					    "<fmt:message key='label.burning.questions' />",
+						"<fmt:message key='label.count' />"
 				],
 			   	colModel:[
 			   		{name:'id', index:'id', width:0, sorttype:"int", hidden: true},
 			   		{name:'groupName', index:'groupName', width:200},
-			   		{name:'feedback', index:'feedback', width:570}
+			   		{name:'feedback', index:'feedback', width:530},
+			   		{name:'count', index:'count', width:40}
 			   	],
-			   	caption: "${burningQuestionDto.item.title}"
+			   	caption: "${scratchieItem.title}"
 			});
-		    <c:forEach var="entry" items="${burningQuestionDto.groupNameToBurningQuestion}" varStatus="i">
-		    	<c:set var="groupName" value="${entry.key}"/>
-		    	<c:set var="burningQuestion" value="${entry.value}"/>
-		    
-		    	jQuery("#burningQuestions${burningQuestionDto.item.uid}").addRowData(${i.index + 1}, {
+			
+			<c:forEach var="burningQuestionDto" items="${burningQuestionItemDto.burningQuestionDtos}" varStatus="i">
+		    	jQuery("#burningQuestions${scratchieItem.uid}").addRowData(${i.index + 1}, {
 		   			id:"${i.index + 1}",
-		   	     	groupName:"${groupName}",
-			   	    feedback:"<lams:out value='${burningQuestion}' escapeHtml='true' />"
+		   	     	groupName:"${burningQuestionDto.sessionName}",
+		   	    	feedback:"<lams:out value='${burningQuestionDto.escapedBurningQuestion}' escapeHtml='true' />",
+		   	  		count:"${burningQuestionDto.likeCount}"
 		   	   	});
 	        </c:forEach>
 	        
-	     	jQuery("#burningQuestions${burningQuestionDto.item.uid}").jqGrid('sortGrid','groupName', false, 'asc');
+	     	jQuery("#burningQuestions${scratchieItem.uid}").jqGrid('sortGrid','groupName', false, 'asc');
         </c:forEach>
 		
 		<!-- Display reflection entries -->
@@ -305,7 +308,7 @@
 			</select>
 		</div>
 		
-		<!-- Display burningQuestionDtos -->
+		<!-- Display burningQuestionItemDtos -->
 		<c:if test="${scratchie.burningQuestionsEnabled}">
 		
 			<div class="section-header">
@@ -314,16 +317,11 @@
 				</H1>
 			</div>
 			
-			<c:forEach var="burningQuestionDto" items="${sessionMap.burningQuestionDtos}" varStatus="i">
+			<c:forEach var="burningQuestionItemDto" items="${sessionMap.burningQuestionItemDtos}" varStatus="i">
 				<div class="burning-question-dto">
-					<table id="burningQuestions${burningQuestionDto.item.uid}" class="scroll" cellpadding="0" cellspacing="0"></table>
+					<table id="burningQuestions${burningQuestionItemDto.scratchieItem.uid}" class="scroll" cellpadding="0" cellspacing="0"></table>
 				</div>
 			</c:forEach>
-			
-			<!-- General burning question's table -->
-			<div class="burning-question-dto">
-				<table id="burningQuestions0" class="scroll" cellpadding="0" cellspacing="0"></table>
-			</div>
 		</c:if>
 		
 		<!-- Display reflection entries -->