Index: lams_tool_bbb/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.8.2.2 -r1.8.2.3
--- lams_tool_bbb/conf/language/lams/ApplicationResources.properties	11 May 2016 07:14:49 -0000	1.8.2.2
+++ lams_tool_bbb/conf/language/lams/ApplicationResources.properties	4 Jun 2016 11:56:03 -0000	1.8.2.3
@@ -68,6 +68,6 @@
 config.securitySalt  =Security Salt
 message.unableToStartLesson  =Unable to join meeting.  Please see your instructor.
 button.submit  =Finish
+message.monitoring.summary.no.session  =No Session Available
 
-
 #======= End labels: Exported 63 labels for en AU =====
Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dto/ContentDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dto/ContentDTO.java,v
diff -u -r1.2.2.2 -r1.2.2.3
--- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dto/ContentDTO.java	11 May 2016 07:14:49 -0000	1.2.2.2
+++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dto/ContentDTO.java	4 Jun 2016 11:56:03 -0000	1.2.2.3
@@ -48,13 +48,16 @@
     boolean defineLater;
 
     boolean contentInUse;
-
+    
     boolean lockOnFinish;
 
     Set<SessionDTO> sessionDTOs = new TreeSet<SessionDTO>();
 
     Long currentTab;
 
+    boolean isGroupedActivity; // set manually in MonitoringAction
+
+
     /* Constructors */
     public ContentDTO() {
     }
@@ -71,6 +74,8 @@
 	for (BbbSession bbbSession : bbb.getBbbSessions()) {
 	    sessionDTOs.add(new SessionDTO(bbbSession));
 	}
+	
+	isGroupedActivity = false;
     }
 
     /* Getters / Setters */
@@ -146,4 +151,12 @@
 	this.currentTab = currentTab;
     }
 
+    public boolean isGroupedActivity() {
+        return isGroupedActivity;
+    }
+
+    public void setGroupedActivity(boolean isGroupedActivity) {
+        this.isGroupedActivity = isGroupedActivity;
+    }
+
 }
Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java,v
diff -u -r1.8.2.5 -r1.8.2.6
--- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java	11 May 2016 07:14:49 -0000	1.8.2.5
+++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java	4 Jun 2016 11:56:03 -0000	1.8.2.6
@@ -434,6 +434,12 @@
     }
 
     @Override
+    public boolean isGroupedActivity(long toolContentID) {
+	return toolService.isGroupedActivity(toolContentID);
+    }
+
+
+    @Override
     @SuppressWarnings("unchecked")
     public BbbSession getSessionBySessionId(Long toolSessionId) {
 	List<BbbSession> list = bbbSessionDAO.findByProperty(BbbSession.class, "sessionId", toolSessionId);
Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/IBbbService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/IBbbService.java,v
diff -u -r1.2.2.2 -r1.2.2.3
--- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/IBbbService.java	11 May 2016 07:14:49 -0000	1.2.2.2
+++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/IBbbService.java	4 Jun 2016 11:56:03 -0000	1.2.2.3
@@ -63,6 +63,12 @@
     public Bbb getBbbByContentId(Long toolContentID);
 
     /**
+     * @param toolContentID
+     * @return
+     */
+    public boolean isGroupedActivity(long toolContentID);
+
+    /**
      * @param bbb
      */
     public void saveOrUpdateBbb(Bbb bbb);
Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/MonitoringAction.java,v
diff -u -r1.1.4.3 -r1.1.4.4
--- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/MonitoringAction.java	11 May 2016 07:14:49 -0000	1.1.4.3
+++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/MonitoringAction.java	4 Jun 2016 11:56:03 -0000	1.1.4.4
@@ -96,8 +96,12 @@
 	Long currentTab = WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB, true);
 	contentDT0.setCurrentTab(currentTab);
 
+	contentDT0.setGroupedActivity(bbbService.isGroupedActivity(toolContentID));
+
 	request.setAttribute(Constants.ATTR_CONTENT_DTO, contentDT0);
 	request.setAttribute(Constants.ATTR_CONTENT_FOLDER_ID, contentFolderID);
