Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/MonitoringController.java
===================================================================
diff -u -r6437f6b8a894d41f5dd5a76a6fe7e95d50171900 -rca958ecbc65696caf0f399cec0a8eace5a84da98
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 6437f6b8a894d41f5dd5a76a6fe7e95d50171900)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision ca958ecbc65696caf0f399cec0a8eace5a84da98)
@@ -29,6 +29,7 @@
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
@@ -123,7 +124,7 @@
 	PeerreviewServiceImpl.removeGroupedCriteria(criterias);
 
 	if (criterias.size() == 1 && criterias.get(0).isRubricsStyleRating()) {
-	    Map<GroupSummary, Map<PeerreviewUser, StyledCriteriaRatingDTO>> rubricsData = getRubricsData(sessionMap,
+	    Map<Long, Map<PeerreviewUser, StyledCriteriaRatingDTO>> rubricsData = getRubricsData(sessionMap,
 		    criterias.get(0), criterias);
 	    request.setAttribute("rubricsData", rubricsData);
 	}
@@ -151,9 +152,9 @@
 	    Long toolContentId = (Long) sessionMap.get(PeerreviewConstants.ATTR_TOOL_CONTENT_ID);
 
 	    List<RatingCriteria> criterias = service.getRatingCriterias(toolContentId);
-	    Map<GroupSummary, Map<PeerreviewUser, StyledCriteriaRatingDTO>> rubricsData = getRubricsData(sessionMap,
+	    Map<PeerreviewUser, StyledCriteriaRatingDTO> rubricsLearnerData = getRubricsLearnerData(toolSessionId,
 		    criteria, criterias);
-	    request.setAttribute("rubricsData", rubricsData);
+	    request.setAttribute("rubricsLearnerData", rubricsLearnerData);
 	}
 
 	request.setAttribute("criteria", criteria);
@@ -694,35 +695,43 @@
     }
 
     @SuppressWarnings("unchecked")
