Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java
===================================================================
diff -u -rf9ddfe5a890306be3ab774cf537eacd29f7f3c2a -r2918197dbd481269aa40c7f1ac9a7612dceceb05
--- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java	(.../DisplayGroupController.java)	(revision f9ddfe5a890306be3ab774cf537eacd29f7f3c2a)
+++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java	(.../DisplayGroupController.java)	(revision 2918197dbd481269aa40c7f1ac9a7612dceceb05)
@@ -213,7 +213,7 @@
 	    boolean isMonitor = roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_MONITOR);
 	    boolean disabled = !isMonitor && isKumaliveDisabledForOrganisation;
 	    links.add(new IndexLinkBean(isMonitor ? "index.kumalive.teacher" : "index.kumalive",
-		    "javascript:openKumalive(" + organisationId + ")",
+		    "javascript:openKumalive(" + organisationId + ",'" + (isMonitor ? "teacher" : "learner") + "')",
 		    "fa fa-fw fa-bolt" + (disabled ? " disabled" : ""), "index.kumalive.tooltip"));
 	}
 
@@ -227,10 +227,9 @@
     private IndexOrgBean populateContentsOrgBean(IndexOrgBean orgBean, Organisation org, List<Integer> roles,
 	    String username, boolean isSysAdmin) throws SQLException, NamingException {
 	Integer userId = getUser(username).getUserId();
-	
+
 	// set lesson beans
-	Map<Long, IndexLessonBean> map = populateLessonBeans(userId, org.getOrganisationId(),
-		roles);
+	Map<Long, IndexLessonBean> map = populateLessonBeans(userId, org.getOrganisationId(), roles);
 	List<IndexLessonBean> lessonBeans = IndexUtils.sortLessonBeans(org.getOrderedLessonIds(), map);
 	orgBean.setLessons(lessonBeans);
 
@@ -245,7 +244,8 @@
 
 	    List<IndexOrgBean> childOrgBeans = new ArrayList<>();
 	    for (Organisation childOrganisation : childOrganisations) {
-		if (OrganisationState.ACTIVE.equals(childOrganisation.getOrganisationState().getOrganisationStateId())) {
+		if (OrganisationState.ACTIVE
+			.equals(childOrganisation.getOrganisationState().getOrganisationStateId())) {
 		    List<Integer> classRoles = new ArrayList<>();
 		    List<UserOrganisationRole> userOrganisationRoles = userManagementService
 			    .getUserOrganisationRoles(childOrganisation.getOrganisationId(), username);
@@ -262,7 +262,7 @@
 			classRoles.add(Role.ROLE_GROUP_MANAGER);
 		    }
 		    IndexOrgBean childOrgBean = createOrgBean(childOrganisation, classRoles, username, isSysAdmin);
-		    
+
 		    //check whether organisation was collapsed by the user
 		    if (isCollapsingSubcoursesEnabled) {
 			for (UserOrganisationCollapsed userOrganisationCollapsed : userOrganisationsCollapsed) {
@@ -273,7 +273,7 @@
 			    }
 			}
 		    }
-		    
+
 		    childOrgBeans.add(childOrgBean);
 		}
 	    }
Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
diff -u -r4436ad48ebfcbce1f25ad39db54f55c32873afc1 -r2918197dbd481269aa40c7f1ac9a7612dceceb05
--- lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision 4436ad48ebfcbce1f25ad39db54f55c32873afc1)
+++ lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision 2918197dbd481269aa40c7f1ac9a7612dceceb05)
@@ -1093,6 +1093,7 @@
 		'data'  : data,
 		'success' : function(){
 			updateLessonTab();
+			updateSequenceTab();
 		}
 	});
 }
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
===================================================================
diff -u -r5694a8e26e12cfd208ef7f26d736f02dc6749f23 -r2918197dbd481269aa40c7f1ac9a7612dceceb05
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 5694a8e26e12cfd208ef7f26d736f02dc6749f23)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 2918197dbd481269aa40c7f1ac9a7612dceceb05)
@@ -903,9 +903,9 @@
 	service.saveOrUpdateAssessment(assessment);
     }
 
-    @RequestMapping(path = "/getPossibleIndividualTimeLimitUsers", method = RequestMethod.GET)
+    @RequestMapping(path = "/getPossibleIndividualTimeLimits", method = RequestMethod.GET)
     @ResponseBody
-    public String getPossibleIndividualTimeLimitUsers(
+    public String getPossibleIndividualTimeLimits(
 	    @RequestParam(name = AssessmentConstants.PARAM_TOOL_CONTENT_ID) long toolContentId,
 	    @RequestParam(name = "term") String searchString) {
 	Assessment assessment = service.getAssessmentByContentId(toolContentId);
@@ -919,7 +919,7 @@
 	if (grouping != null) {
 	    Set<Group> groups = grouping.getGroups();
 	    for (Group group : groups) {
-		if (!group.getUsers().isEmpty() && group.getGroupName().contains(searchString.toLowerCase())) {
+		if (!group.getUsers().isEmpty() && group.getGroupName().toLowerCase().contains(searchString.toLowerCase())) {
 		    ObjectNode groupJSON = JsonNodeFactory.instance.objectNode();
 		    groupJSON.put("label", groupLabel + group.getGroupName() + "\"");
 		    groupJSON.put("value", "group-" + group.getGroupId());
@@ -937,7 +937,7 @@
 		String name = user.getFirstName() + " " + user.getLastName() + " (" + user.getLogin() + ")";
 		if (grouping != null) {
 		    Group group = grouping.getGroupBy(user);
-		    if (group != null) {
+		    if (group != null && !group.isNull()) {
 			name += " - " + group.getGroupName();
 		    }
 		}
@@ -949,9 +949,9 @@
 	return responseJSON.toString();
     }
 
-    @RequestMapping(path = "/getExistingIndividualTimeLimitUsers", method = RequestMethod.GET)
+    @RequestMapping(path = "/getExistingIndividualTimeLimits", method = RequestMethod.GET)
     @ResponseBody
-    public String getExistingIndividualTimeLimitUsers(
+    public String getExistingIndividualTimeLimits(
 	    @RequestParam(name = AssessmentConstants.PARAM_TOOL_CONTENT_ID) long toolContentId) {
 	Assessment assessment = service.getAssessmentByContentId(toolContentId);
 	Map<Integer, Integer> timeLimitAdjustments = assessment.getTimeLimitAdjustments();