+
+
 	return mapping.findForward("success");
     }
 
Index: lams_tool_bbb/web/pages/monitoring/editActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/pages/monitoring/editActivity.jsp,v
diff -u -r1.2.2.1 -r1.2.2.2
--- lams_tool_bbb/web/pages/monitoring/editActivity.jsp	19 May 2016 07:02:19 -0000	1.2.2.1
+++ lams_tool_bbb/web/pages/monitoring/editActivity.jsp	4 Jun 2016 11:56:03 -0000	1.2.2.2
@@ -2,35 +2,38 @@
 
 <c:set var="dto" value="${contentDTO}" />
 
-<div class="panel">
-	<p>
-		<fmt:message key="label.authoring.basic.title" />
-		:</br>
-		<c:out value="${dto.title}" escapeXml="true" />
-	</p>
-	<p>
-		<fmt:message key="label.authoring.basic.instructions" />
-		: </br>
-		<c:out value="${dto.instructions}" escapeXml="false" />
-	</p>
-</div>
-
 <c:if test="${dto.contentInUse}">
 	<lams:Alert id="edit" type="info" close="false">
 		<fmt:message key="message.alertContentEdit" />
 	</lams:Alert>
 </c:if>
 
+<table class="table table-condensed">
+	<tr>
+		<td width="20%">
+		<fmt:message key="label.authoring.basic.title" />
+		</td>
+		<td>
+		<c:out value="${dto.title}" escapeXml="true" />
+		</td>
+	</tr>
+	<tr>
+		<td>
+		<fmt:message key="label.authoring.basic.instructions" />
+		</td>
+		<td>
+		<c:out value="${dto.instructions}" escapeXml="false" />
+		</td>
+	</tr>
+</table>
 
-<div>
-	<c:url value="/authoring.do" var="authoringUrl">
-		<c:param name="toolContentID" value="${dto.toolContentId}" />
-		<c:param name="mode" value="teacher" />
-		<c:param name="contentFolderID" value="${contentFolderID}" />
-	</c:url>
-	<html:link href="${authoringUrl}" styleClass="btn btn-primary pull-right voffset10" target="_blank">
-		<fmt:message key="button.editActivity" />
-	</html:link>
-</div>
+<c:url value="/authoring.do" var="authoringUrl">
+	<c:param name="toolContentID" value="${dto.toolContentId}" />
+	<c:param name="mode" value="teacher" />
+	<c:param name="contentFolderID" value="${contentFolderID}" />
+</c:url>
+<html:link href="${authoringUrl}" styleClass="btn btn-default voffset5" target="_blank">
+	<fmt:message key="button.editActivity" />
+</html:link>
 
 
Index: lams_tool_bbb/web/pages/monitoring/statistics.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/pages/monitoring/statistics.jsp,v
diff -u -r1.1.4.1 -r1.1.4.2
--- lams_tool_bbb/web/pages/monitoring/statistics.jsp	19 May 2016 07:02:19 -0000	1.1.4.1
+++ lams_tool_bbb/web/pages/monitoring/statistics.jsp	4 Jun 2016 11:56:03 -0000	1.1.4.2
@@ -1,13 +1,19 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <c:set var="dto" value="${contentDTO}" />
+
 <c:forEach var="session" items="${dto.sessionDTOs}">
 
-	<h4>
-		<c:out value="${session.sessionName}" escapeXml="true"/>
-	</h4>
+	<c:if test="${dto.groupedActivity}">	
+	    <div class="panel panel-default" >
+        <div class="panel-heading">
+			<span class="panel-title">
+				<c:out value="${session.sessionName}" escapeXml="true"/>
+			</span>
+        </div>
+	</c:if>
 
-	<table class="table table-striped table-condensed">
+	<table class="table table-condensed">
 		<tr>
 			<td>
 				<fmt:message>heading.totalLearnersInGroup</fmt:message>
@@ -25,4 +31,9 @@
 			</td>
 		</tr>
 	</table>