-    private Map<GroupSummary, Map<PeerreviewUser, StyledCriteriaRatingDTO>> getRubricsData(
+    private Map<Long, Map<PeerreviewUser, StyledCriteriaRatingDTO>> getRubricsData(
 	    SessionMap<String, Object> sessionMap, RatingCriteria criteria, Collection<RatingCriteria> criterias) {
 	List<GroupSummary> sessionList = (List<GroupSummary>) sessionMap.get(PeerreviewConstants.ATTR_SUMMARY_LIST);
 
+	Map<Long, Map<PeerreviewUser, StyledCriteriaRatingDTO>> rubricsData = new HashMap<>();
+	for (GroupSummary session : sessionList) {
+	    Long toolSessionId = session.getSessionId();
+	    Map<PeerreviewUser, StyledCriteriaRatingDTO> learnerData = getRubricsLearnerData(toolSessionId, criteria,
+		    criterias);
+	    rubricsData.put(toolSessionId, learnerData);
+	}
+
+	return rubricsData;
+    }
+
+    private Map<PeerreviewUser, StyledCriteriaRatingDTO> getRubricsLearnerData(Long toolSessionId,
+	    RatingCriteria criteria, Collection<RatingCriteria> criterias) {
+	Map<PeerreviewUser, StyledCriteriaRatingDTO> learnerData = new TreeMap<>(
+		Comparator.comparing(PeerreviewUser::getFirstName).thenComparing(PeerreviewUser::getLastName));
+
 	criterias = criterias.stream()
 		.filter(c -> criteria.getRatingCriteriaGroupId().equals(c.getRatingCriteriaGroupId()))
 		.collect(Collectors.toList());
 	Collection<Long> criteriaIds = criterias.stream()
 		.collect(Collectors.mapping(RatingCriteria::getRatingCriteriaId, Collectors.toSet()));
 
-	Map<GroupSummary, Map<PeerreviewUser, StyledCriteriaRatingDTO>> rubricsData = new TreeMap<>(
-		Comparator.comparing(GroupSummary::getSessionName));
-	for (GroupSummary session : sessionList) {
-	    Map<PeerreviewUser, StyledCriteriaRatingDTO> learnerData = new TreeMap<>(
-		    Comparator.comparing(PeerreviewUser::getFirstName).thenComparing(PeerreviewUser::getLastName));
-	    rubricsData.put(session, learnerData);
+	Collection<PeerreviewUser> learners = service.getUsersBySession(toolSessionId);
+	List<Rating> ratings = ratingService.getRatingsByCriteriasAndItems(criteriaIds,
+		learners.stream().collect(Collectors.mapping(PeerreviewUser::getUserId, Collectors.toSet())));
 
-	    Collection<PeerreviewUser> learners = service.getUsersBySession(session.getSessionId());
-	    List<Rating> ratings = ratingService.getRatingsByCriteriasAndItems(criteriaIds,
-		    learners.stream().collect(Collectors.mapping(PeerreviewUser::getUserId, Collectors.toSet())));
-
-	    for (PeerreviewUser learner : learners) {
-		Function<RatingCriteria, StyledCriteriaRatingDTO> dtoBuilder = c -> PeerreviewServiceImpl
-			.getRubricsCriteriaDTO(c, learner.getUserId().intValue(), true, ratings);
-		StyledCriteriaRatingDTO dto = PeerreviewServiceImpl.fillCriteriaGroup(criteria, criterias, dtoBuilder);
-		learnerData.put(learner, dto);
-	    }
+	for (PeerreviewUser learner : learners) {
+	    Function<RatingCriteria, StyledCriteriaRatingDTO> dtoBuilder = c -> PeerreviewServiceImpl
+		    .getRubricsCriteriaDTO(c, learner.getUserId().intValue(), true, ratings);
+	    StyledCriteriaRatingDTO dto = PeerreviewServiceImpl.fillCriteriaGroup(criteria, criterias, dtoBuilder);
+	    learnerData.put(learner, dto);
 	}
 
-	return rubricsData;
+	return learnerData;
     }
 }
Index: lams_tool_preview/web/pages/monitoring/criteria.jsp
===================================================================
diff -u -r6f2fea6274f356f936ab3d778adf20fdbf94652a -rca958ecbc65696caf0f399cec0a8eace5a84da98
--- lams_tool_preview/web/pages/monitoring/criteria.jsp	(.../criteria.jsp)	(revision 6f2fea6274f356f936ab3d778adf20fdbf94652a)
+++ lams_tool_preview/web/pages/monitoring/criteria.jsp	(.../criteria.jsp)	(revision ca958ecbc65696caf0f399cec0a8eace5a84da98)
@@ -26,74 +26,14 @@
 			
 		//vars for rating.js
 		var MAX_RATES = 0,
-		MIN_RATES = 0,
-		COMMENTS_MIN_WORDS_LIMIT = 0,
-		MAX_RATINGS_FOR_ITEM = 0,
-		LAMS_URL = '',
-		COUNT_RATED_ITEMS = 0,
-		COMMENT_TEXTAREA_TIP_LABEL = '',
-		WARN_COMMENTS_IS_BLANK_LABEL = '',
-		WARN_MIN_NUMBER_WORDS_LABEL = '';
-
-		function clearMessage() {
-			$("#messageArea2").html("");
-			return false;
-		}
-		
-		function closeResultsForLearner() {
-			$("#emailPreviewArea").html("");
-			$("#emailPreviewArea").hide();
-			return false;
-		}
-
-		// Prview the email to be sent to the learner
-		function previewResultsForLearner(sessionId, userId) {
-			$(".btn-disable-on-submit").prop("disabled", true);
-			var url = "<c:url value="/monitoring/previewResultsToUser.do"/>";
-			clearMessage();
-			$("#messageArea2_Busy").show();
-			$("#emailPreviewArea").load(
-				url,
-				{
-					sessionMapID: "${sessionMapID}",
-					toolContentID: ${sessionMap.toolContentID},
-					toolSessionId: sessionId, 
-					userID: userId,
-					reqID: (new Date()).getTime()
-				},
-				function() {
-					$("#messageArea2_Busy").hide();
-					$("#emailPreviewArea").show();
-					$(".btn-disable-on-submit").prop("disabled", false);
-				}
-			);
-			return false;
-		}
-
-		// Send the previewed email to the learner
-		function sendResultsForLearner(sessionId, userId, dateTimeStamp) {
-			$(".btn-disable-on-submit").prop("disabled", true);
-			var url = "<c:url value="/monitoring/sendPreviewedResultsToUser.do"/>";
-			clearMessage();
-			$("#messageArea2_Busy").show();
-			$("#messageArea2").load(
-				url,
-				{
-					sessionMapID: "${sessionMapID}",
-					toolContentID: ${sessionMap.toolContentID},
-					toolSessionId: sessionId, 
-					dateTimeStamp: dateTimeStamp,
-					userID: userId,
-					reqID: (new Date()).getTime()
-				},
-				function() {
-					$("#messageArea2_Busy").hide();
-					closeResultsForLearner();
-					$(".btn-disable-on-submit").prop("disabled", false);
-				}
-			);
-			return false;
-		}
+			MIN_RATES = 0,
+			COMMENTS_MIN_WORDS_LIMIT = 0,
+			MAX_RATINGS_FOR_ITEM = 0,
+			LAMS_URL = '',
+			COUNT_RATED_ITEMS = 0,
+			COMMENT_TEXTAREA_TIP_LABEL = '',
+			WARN_COMMENTS_IS_BLANK_LABEL = '',
+			WARN_MIN_NUMBER_WORDS_LABEL = '';
 	</script>
 	<script type="text/javascript" src="${lams}includes/javascript/free.jquery.jqgrid.min.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/monitorToolSummaryAdvanced.js" ></script>
@@ -104,10 +44,6 @@
 
 <body class="stripes">
 	<lams:Page type="monitor" title="${criteria.rubricsStyleRating ? '' : title}">
-		<!--For send results feature-->
-		<i class="fa fa-spinner" style="display:none" id="messageArea2_Busy"></i>
-		<div class="voffset5" id="messageArea2"></div>
-
 		<c:choose>
 			<c:when test="${criteria.rubricsStyleRating}">
 				<%@ include file="rubricspart.jsp" %>
@@ -118,8 +54,6 @@
 		</c:choose>
 		
 		
-		<div class="voffset10" id="emailPreviewArea" style="display:none" ></div>
-
  		<span onclick="window.close()" class="btn btn-default voffset20 pull-right">
  			<fmt:message key="label.close"/>
  		</span>
Index: lams_tool_preview/web/pages/monitoring/criteriapart.jsp
===================================================================
diff -u -r6f2fea6274f356f936ab3d778adf20fdbf94652a -rca958ecbc65696caf0f399cec0a8eace5a84da98
--- lams_tool_preview/web/pages/monitoring/criteriapart.jsp	(.../criteriapart.jsp)	(revision 6f2fea6274f356f936ab3d778adf20fdbf94652a)
+++ lams_tool_preview/web/pages/monitoring/criteriapart.jsp	(.../criteriapart.jsp)	(revision ca958ecbc65696caf0f399cec0a8eace5a84da98)
@@ -127,9 +127,75 @@
             });
         };
         setTimeout(function(){ window.dispatchEvent(new Event('resize')); }, 300);
