Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dto/ContentDTO.java
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rfba5bdf4505b4dbe6d95809740ac8f3c14b07ef1
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dto/ContentDTO.java	(.../ContentDTO.java)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dto/ContentDTO.java	(.../ContentDTO.java)	(revision fba5bdf4505b4dbe6d95809740ac8f3c14b07ef1)
@@ -23,7 +23,11 @@
 
 package org.lamsfoundation.lams.tool.zoom.dto;
 
+import java.util.Set;
+import java.util.TreeSet;
+
 import org.lamsfoundation.lams.tool.zoom.model.Zoom;
+import org.lamsfoundation.lams.tool.zoom.model.ZoomSession;
 
 public class ContentDTO {
 
@@ -39,8 +43,12 @@
 
     Long currentTab;
 
+    boolean contentInUse;
+
     boolean isGroupedActivity; // set manually in MonitoringAction
 
+    Set<SessionDTO> sessionDTOs = new TreeSet<SessionDTO>();
+
     /* Constructors */
     public ContentDTO() {
     }
@@ -49,8 +57,14 @@
 	this.toolContentId = zoom.getToolContentId();
 	this.title = zoom.getTitle();
 	this.instructions = zoom.getInstructions();
+	this.contentInUse = zoom.isContentInUse();
 	this.reflectInstructions = zoom.getReflectInstructions();
 	this.reflectOnActivity = zoom.isReflectOnActivity();
+	for (ZoomSession session : zoom.getZoomSessions()) {
+	    sessionDTOs.add(new SessionDTO(session));
+	}
+
+	isGroupedActivity = false;
     }
 
     public String getInstructions() {
@@ -93,6 +107,14 @@
 	this.toolContentId = toolContentID;
     }
 
+    public Boolean getContentInUse() {
+	return contentInUse;
+    }
+
+    public void setContentInUse(Boolean contentInUse) {
+	this.contentInUse = contentInUse;
+    }
+
     public Long getCurrentTab() {
 	return currentTab;
     }
@@ -108,4 +130,12 @@
     public void setGroupedActivity(boolean isGroupedActivity) {
 	this.isGroupedActivity = isGroupedActivity;
     }
+
+    public Set<SessionDTO> getSessionDTOs() {
+	return sessionDTOs;
+    }
+
+    public void setSessionDTOs(Set<SessionDTO> sessionDTOs) {
+	this.sessionDTOs = sessionDTOs;
+    }
 }
\ No newline at end of file
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dto/SessionDTO.java
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rfba5bdf4505b4dbe6d95809740ac8f3c14b07ef1
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dto/SessionDTO.java	(.../SessionDTO.java)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dto/SessionDTO.java	(.../SessionDTO.java)	(revision fba5bdf4505b4dbe6d95809740ac8f3c14b07ef1)
@@ -27,18 +27,30 @@
 import java.util.TreeSet;
 
 import org.lamsfoundation.lams.tool.zoom.model.ZoomSession;
+import org.lamsfoundation.lams.tool.zoom.model.ZoomUser;
+import org.lamsfoundation.lams.tool.zoom.service.IZoomService;
 
 public class SessionDTO implements Comparable<SessionDTO> {
+    private static IZoomService zoomService;
 
     Long sessionID;
 
     String sessionName;
 
+    int numberOfLearners;
+
     Set<ZoomUserDTO> userDTOs = new TreeSet<ZoomUserDTO>();
 
     public SessionDTO(ZoomSession session) {
 	this.sessionID = session.getSessionId();
 	this.sessionName = session.getSessionName();
+
+	for (ZoomUser zoomUser : session.getZoomUsers()) {
+	    ZoomUserDTO userDTO = zoomService.createUserDTO(zoomUser);
+	    userDTOs.add(userDTO);
+	}
+
+	numberOfLearners = userDTOs.size();
     }
 
     @Override
@@ -76,4 +88,16 @@
     public void setUserDTOs(Set<ZoomUserDTO> zoomUsers) {
 	this.userDTOs = zoomUsers;
     }
+
+    public int getNumberOfLearners() {
+	return numberOfLearners;
+    }
+
+    public void setNumberOfLearners(int numberOfLearners) {
+	this.numberOfLearners = numberOfLearners;
+    }
+
+    public static void setZoomService(IZoomService zoomService) {
+	SessionDTO.zoomService = zoomService;
+    }
 }
\ No newline at end of file
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java
===================================================================
diff -u -reeaae70bac24a36a5f05a5d56638df29c1a495c5 -rfba5bdf4505b4dbe6d95809740ac8f3c14b07ef1
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java	(.../ZoomService.java)	(revision eeaae70bac24a36a5f05a5d56638df29c1a495c5)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java	(.../ZoomService.java)	(revision fba5bdf4505b4dbe6d95809740ac8f3c14b07ef1)
@@ -706,7 +706,7 @@
 
 	JSONObject bodyJSON = new JSONObject();
 	String lastName = userDTO.getLastName();