+	
+	<c:if test="${dto.groupedActivity}">	
+		</div>
+	</c:if>
+	
 </c:forEach>
Index: lams_tool_bbb/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/pages/monitoring/summary.jsp,v
diff -u -r1.2.2.2 -r1.2.2.3
--- lams_tool_bbb/web/pages/monitoring/summary.jsp	20 May 2016 01:56:08 -0000	1.2.2.2
+++ lams_tool_bbb/web/pages/monitoring/summary.jsp	4 Jun 2016 11:56:03 -0000	1.2.2.3
@@ -2,57 +2,60 @@
 
 <c:set var="dto" value="${contentDTO}" />
 
-<c:set var="adTitle"><fmt:message key="monitor.summary.th.advancedSettings" /></c:set>
-<lams:AdvancedAccordian title="${adTitle}">
-	<table class="table table-striped table-condensed">
+<div class="panel">
+	<h4>
+	    <c:out value="${contentDTO.title}" escapeXml="true"/>
+	</h4>
+	<div class="instructions voffset5">
+	    <c:out value="${contentDTO.instructions}" escapeXml="false"/>
+	</div>
+	
+ 	<c:if test="${empty dto.sessionDTOs}">
+		<lams:Alert type="info" id="no-session-summary" close="false">
+			<fmt:message key="message.monitoring.summary.no.session" />
+		</lams:Alert>
+	</c:if>
 
-		<tr>
-			<td>
-				<fmt:message key="advanced.lockOnFinished" />
-			</td>
+</div>
 
-			<td>
-				<c:choose>
-					<c:when test="${dto.lockOnFinish}">
-						<fmt:message key="label.on" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="label.off" />
-					</c:otherwise>
-				</c:choose>
-			</td>
-		</tr>
+<c:set var="usePanel" value="${dto.reflectOnActivity && dto.groupedActivity}"/>
 
-	</table>
-</lams:AdvancedAccordian>
+<c:if test="${usePanel}">
+<div class="panel-group" id="accordionSessions" role="tablist" aria-multiselectable="true"> 
+</c:if>
 
+	<c:forEach var="session" items="${dto.sessionDTOs}" varStatus="status">
 
-
-	<c:forEach var="session" items="${dto.sessionDTOs}">
-	
-		<h4>
-			<c:out value="${session.sessionName}" escapeXml="true"/>
-		</h4>
-	
 		<html:form action="monitoring"  target="bbbMonitor${session.sessionID}" onsubmit="window.open('', 'bbbMonitor${session.sessionID}', 'resizable=yes,scrollbars=yes')"> 
 			<html:hidden property="dispatch" value="startMeeting" />
 			<html:hidden property="toolSessionID" value="${session.sessionID}" />
-						
-			<p>
-				<html:submit styleClass="btn btn-primary loffset5 voffset10">
+
+		<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>
-			</p>
-		</html:form>
+				</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>
 		
-	
-		<p>
-			<span class="field-name"> <fmt:message
-					key="heading.totalLearners" /> </span> ${session.numberOfLearners}
-		</p>
-		
-		<c:if test="${contentDTO.reflectOnActivity}">
-			<div class="table-responsive">
+		<c:if test="${dto.reflectOnActivity}">
 			<table class="table table-striped">
 		
 				<tr>
@@ -87,9 +90,45 @@
 					</tr>
 				</c:forEach>
 			</table>
-			</div>
 		</c:if>
 		
+		</html:form>
 		
-	</c:forEach>
+	<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:if>
+
+<c:set var="adTitle"><fmt:message key="monitor.summary.th.advancedSettings" /></c:set>
+<lams:AdvancedAccordian title="${adTitle}">
+	<table class="table table-striped table-condensed">
+
+		<tr>
+			<td>
+				<fmt:message key="advanced.lockOnFinished" />
+			</td>
+
+			<td>
+				<c:choose>
+					<c:when test="${dto.lockOnFinish}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>
+			</td>
+		</tr>
+
+	</table>
+</lams:AdvancedAccordian>
+
+
+