+        
 	});
+
+	function closeResultsForLearner() {
+		$("#emailPreviewArea").html("");
+		$("#emailPreviewArea").hide();
+		return false;
+	}
+
+	function clearMessage() {
+		$("#messageArea2").html("");
+		return false;
+	}
+
+	// Prview the email to be sent to the learner
+	function previewResultsForLearner(sessionId, userId) {
+		$(".btn-disable-on-submit").prop("disabled", true);
+		var url = "<c:url value="/monitoring/previewResultsToUser.do"/>";
+		clearMessage();
+		$("#messageArea2_Busy").show();
+		$("#emailPreviewArea").load(
+			url,
+			{
+				sessionMapID: "${sessionMapID}",
+				toolContentID: ${sessionMap.toolContentID},
+				toolSessionId: sessionId, 
+				userID: userId,
+				reqID: (new Date()).getTime()
+			},
+			function() {
+				$("#messageArea2_Busy").hide();
+				$("#emailPreviewArea").show();
+				$(".btn-disable-on-submit").prop("disabled", false);
+			}
+		);
+		return false;
+	}
+
+	// Send the previewed email to the learner
+	function sendResultsForLearner(sessionId, userId, dateTimeStamp) {
+		$(".btn-disable-on-submit").prop("disabled", true);
+		var url = "<c:url value="/monitoring/sendPreviewedResultsToUser.do"/>";
+		clearMessage();
+		$("#messageArea2_Busy").show();
+		$("#messageArea2").load(
+			url,
+			{
+				sessionMapID: "${sessionMapID}",
+				toolContentID: ${sessionMap.toolContentID},
+				toolSessionId: sessionId, 
+				dateTimeStamp: dateTimeStamp,
+				userID: userId,
+				reqID: (new Date()).getTime()
+			},
+			function() {
+				$("#messageArea2_Busy").hide();
+				closeResultsForLearner();
+				$(".btn-disable-on-submit").prop("disabled", false);
+			}
+		);
+		return false;
+	}
+
 </script>
 