-	if (!sessionName.endsWith(" learners")) {
+	if (isGroupedActivity(zoom.getToolContentId())) {
 	    lastName += " (" + sessionName + ")";
 	}
 	bodyJSON.put("email", userDTO.getEmail()).put("first_name", userDTO.getFirstName()).put("last_name", lastName);
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/MonitoringAction.java
===================================================================
diff -u -reeaae70bac24a36a5f05a5d56638df29c1a495c5 -rfba5bdf4505b4dbe6d95809740ac8f3c14b07ef1
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision eeaae70bac24a36a5f05a5d56638df29c1a495c5)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision fba5bdf4505b4dbe6d95809740ac8f3c14b07ef1)
@@ -34,16 +34,14 @@
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.zoom.dto.ContentDTO;
 import org.lamsfoundation.lams.tool.zoom.dto.NotebookEntryDTO;//import org.lamsfoundation.lams.tool.zoom.dto.UserDTO;
+import org.lamsfoundation.lams.tool.zoom.dto.SessionDTO;
 import org.lamsfoundation.lams.tool.zoom.dto.ZoomUserDTO;
 import org.lamsfoundation.lams.tool.zoom.model.Zoom;
-import org.lamsfoundation.lams.tool.zoom.model.ZoomSession;
 import org.lamsfoundation.lams.tool.zoom.model.ZoomUser;
 import org.lamsfoundation.lams.tool.zoom.service.IZoomService;
 import org.lamsfoundation.lams.tool.zoom.service.ZoomServiceProxy;
 import org.lamsfoundation.lams.tool.zoom.util.ZoomConstants;
-import org.lamsfoundation.lams.tool.zoom.web.forms.MonitoringForm;
 import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 
 public class MonitoringAction extends DispatchAction {
@@ -76,12 +74,14 @@
 	    logger.error("Unable to find tool content with id :" + toolContentID);
 	}
 
-	ContentDTO contentDT0 = new ContentDTO(zoom);
+	SessionDTO.setZoomService(zoomService);
+	ContentDTO contentDTO = new ContentDTO(zoom);
 
 	Long currentTab = WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB, true);
-	contentDT0.setCurrentTab(currentTab);
+	contentDTO.setCurrentTab(currentTab);
+	contentDTO.setGroupedActivity(zoomService.isGroupedActivity(toolContentID));
 
-	request.setAttribute(ZoomConstants.ATTR_CONTENT_DTO, contentDT0);
+	request.setAttribute(ZoomConstants.ATTR_CONTENT_DTO, contentDTO);
 	request.setAttribute(ZoomConstants.ATTR_CONTENT_FOLDER_ID, contentFolderID);
 
 	return mapping.findForward("success");
Index: lams_tool_zoom/web/pages/monitoring/statistics.jsp
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rfba5bdf4505b4dbe6d95809740ac8f3c14b07ef1
--- lams_tool_zoom/web/pages/monitoring/statistics.jsp	(.../statistics.jsp)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/pages/monitoring/statistics.jsp	(.../statistics.jsp)	(revision fba5bdf4505b4dbe6d95809740ac8f3c14b07ef1)
@@ -22,14 +22,6 @@
 				${session.numberOfLearners}
 			</td>
 		</tr>
-		<tr>
-			<td>
-				<fmt:message>heading.totalFinishedLearnersInGroup</fmt:message>
-			</td>
-			<td>
-				${session.numberOfFinishedLearners}
-			</td>
-		</tr>
 	</table>
 	
 	<c:if test="${dto.groupedActivity}">	
Index: lams_tool_zoom/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rfba5bdf4505b4dbe6d95809740ac8f3c14b07ef1
--- lams_tool_zoom/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision fba5bdf4505b4dbe6d95809740ac8f3c14b07ef1)
@@ -18,100 +18,57 @@
 
 </div>
 
-<c:set var="usePanel" value="${dto.reflectOnActivity && dto.groupedActivity}"/>
 
-<c:if test="${usePanel}">
-<div class="panel-group" id="accordionSessions" role="tablist" aria-multiselectable="true"> 
-</c:if>
+<html:form action="monitoring"  target="zoomMonitor${dto.toolContentId}" onsubmit="window.open('', 'zoomMonitor${dto.toolContentId}', 'resizable=yes,scrollbars=yes')"> 
+	<html:hidden property="dispatch" value="startMeeting" />
+	<html:hidden property="toolContentID" value="${dto.toolContentId}" />
+	<html:submit styleClass="btn btn-primary"><fmt:message key="label.monitoring.startConference" /></html:submit>
+</html:form>
 
