Index: lams_monitoring/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r6cb917bd72987d40f27b9ac4de8359b7014c94b3 -r8ed85ff3ecedeac47ee142f804192dad00939763
--- lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6cb917bd72987d40f27b9ac4de8359b7014c94b3)
+++ lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8ed85ff3ecedeac47ee142f804192dad00939763)
@@ -413,6 +413,7 @@
 label.tbl.monitor = TBL Monitor
 label.teams = Teams
 label.students.teams = Students & Teams
+label.teams.setup = Setup teams
 label.student = Student
 label.gates = Gates
 label.ira = iRAT
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java
===================================================================
diff -u -r6bb0944214e1acde42b04f90bdd453535ec801af -r8ed85ff3ecedeac47ee142f804192dad00939763
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision 6bb0944214e1acde42b04f90bdd453535ec801af)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision 8ed85ff3ecedeac47ee142f804192dad00939763)
@@ -35,6 +35,7 @@
 import org.lamsfoundation.lams.tool.ToolSession;
 import org.lamsfoundation.lams.tool.service.ICommonAssessmentService;
 import org.lamsfoundation.lams.tool.service.ICommonScratchieService;
+import org.lamsfoundation.lams.tool.service.ILamsCoreToolService;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.util.CommonConstants;
@@ -67,6 +68,8 @@
     @Autowired
     private ILamsToolService lamsToolService;
     @Autowired
+    private ILamsCoreToolService lamsCoreToolService;
+    @Autowired
     private IActivityDAO activityDAO;
     @Autowired
     @Qualifier("laasseAssessmentService")
@@ -127,6 +130,10 @@
 	}
 
 	GroupingActivity groupingActivity = getGroupingActivity(lesson);
+
+	String groupsSetupUrl = lamsCoreToolService.getToolContributionURL(lessonId, groupingActivity);
+	request.setAttribute("groupsSetupUrl", groupsSetupUrl);
+
 	Grouping grouping = groupingActivity == null ? null : groupingActivity.getCreateGrouping();
 	Set<Group> groups = grouping == null ? null : grouping.getGroups();
 
Index: lams_monitoring/web/tblmonitor/teams.jsp
===================================================================
diff -u -r74e37bfaa8e55d93bd7e4355c40ea0bd4cf7bd6c -r8ed85ff3ecedeac47ee142f804192dad00939763
--- lams_monitoring/web/tblmonitor/teams.jsp	(.../teams.jsp)	(revision 74e37bfaa8e55d93bd7e4355c40ea0bd4cf7bd6c)
+++ lams_monitoring/web/tblmonitor/teams.jsp	(.../teams.jsp)	(revision 8ed85ff3ecedeac47ee142f804192dad00939763)
@@ -244,13 +244,14 @@
 <div class="row no-gutter">
 <div class="col-xs-2"></div>
 <div class="col-xs-8">
-
 	<h3 style="text-align: center;">
 		<fmt:message key="label.students.teams"/>
 	</h3>
 	
-	<canvas id="summary-chart" class="voffset20"></canvas>
-
+	<c:if test="${not empty chartNamesDataset}">
+		<canvas id="summary-chart" class="voffset20"></canvas>
+	</c:if>
+	
 	<div class="panel panel-default voffset20">
 		<div class="panel-heading">
 			<h4 class="panel-title panel-collapse">
@@ -625,8 +626,15 @@
 	</c:forEach>     
 
 </div>
-<div class="col-xs-2"></div>
+<div class="col-xs-2">
+	<c:if test="${not empty groupsSetupUrl}">
+		<button onClick="javascript:openPopUp('<lams:LAMSURL/>${groupsSetupUrl}','GroupsSetup', 800, 1280, true)" type="button"
+			    class="btn btn-default voffset20">
+			<fmt:message key="label.teams.setup"/>
+		</button>
+	</c:if>
 </div>
+</div>
 
 <!-- modal chart -->
 <div class="modal fade" id="comparison-modal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">