+<!--For send results feature-->
+<i class="fa fa-spinner" style="display:none" id="messageArea2_Busy"></i>
+<div class="voffset5" id="messageArea2"></div>
+
 <p>
 	<c:choose>
 	<c:when test="${criteria.ratingStyle eq 2}">
@@ -154,4 +220,6 @@
 </p>
 
 <table id="group${toolSessionId}" class="scroll" cellpadding="0" cellspacing="0"></table>
-<div id="pager${toolSessionId}"></div> 
\ No newline at end of file
+<div id="pager${toolSessionId}"></div> 
+
+<div class="voffset10" id="emailPreviewArea" style="display:none" ></div>
\ No newline at end of file
Index: lams_tool_preview/web/pages/monitoring/rubricspart.jsp
===================================================================
diff -u -r6f2fea6274f356f936ab3d778adf20fdbf94652a -rca958ecbc65696caf0f399cec0a8eace5a84da98
--- lams_tool_preview/web/pages/monitoring/rubricspart.jsp	(.../rubricspart.jsp)	(revision 6f2fea6274f356f936ab3d778adf20fdbf94652a)
+++ lams_tool_preview/web/pages/monitoring/rubricspart.jsp	(.../rubricspart.jsp)	(revision ca958ecbc65696caf0f399cec0a8eace5a84da98)
@@ -1,73 +1,104 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <style>
-	.rubrics-session-panel > div {
-		padding: 10px;
+	.panel-collapse > .rubrics-user-panel,
+	.panel-collapse > #emailPreviewArea {
+		margin: 10px;
 	}
 </style>
 
-<%-- Display collapsible panels with group names only when activity is grouped --%>
-<c:if test="${sessionMap.isGroupedActivity}">
-	<div id="rubrics-session-panels" class="panel-group" role="tablist" aria-multiselectable="true">
-</c:if>
-
-	<c:forEach var="session" items="${rubricsData}">
+<script>
+	function closeResultsForLearner() {
+		$("#emailPreviewArea").html("");
+		$("#emailPreviewArea").hide();
+		return false;
+	}
 	