-	<c:forEach var="session" items="${dto.sessionDTOs}" varStatus="status">
+<div class="voffset5">&nbsp;</div>
+<c:if test="${dto.reflectOnActivity}">
+	<table class="table table-striped">
+		<tr>
+			<th style="width: 30%;">
+				<fmt:message key="heading.learner" />
+			</th>
+			<th style="width: 70%;">
+				<fmt:message key="heading.notebookEntry" />
+			</th>
+		</tr>
 
-		<html:form action="monitoring"  target="zoomMonitor${session.sessionID}" onsubmit="window.open('', 'zoomMonitor${session.sessionID}', 'resizable=yes,scrollbars=yes')"> 
-			<html:hidden property="dispatch" value="startMeeting" />
-			<html:hidden property="toolSessionID" value="${session.sessionID}" />
-
-		<c:choose>
-		<c:when test="${usePanel}">	
-		    <div class="panel panel-default" >
-	        <div class="panel-heading" id="heading${session.sessionID}">
-	        	<span class="panel-title collapsable-icon-left">
-	        	<a class="${status.first ? '' : 'collapsed'}" role="button" data-toggle="collapse" href="#collapse${session.sessionID}" 
-						aria-expanded="${status.first ? 'false' : 'true'}" aria-controls="collapse${session.sessionID}" >
-				<c:out value="${session.sessionName}" />: <fmt:message key="heading.totalLearners" />&nbsp;${session.numberOfLearners}</a>
-				</span>
-				<span class="pull-right btn-group">
-				<html:submit styleClass="btn btn-primary btn-xs">
-				<fmt:message key="label.monitoring.startConference" />
-				</html:submit>
-				</span>
-	        </div>
-	        <div id="collapse${session.sessionID}" class="panel-collapse collapse ${status.first ? 'in' : ''}" role="tabpanel" aria-labelledby="heading${session.sessionID}">
-		</c:when>
-
-		<c:otherwise>
-			<h4><fmt:message key="heading.totalLearners" />&nbsp;${session.numberOfLearners}</h4>
-			<html:submit styleClass="btn btn-primary"><fmt:message key="label.monitoring.startConference" /></html:submit>
-			<div class="voffset5">&nbsp;</div>
-		</c:otherwise>
-		</c:choose>
-		
-		<c:if test="${dto.reflectOnActivity}">
-			<table class="table table-striped">
-		
+		<c:forEach var="session" items="${dto.sessionDTOs}" varStatus="status">
+			<c:forEach var="user" items="${session.userDTOs}">
 				<tr>
-					<th style="width: 30%;">
-						<fmt:message key="heading.learner" />
-					</th>
-					<th style="width: 70%;">
-						<fmt:message key="heading.notebookEntry" />
-					</th>
+					<td>
+						<c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/>
+					</td>
+					<td>
+						<c:choose>
+							<c:when test="${user.notebookEntryUID == null}">
+								<fmt:message key="label.notAvailable" />
+							</c:when>
+	
+							<c:otherwise>
+								<a
+									href="./monitoring.do?dispatch=openNotebook&amp;userUID=${user.uid}">
+									<fmt:message key="label.view" /> </a>
+							</c:otherwise>
+						</c:choose>
+	
+					</td>
 				</tr>
-		
-		
-				<c:forEach var="user" items="${session.userDTOs}">
-					<tr>
-						<td>
-							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/>
-						</td>
-						<td>
-							<c:choose>
-								<c:when test="${user.notebookEntryUID == null}">
-									<fmt:message key="label.notAvailable" />
-								</c:when>
-		
-								<c:otherwise>
-									<a
-										href="./monitoring.do?dispatch=openNotebook&amp;userUID=${user.uid}">
-										<fmt:message key="label.view" /> </a>
-								</c:otherwise>
-							</c:choose>
-		
-						</td>
-					</tr>
-				</c:forEach>
-			</table>
-		</c:if>
-		
-		</html:form>
-		
-	<c:if test="${usePanel}">
-		</div> <!-- end collapse area  -->
-		</div> <!-- end collapse panel  -->
-	</c:if>
-	${ !usePanel || ! status.last ? '<div class="voffset5">&nbsp;</div>' :  ''}
-
-</c:forEach>
-
-<c:if test="${usePanel}">
-	</div> <!--  end panel group -->
+			</c:forEach>
+		</c:forEach>
+	</table>
 </c:if>
 
+		
+<div class="voffset5">&nbsp;</div>
+
 <c:set var="adTitle"><fmt:message key="monitor.summary.th.advancedSettings" /></c:set>
 <lams:AdvancedAccordian title="${adTitle}">
 	<table class="table table-striped table-condensed">
 
 	</table>
-</lams:AdvancedAccordian>
-
-
-
+</lams:AdvancedAccordian>
\ No newline at end of file