Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java
===================================================================
diff -u -rec21ca839bfcba1bb6d6b45276c39a0cc3cb2f3d -r6437f6b8a894d41f5dd5a76a6fe7e95d50171900
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java	(.../IPeerreviewService.java)	(revision ec21ca839bfcba1bb6d6b45276c39a0cc3cb2f3d)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java	(.../IPeerreviewService.java)	(revision 6437f6b8a894d41f5dd5a76a6fe7e95d50171900)
@@ -91,6 +91,8 @@
      */
     PeerreviewUser getUserByIDAndSession(Long long1, Long sessionId);
 
+    List<PeerreviewUser> getUsersBySession(Long sessionId);
+
     /**
      * Save or update peerreview into database.
      *
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
===================================================================
diff -u -r4bed7d4c0672c281ae66a77fad0d69fb064a9657 -r6437f6b8a894d41f5dd5a76a6fe7e95d50171900
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java	(.../PeerreviewServiceImpl.java)	(revision 4bed7d4c0672c281ae66a77fad0d69fb064a9657)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java	(.../PeerreviewServiceImpl.java)	(revision 6437f6b8a894d41f5dd5a76a6fe7e95d50171900)
@@ -60,6 +60,7 @@
 import org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO;
 import org.lamsfoundation.lams.rating.dto.StyledRatingDTO;
 import org.lamsfoundation.lams.rating.model.LearnerItemRatingCriteria;
+import org.lamsfoundation.lams.rating.model.Rating;
 import org.lamsfoundation.lams.rating.model.RatingCriteria;
 import org.lamsfoundation.lams.rating.model.RatingRubricsColumn;
 import org.lamsfoundation.lams.rating.service.IRatingService;
@@ -179,6 +180,11 @@
     }
 
     @Override
+    public List<PeerreviewUser> getUsersBySession(Long sessionId) {
+	return peerreviewUserDao.getBySessionID(sessionId);
+    }
+
+    @Override
     public void saveOrUpdatePeerreview(Peerreview peerreview) {
 	peerreviewDao.insertOrUpdate(peerreview);
     }
@@ -362,24 +368,11 @@
 	}
 
 	if (criteria.isRubricsStyleRating() && !getByUser) {
-	    // for rubrics we need every answer, not just aggregation
-	    StyledCriteriaRatingDTO dto = new StyledCriteriaRatingDTO();
-	    dto.setRatingCriteria(criteria);
-	    List<StyledRatingDTO> ratingDtos = ratingService
-		    .getRatingsByCriteriasAndItems(Set.of(criteria.getRatingCriteriaId()), Set.of(currentUserId))
-		    .stream()
-		    .filter(rating -> getAllUsers || !rating.getLearner().getUserId().equals(currentUserId.intValue()))
-		    .collect(Collectors.mapping(rating -> {
-			StyledRatingDTO ratingDto = new StyledRatingDTO(currentUserId);
-			if (rating.getRating() != null) {
-			    ratingDto.setUserRating(String.valueOf(rating.getRating().intValue()));
-			}
-			ratingDto.setItemDescription(rating.getLearner().getFullName());
-			return ratingDto;
-		    }, Collectors.toList()));
+	    Collection<Rating> ratings = ratingService
+		    .getRatingsByCriteriasAndItems(Set.of(criteria.getRatingCriteriaId()), Set.of(currentUserId));
 
-	    dto.setRatingDtos(ratingDtos);
-	    return dto;
+	    return PeerreviewServiceImpl.getRubricsCriteriaDTO(criteria, currentUserId.intValue(), getAllUsers,
+		    ratings);
 	}
 
 	List<Object[]> rawData = peerreviewUserDao.getRatingsComments(toolContentId, toolSessionId, criteria,
@@ -606,7 +599,29 @@
 	    }
 	}
     }
-    
+
+    public static StyledCriteriaRatingDTO getRubricsCriteriaDTO(RatingCriteria criteria, Integer currentUserId,
+	    boolean includeCurrentUser, Collection<Rating> ratings) {
+	StyledCriteriaRatingDTO dto = new StyledCriteriaRatingDTO();
+	dto.setRatingCriteria(criteria);
+	List<StyledRatingDTO> ratingDtos = ratings.stream()
+		.filter(rating -> rating.getRatingCriteria().getRatingCriteriaId()
+			.equals(criteria.getRatingCriteriaId()) && rating.getItemId().equals(currentUserId.longValue())
+			&& (includeCurrentUser || !rating.getLearner().getUserId().equals(currentUserId)))
+		.collect(Collectors.mapping(rating -> {
+		    StyledRatingDTO ratingDto = new StyledRatingDTO(currentUserId.longValue());
+		    if (rating.getRating() != null) {
+			ratingDto.setUserRating(String.valueOf(rating.getRating().intValue()));
+		    }
+		    ratingDto.setItemDescription(rating.getLearner().getFullName());
+		    ratingDto.setItemDescription2(rating.getLearner().getUserId().toString());
+		    return ratingDto;
+		}, Collectors.toList()));
+
+	dto.setRatingDtos(ratingDtos);
+	return dto;
+    }
+
     // *****************************************************************************
     // private methods
     // *****************************************************************************
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/MonitoringController.java
===================================================================
diff -u -r4bed7d4c0672c281ae66a77fad0d69fb064a9657 -r6437f6b8a894d41f5dd5a76a6fe7e95d50171900
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 4bed7d4c0672c281ae66a77fad0d69fb064a9657)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 6437f6b8a894d41f5dd5a76a6fe7e95d50171900)
@@ -26,12 +26,15 @@
 import java.io.IOException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.Collection;
+import java.util.Comparator;
 import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
+import java.util.Map;
 import java.util.TimeZone;
+import java.util.TreeMap;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
@@ -40,11 +43,15 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO;
+import org.lamsfoundation.lams.rating.model.Rating;
 import org.lamsfoundation.lams.rating.model.RatingCriteria;
+import org.lamsfoundation.lams.rating.service.IRatingService;
 import org.lamsfoundation.lams.tool.peerreview.PeerreviewConstants;
 import org.lamsfoundation.lams.tool.peerreview.dto.EmailPreviewDTO;
 import org.lamsfoundation.lams.tool.peerreview.dto.GroupSummary;
 import org.lamsfoundation.lams.tool.peerreview.model.Peerreview;
+import org.lamsfoundation.lams.tool.peerreview.model.PeerreviewUser;
 import org.lamsfoundation.lams.tool.peerreview.service.IPeerreviewService;
 import org.lamsfoundation.lams.tool.peerreview.service.PeerreviewServiceImpl;
 import org.lamsfoundation.lams.util.DateUtil;
@@ -87,6 +94,9 @@
     @Qualifier("peerreviewService")
     private IPeerreviewService service;
 
+    @Autowired
+    private IRatingService ratingService;
+
     @RequestMapping("/summary")
     public String summary(HttpServletRequest request, HttpServletResponse response) {
 	// initial Session Map
@@ -110,9 +120,14 @@
 	sessionMap.put(PeerreviewConstants.ATTR_IS_GROUPED_ACTIVITY, service.isGroupedActivity(contentId));
 
 	List<RatingCriteria> criterias = service.getRatingCriterias(contentId);
-
 	PeerreviewServiceImpl.removeGroupedCriteria(criterias);
-	
+
+	if (criterias.size() == 1 && criterias.get(0).isRubricsStyleRating()) {
+	    Map<GroupSummary, Map<PeerreviewUser, StyledCriteriaRatingDTO>> rubricsData = getRubricsData(sessionMap,
+		    criterias.get(0), criterias);
+	    request.setAttribute("rubricsData", rubricsData);
+	}
+
 	request.setAttribute(PeerreviewConstants.ATTR_CRITERIAS, criterias);
 	return MONITORING_PATH;
     }
@@ -132,6 +147,15 @@
 	Long criteriaId = WebUtil.readLongParam(request, "criteriaId");
 	RatingCriteria criteria = service.getCriteriaByCriteriaId(criteriaId);
 
+	if (criteria.isRubricsStyleRating()) {
+	    Long toolContentId = (Long) sessionMap.get(PeerreviewConstants.ATTR_TOOL_CONTENT_ID);
+
+	    List<RatingCriteria> criterias = service.getRatingCriterias(toolContentId);
+	    Map<GroupSummary, Map<PeerreviewUser, StyledCriteriaRatingDTO>> rubricsData = getRubricsData(sessionMap,
+		    criteria, criterias);
+	    request.setAttribute("rubricsData", rubricsData);
+	}
+
 	request.setAttribute("criteria", criteria);
 	request.setAttribute("toolSessionId", toolSessionId);
 	return CRITERIA_PATH;
@@ -669,4 +693,36 @@
 	return "";
     }
 
+    @SuppressWarnings("unchecked")
+    private Map<GroupSummary, Map<PeerreviewUser, StyledCriteriaRatingDTO>> getRubricsData(
+	    SessionMap<String, Object> sessionMap, RatingCriteria criteria, Collection<RatingCriteria> criterias) {
+	List<GroupSummary> sessionList = (List<GroupSummary>) sessionMap.get(PeerreviewConstants.ATTR_SUMMARY_LIST);
+
+	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(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);
+	    }
+	}
+
+	return rubricsData;
+    }
 }
Index: lams_tool_preview/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rc76093f9d9aef9619dee82be9f75c94290385a1e -r6437f6b8a894d41f5dd5a76a6fe7e95d50171900
--- lams_tool_preview/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision c76093f9d9aef9619dee82be9f75c94290385a1e)
+++ lams_tool_preview/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 6437f6b8a894d41f5dd5a76a6fe7e95d50171900)
@@ -199,5 +199,187 @@
 	</c:if>
 </c:when> 
 
+<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == 4}">
 
+	<%-- Some styles for the table and results --%>
+	<style>	
+		.rubrics-user-panel .collapsable-icon-left a {
+			text-decoration: none;
+		}
+		
+		.rubrics-user-panel .collapsable-icon-left a:after {
+			margin-top: 6px;
+		}
+		
+		.rubrics-table tr:first-child {
+			background-color: initial !important;
+		}
+		
+		.rubrics-table th {
+			font-style: normal;
+			font-weight: bold;
+		}
+		
+		.rubrics-table .rubrics-rating-cell {
+			border-top: none;
+			
+		}
+		.rubrics-table .rubrics-rating-cell .rubrics-rating-count {
+			text-align: right;
+		}
+		
+		.rubrics-table .rubrics-rating-cell .rubrics-rating-count > .badge {
+			color: gray;
+			background-color: white;
+			font-size: large;
+		}
+		
+		.rubrics-table .rubrics-rating-cell .rubrics-rating-learner {
+			margin-top: 10px;
+		}
+		
+		.rubrics-table .rubrics-description-cell {
+			border-bottom: none;
+		}
+	</style>
+	
+	<c:choose>
+		<c:when test="${currentUserDisplay}">
+			
+			<table class="table table-bordered rubrics-table">
+				<tr>
+					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
+					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}">
+						<th class="col-xs-2">
+							<c:out value="${columnHeader}" escapeXml="false"/>
+						</th>
+					</c:forEach>
+				</tr>
+				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
+					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
+					
+					<tr>
+						<td rowspan="2">
+							<c:out value="${criteria.title}" escapeXml="false" />
+						</td>
+						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
+							
+							<%-- Check if any other learner rated this learner for this column --%>
+							<c:set var="rateCount" value="0" />
+							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+							</c:forEach>
+							
+							<td class="rubrics-description-cell
+								<c:if test="${rateCount > 0}">
+									bg-success
+								</c:if>
+								"
+							>
+								<c:out value="${column.name}" escapeXml="false" />
+							</td>
+						</c:forEach>
+					</tr>
+					<tr>
+						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
+							<%-- Calculate again because we need the same cell background colour --%>
+							<c:set var="rateCount" value="0" />
+							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+							</c:forEach>
+							
+							<td class="rubrics-rating-cell
+								<%-- Columns are ordered from 1 to 5, so rate value is also the order ID of the column --%>
+								<c:if test="${rateCount > 0}">
+									bg-success
+								</c:if>
+								"
+							>
+							
+								<c:if test="${rateCount > 0}">
+									<%-- learners see just how many rates they got from other learners --%>
+									<div class="rubrics-rating-count">
+										<span class="badge">x&nbsp;${rateCount}</span>
+									</div>
+									
+									<%-- teachers see also who gave the rating --%>
+									<c:if test="${showJustification}">
+										<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
+											<c:if test="${ratingDto.userRating eq columnOrderId.count}">
+												<div class="rubrics-rating-learner">
+													<lams:Portrait userId="${ratingDto.itemDescription2}" hover="false" />
+													&nbsp;<c:out value="${ratingDto.itemDescription}" escapeXml="true"/>
+												</div>
+											</c:if>
+										</c:forEach>
+									</c:if>
+								</c:if>
+							</td>
+						</c:forEach>
+					</tr>
+				</c:forEach>
+			</table>
+		</c:when>
+		
+		<c:otherwise>
+		
+			<c:set var="criteriaGroupId" value="${criteriaRatings.ratingCriteria.ratingCriteriaGroupId}" />
+			
+			<div id="rubrics-user-panels-${criteriaGroupId}" class="panel-group" role="tablist" aria-multiselectable="true">
+			<%-- It is sufficient to take user names and columns from the first row/criterion --%>
+			<c:set var="exampleRatings" value="${criteriaRatings.ratingDtos}" />
+		
+				<c:forEach var="ratingDto" items="${exampleRatings}" varStatus="learnerOrderId">
+					
+					<div class="panel panel-default rubrics-user-panel">
+				       <div class="panel-heading" role="tab" id="rubrics-heading-${criteriaGroupId}-${ratingDto.itemId}">
+				       	<span class="panel-title collapsable-icon-left">
+				       		<a class="collapsed" role="button" data-toggle="collapse" href="#rubrics-collapse-${criteriaGroupId}-${ratingDto.itemId}" 
+									aria-expanded="false" aria-controls="rubrics-collapse-${criteriaGroupId}-${ratingDto.itemId}"
+									data-parent="#rubrics-users-panels-${criteriaGroupId}">
+								<lams:Portrait userId="${ratingDto.itemId}" hover="false" />
+								&nbsp;<c:out value="${ratingDto.itemDescription}" escapeXml="true"/>
+							</a>
+						</span>
+				       </div>
+			       
+			       <div id="rubrics-collapse-${criteriaGroupId}-${ratingDto.itemId}" class="panel-collapse collapse" 
+			       	    role="tabpanel" aria-labelledby="rubrics-heading-${criteriaGroupId}-${ratingDto.itemId}">
+							<table class="table table-bordered rubrics-table">
+								<tr>
+									<%-- Each answer column has the same length, all remaining space is take by the question column --%>
+									<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+									<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}">
+										<th class="col-xs-2">
+											<c:out value="${columnHeader}" escapeXml="false"/>
+										</th>
+									</c:forEach>
+								</tr>
+								<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
+									<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
+									<tr>
+										<td>
+											<c:out value="${criteria.title}" escapeXml="false" />
+										</td>
+										<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
+											<td
+												<%-- Columns are ordered from 1 to 5, so rate value is also the order ID of the column --%>
+												<c:if test="${criteriaDto.ratingDtos[learnerOrderId.index].userRating eq columnOrderId.count}">
+													class="bg-success"
+												</c:if>
+											>
+												<c:out value="${column.name}" escapeXml="false" />	
+											</td>
+										</c:forEach>
+										</tr>
+								</c:forEach>
+							</table>
+						</div>
+					</div>
+				</c:forEach>
+			</div>
+		</c:otherwise>
+	</c:choose>
+</c:when>
 </c:choose>
\ No newline at end of file
Index: lams_tool_preview/web/pages/learning/results.jsp
===================================================================
diff -u -r4a6c446731f09a496394db2f52e60431d8160d53 -r6437f6b8a894d41f5dd5a76a6fe7e95d50171900
--- lams_tool_preview/web/pages/learning/results.jsp	(.../results.jsp)	(revision 4a6c446731f09a496394db2f52e60431d8160d53)
+++ lams_tool_preview/web/pages/learning/results.jsp	(.../results.jsp)	(revision 6437f6b8a894d41f5dd5a76a6fe7e95d50171900)
@@ -38,7 +38,6 @@
 		WARN_COMMENTS_IS_BLANK_LABEL = '<fmt:message key="warning.comment.blank"/>',
 		WARN_MIN_NUMBER_WORDS_LABEL = "<fmt:message key="warning.minimum.number.words"><fmt:param value="${criteriaRatings.ratingCriteria.commentsMinWordsLimit}"/></fmt:message>";
 	</script>
-	<script src="${lams}includes/javascript/jquery.js" type="text/javascript"></script>
 	<script src="${lams}includes/javascript/jquery.jRating.js" type="text/javascript"></script>
 	<script src="${lams}includes/javascript/jquery.tablesorter.js" type="text/javascript"></script>
 	<script src="${lams}includes/javascript/jquery.tablesorter-widgets.js" type="text/javascript"></script>
@@ -103,9 +102,11 @@
 		<c:if test="${not empty allCriteriaRatings}">
 		<c:forEach var="criteriaRatings" items="${allCriteriaRatings}" varStatus="status">
 			<div class="panel panel-default">
-			<div class="panel-heading panel-title">
-				<c:out value="${criteriaRatings.ratingCriteria.title}" escapeXml="true"/>
-			</div>
+			<c:if test="${not criteriaRatings.ratingCriteria.rubricsStyleRating}">
+				<div class="panel-heading panel-title">
+					<c:out value="${criteriaRatings.ratingCriteria.title}" escapeXml="true"/>
+				</div>
+			</c:if>
 			<div class="panel-body">
 			<lams:StyledRating criteriaRatings="${criteriaRatings}" showJustification="true" alwaysShowAverage="false" currentUserDisplay="false" />
 			</div>
@@ -127,7 +128,9 @@
 			</lams:Alert>
 		
 			<c:forEach var="criteriaRatings" items="${userRatings}" varStatus="status">
-				<h4><c:out value="${criteriaRatings.ratingCriteria.title}" escapeXml="true"/></h4>
+				<c:if test="${not criteriaRatings.ratingCriteria.rubricsStyleRating}">
+					<h4><c:out value="${criteriaRatings.ratingCriteria.title}" escapeXml="true"/></h4>
+				</c:if>
 		 		<lams:StyledRating criteriaRatings="${criteriaRatings}" showJustification="false" alwaysShowAverage="true" currentUserDisplay="true"/>
 			</c:forEach>
 		</div>
Index: lams_tool_preview/web/pages/monitoring/criteria.jsp
===================================================================
diff -u -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5 -r6437f6b8a894d41f5dd5a76a6fe7e95d50171900
--- lams_tool_preview/web/pages/monitoring/criteria.jsp	(.../criteria.jsp)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
+++ lams_tool_preview/web/pages/monitoring/criteria.jsp	(.../criteria.jsp)	(revision 6437f6b8a894d41f5dd5a76a6fe7e95d50171900)
@@ -35,8 +35,6 @@
 		WARN_COMMENTS_IS_BLANK_LABEL = '',
 		WARN_MIN_NUMBER_WORDS_LABEL = '';
 	</script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></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>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
@@ -45,9 +43,17 @@
 </lams:head>
 
 <body class="stripes">
-	<lams:Page type="monitor" title="${criteria.title}">
-		<%@ include file="criteriapart.jsp" %>
+	<lams:Page type="monitor" title="${criteria.rubricsStyleRating ? '' : title}">
+		<c:choose>
+			<c:when test="${criteria.rubricsStyleRating}">
+				<%@ include file="rubricspart.jsp" %>
+			</c:when>
+			<c:otherwise>
+				<%@ include file="criteriapart.jsp" %>
+			</c:otherwise>
+		</c:choose>
 		
+		
  		<span onclick="window.close()" class="btn btn-default voffset20 pull-right">
  			<fmt:message key="label.close"/>
  		</span>
Index: lams_tool_preview/web/pages/monitoring/rubricspart.jsp
===================================================================
diff -u
--- lams_tool_preview/web/pages/monitoring/rubricspart.jsp	(revision 0)
+++ lams_tool_preview/web/pages/monitoring/rubricspart.jsp	(revision 6437f6b8a894d41f5dd5a76a6fe7e95d50171900)
@@ -0,0 +1,69 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<style>
+	.rubrics-session-panel > div {
+		padding: 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}">
+	
+		<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>
+					       </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>
+	
+	</c:forEach>
+	
+<c:if test="${sessionMap.isGroupedActivity}">
+</div>
+</c:if>
\ No newline at end of file
Index: lams_tool_preview/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r4bed7d4c0672c281ae66a77fad0d69fb064a9657 -r6437f6b8a894d41f5dd5a76a6fe7e95d50171900
--- lams_tool_preview/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 4bed7d4c0672c281ae66a77fad0d69fb064a9657)
+++ lams_tool_preview/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 6437f6b8a894d41f5dd5a76a6fe7e95d50171900)
@@ -110,14 +110,20 @@
 	
 	<c:set var="rubricsCriteriaCounter" value="1" />
 	<c:choose>
-		<c:when test="${not empty criterias && fn:length(criterias) eq 1}">
-			<c:forEach var="criteria" items="${criterias}">
-			<h4><c:out value="${criteria.title}" escapeXml="true"/></h4>
+		<c:when test="${fn:length(criterias) eq 1}">
+			<c:set var="criteria" value="${criterias[0]}" scope="request"/>
 			<c:set var="toolSessionId" value="${groupSummary.sessionId}" scope="request"/>
 			<c:set var="criteria" value="${criteria}" scope="request"/>
 			<c:set var="sessionMap" value="${sessionMap}" scope="request"/>
-			<jsp:include page="criteriapart.jsp"/>
-			</c:forEach>
+			<c:choose>
+				<c:when test="${criteria.rubricsStyleRating}">
+					<%@ include file="rubricspart.jsp" %>
+				</c:when>
+				<c:otherwise>
+					<h4><c:out value="${criteria.title}" escapeXml="true"/></h4>
+					<%@ include file="criteriapart.jsp" %>
+				</c:otherwise>
+			</c:choose>
 		</c:when>
 		<c:otherwise>
 			<c:forEach var="criteria" items="${criterias}">