-		<c:if test="${sessionMap.isGroupedActivity}">
-			<%-- Panel title with session name --%>
-			<div class="panel panel-default rubrics-session-panel">
-		       <div class="panel-heading" role="tab" id="rubrics-session-heading-${session.key.sessionId}">
-		       	<span class="panel-title collapsable-icon-left">
-		       		<a class="collapsed" role="button" data-toggle="collapse" href="#session-collapse-${session.key.sessionId}" 
-							aria-expanded="false" aria-controls="session-collapse-${session.key.sessionId}"
-							data-parent="#rubrics-session-panels">
-						<c:out value="${session.key.sessionName}" escapeXml="true"/>
-					</a>
-				</span>
-		       </div>
-	       
-		       <div id="session-collapse-${session.key.sessionId}" class="panel-collapse collapse" 
-		       	    role="tabpanel" aria-labelledby="rubrics-session-heading-${session.key.sessionId}">
-		       	    
-	     </c:if>
-	     
-	       	    <div id="rubrics-user-panels-${session.key.sessionId}" class="panel-group" role="tablist" aria-multiselectable="true">
-	       	    	<c:forEach var="learnerData" items="${session.value}">
-	       	    	
-	       	    		<%-- List learners in the given session --%>
-						<div class="panel panel-default rubrics-user-panel">
-					       <div class="panel-heading" role="tab" id="rubrics-user-heading-${learnerData.key.uid}">
-					       	<span class="panel-title collapsable-icon-left">
-					       		<a class="collapsed" role="button" data-toggle="collapse" href="#rubrics-user-collapse-${learnerData.key.uid}" 
-										aria-expanded="false" aria-controls="rubrics-user-collapse-${learnerData.key.uid}"
-										data-parent="#rubrics-users-panels-${session.key.sessionId}">
-									<lams:Portrait userId="${learnerData.key.userId}" hover="false" />
-									&nbsp;<c:out value="${learnerData.key.firstName}" escapeXml="true"/>
-									&nbsp;<c:out value="${learnerData.key.lastName}" escapeXml="true"/>
-								</a>
-							</span>
-							<button class="btn btn-default pull-right email-button btn-disable-on-submit"
-									onClick="javascript:previewResultsForLearner(${session.key.sessionId}, ${learnerData.key.userId})">
-								<fmt:message key="button.preview.results" />
-							</button>
-					       </div>
-				       
-				       	<div id="rubrics-user-collapse-${learnerData.key.uid}" class="panel-collapse collapse" 
-				       	    role="tabpanel" aria-labelledby="rubrics-user-heading-${learnerData.key.uid}">
-				       	    	<%-- Display ratings given to this user --%>
-								<lams:StyledRating criteriaRatings="${learnerData.value}" showJustification="true" alwaysShowAverage="false" currentUserDisplay="true"/>
-							</div>
-						</div>
-	       	    	</c:forEach>
-				</div>
-				
-	<c:if test="${sessionMap.isGroupedActivity}">
-			</div>
-		</div>
-	</c:if>
+	function clearMessage() {
+		$("#messageArea2").html("");
+		return false;
+	}
 	
-	</c:forEach>
+	// Prview the email to be sent to the learner
+	function previewResultsForLearner(sessionId, userId) {
+		$(".btn-disable-on-submit").prop("disabled", true);
+		var url = "<c:url value="/monitoring/previewResultsToUser.do"/>";
+		clearMessage();
+		$("#messageArea2_Busy").show();
+		$("#emailPreviewArea").load(
+			url,
+			{
+				sessionMapID: "${sessionMapID}",
+				toolContentID: ${sessionMap.toolContentID},
+				toolSessionId: sessionId, 
+				userID: userId,
+				reqID: (new Date()).getTime()
+			},
+			function() {
+				$("#messageArea2_Busy").hide();
+				$("#emailPreviewArea").show();
+				$(".btn-disable-on-submit").prop("disabled", false);
+			}
+		);
+		return false;
+	}
 	
-<c:if test="${sessionMap.isGroupedActivity}">
+	// Send the previewed email to the learner
+	function sendResultsForLearner(sessionId, userId, dateTimeStamp) {
+		$(".btn-disable-on-submit").prop("disabled", true);
+		var url = "<c:url value="/monitoring/sendPreviewedResultsToUser.do"/>";
+		clearMessage();
+		$("#messageArea2_Busy").show();
+		$("#messageArea2").load(
+			url,
+			{
+				sessionMapID: "${sessionMapID}",
+				toolContentID: ${sessionMap.toolContentID},
+				toolSessionId: sessionId, 
+				dateTimeStamp: dateTimeStamp,
+				userID: userId,
+				reqID: (new Date()).getTime()
+			},
+			function() {
+				$("#messageArea2_Busy").hide();
+				closeResultsForLearner();
+				$(".btn-disable-on-submit").prop("disabled", false);
+			}
+		);
+		return false;
+	}
+</script>
+
+<!--For send results feature-->
+<i class="fa fa-spinner" style="display:none" id="messageArea2_Busy"></i>
+<div class="voffset5" id="messageArea2"></div>
+
+	     
+<c:forEach var="learnerData" items="${rubricsLearnerData}">
+  	    	
+<%-- List learners in the given session --%>
+<div class="panel panel-default rubrics-user-panel">
+      <div class="panel-heading" role="tab" id="rubrics-user-heading-${learnerData.key.uid}">
+      	<span class="panel-title collapsable-icon-left">
+      		<a class="collapsed" role="button" data-toggle="collapse" href="#rubrics-user-collapse-${learnerData.key.uid}" 
+				aria-expanded="false" aria-controls="rubrics-user-collapse-${learnerData.key.uid}">
+			<lams:Portrait userId="${learnerData.key.userId}" hover="false" />
+			&nbsp;<c:out value="${learnerData.key.firstName}" escapeXml="true"/>
+			&nbsp;<c:out value="${learnerData.key.lastName}" escapeXml="true"/>
+		</a>
+	</span>
+	<button class="btn btn-default pull-right email-button btn-disable-on-submit"
+			onClick="javascript:previewResultsForLearner(${toolSessionId}, ${learnerData.key.userId})">
+		<fmt:message key="button.preview.results" />
+	</button>
+      </div>
+     
+     	<div id="rubrics-user-collapse-${learnerData.key.uid}" class="panel-collapse collapse" 
+     	    role="tabpanel" aria-labelledby="rubrics-user-heading-${learnerData.key.uid}">
+     	    	<%-- Display ratings given to this user --%>
+		<lams:StyledRating criteriaRatings="${learnerData.value}" showJustification="true" alwaysShowAverage="false" currentUserDisplay="true"/>
+	</div>
 </div>
-</c:if>
\ No newline at end of file
+</c:forEach>
+
+<div class="voffset10" id="emailPreviewArea" style="display:none" ></div>
\ No newline at end of file
Index: lams_tool_preview/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r6437f6b8a894d41f5dd5a76a6fe7e95d50171900 -rca958ecbc65696caf0f399cec0a8eace5a84da98
--- lams_tool_preview/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 6437f6b8a894d41f5dd5a76a6fe7e95d50171900)
+++ lams_tool_preview/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision ca958ecbc65696caf0f399cec0a8eace5a84da98)
@@ -23,14 +23,14 @@
 		
 	//vars for rating.js
 	var MAX_RATES = 0,
-	MIN_RATES = 0,
-	COMMENTS_MIN_WORDS_LIMIT = 0,
-	MAX_RATINGS_FOR_ITEM = 0,
-	LAMS_URL = '',
-	COUNT_RATED_ITEMS = 0,
-	COMMENT_TEXTAREA_TIP_LABEL = '',
-	WARN_COMMENTS_IS_BLANK_LABEL = '',
-	WARN_MIN_NUMBER_WORDS_LABEL = '';
+		MIN_RATES = 0,
+		COMMENTS_MIN_WORDS_LIMIT = 0,
+		MAX_RATINGS_FOR_ITEM = 0,
+		LAMS_URL = '',
+		COUNT_RATED_ITEMS = 0,
+		COMMENT_TEXTAREA_TIP_LABEL = '',
+		WARN_COMMENTS_IS_BLANK_LABEL = '',
+		WARN_MIN_NUMBER_WORDS_LABEL = '';
 </script>
 <script type="text/javascript" src="${lams}includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 
@@ -117,6 +117,7 @@
 			<c:set var="sessionMap" value="${sessionMap}" scope="request"/>
 			<c:choose>
 				<c:when test="${criteria.rubricsStyleRating}">
+					<c:set var="rubricsLearnerData" value="${rubricsData[toolSessionId]}" scope="request"/>
 					<%@ include file="rubricspart.jsp" %>
 				</c:when>
 				<c:otherwise>