Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java
===================================================================
diff -u -r4182bf5297751b7755103a8ed9c29f1cfa7edc6d -r5ec97b3aeeef6b5a5adfef19bcc48d48417998ce
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision 4182bf5297751b7755103a8ed9c29f1cfa7edc6d)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision 5ec97b3aeeef6b5a5adfef19bcc48d48417998ce)
@@ -192,27 +192,29 @@
 	for (TblGroupDTO group : groupDtos) {
 	    Double iraCorrectAnswerCountAverage = group.getIraCorrectAnswerCountAverage();
 	    if (iraCorrectAnswerCountAverage != null) {
-		iraCorrectAnswerCountAverageSum += group.getIraCorrectAnswerCountAverage();
+		iraCorrectAnswerCountAverageSum += iraCorrectAnswerCountAverage;
 		iraGroupsCount++;
 
 		if (iraCorrectAnswerCountAverage > highestIraCorrectAnswerCountAverage) {
 		    highestIraCorrectAnswerCountAverage = iraCorrectAnswerCountAverage;
-		} else if (iraCorrectAnswerCountAverage < lowestIraCorrectAnswerCountAverage) {
+		}
+		if (iraCorrectAnswerCountAverage < lowestIraCorrectAnswerCountAverage) {
 		    lowestIraCorrectAnswerCountAverage = iraCorrectAnswerCountAverage;
 		}
 	    }
 
 	    Integer traCorrectAnswerCount = group.getTraCorrectAnswerCount();
 
 	    if (traCorrectAnswerCount != null) {
-		traCorrectAnswerSum += group.getTraCorrectAnswerCount();
+		traCorrectAnswerSum += traCorrectAnswerCount;
 		traGroupsCount++;
 
 		if (traCorrectAnswerCount > highestTraCorrectAnswerCount) {
-		    highestTraCorrectAnswerCount = traCorrectAnswerSum;
-		} else if (traCorrectAnswerSum < lowestTraCorrectAnswerCount) {
-		    lowestTraCorrectAnswerCount = traCorrectAnswerSum;
+		    highestTraCorrectAnswerCount = traCorrectAnswerCount;
 		}
+		if (traCorrectAnswerSum < lowestTraCorrectAnswerCount) {
+		    lowestTraCorrectAnswerCount = traCorrectAnswerCount;
+		}
 
 		if (iraCorrectAnswerCountAverage != null) {
 		    chartIraDataset.add(iraCorrectAnswerCountAverage);
@@ -228,7 +230,8 @@
 
 		    if (correctAnswerCountPercentDelta > highestСorrectAnswerCountDelta) {
 			highestСorrectAnswerCountDelta = correctAnswerCountPercentDelta;
-		    } else if (correctAnswerCountPercentDelta < lowestСorrectAnswerCountDelta) {
+		    }
+		    if (correctAnswerCountPercentDelta < lowestСorrectAnswerCountDelta) {
 			lowestСorrectAnswerCountDelta = correctAnswerCountPercentDelta;
 		    }
 		}
Index: lams_monitoring/web/tblmonitor/teams.jsp
===================================================================
diff -u -r4182bf5297751b7755103a8ed9c29f1cfa7edc6d -r5ec97b3aeeef6b5a5adfef19bcc48d48417998ce
--- lams_monitoring/web/tblmonitor/teams.jsp	(.../teams.jsp)	(revision 4182bf5297751b7755103a8ed9c29f1cfa7edc6d)
+++ lams_monitoring/web/tblmonitor/teams.jsp	(.../teams.jsp)	(revision 5ec97b3aeeef6b5a5adfef19bcc48d48417998ce)
@@ -212,6 +212,8 @@
 				}
 			);
 		});
+
+		$('[data-toggle="tooltip"]').tooltip();
 	});
 
 	function showChangeLeaderModal(groupID) {
@@ -304,10 +306,10 @@
 														<fmt:formatNumber type="number" minFractionDigits="0" maxFractionDigits="2" value="${groupDto.iraCorrectAnswerCountAverage}" />
 														<c:choose>
 															<c:when test="${not empty highestIraCorrectAnswerCountAverage && groupDto.iraCorrectAnswerCountAverage >= highestIraCorrectAnswerCountAverage}">
-																&nbsp;<i class="fa fa-arrow-circle-up" title="<fmt:message key="label.highest"/>"></i>
+																&nbsp;<i class="fa fa-arrow-circle-up" data-toggle="tooltip" title="<fmt:message key="label.highest"/>"></i>
 															</c:when>
 															<c:when test="${not empty lowestIraCorrectAnswerCountAverage && groupDto.iraCorrectAnswerCountAverage <= lowestIraCorrectAnswerCountAverage}">
-																&nbsp;<i class="fa fa-arrow-circle-down" title="<fmt:message key="label.lowest"/>"></i>
+																&nbsp;<i class="fa fa-arrow-circle-down" data-toggle="tooltip" title="<fmt:message key="label.lowest"/>"></i>
 															</c:when>
 														</c:choose>		
 													</c:otherwise>
@@ -324,13 +326,12 @@
 													</c:when>
 													<c:otherwise>
 														${groupDto.traCorrectAnswerCount}
-														
 														<c:choose>
 															<c:when test="${not empty highestTraCorrectAnswerCount && groupDto.traCorrectAnswerCount >= highestTraCorrectAnswerCount}">
-																&nbsp;<i class="fa fa-arrow-circle-up" title="<fmt:message key="label.highest"/>"></i>
+																&nbsp;<i class="fa fa-arrow-circle-up" data-toggle="tooltip" title="<fmt:message key="label.highest"/>"></i>
 															</c:when>
 															<c:when test="${not empty lowestTraCorrectAnswerCount && groupDto.traCorrectAnswerCount <= lowestTraCorrectAnswerCount}">
-																&nbsp;<i class="fa fa-arrow-circle-down" title="<fmt:message key="label.lowest"/>"></i>
+																&nbsp;<i class="fa fa-arrow-circle-down" data-toggle="tooltip" title="<fmt:message key="label.lowest"/>"></i>
 															</c:when>
 														</c:choose>		
 													</c:otherwise>
@@ -348,10 +349,10 @@
 															
 															<c:choose>					 
 																<c:when test="${not empty highestCorrectAnswerCountDelta && groupDto.correctAnswerCountPercentDelta >= highestCorrectAnswerCountDelta}">
-																	&nbsp;<i class="fa fa-arrow-circle-up" title="<fmt:message key="label.highest"/>"></i>
+																	&nbsp;<i class="fa fa-arrow-circle-up" data-toggle="tooltip" title="<fmt:message key="label.highest"/>"></i>
 																</c:when>
 																<c:when test="${not empty lowestCorrectAnswerCountDelta && groupDto.correctAnswerCountPercentDelta <= lowestCorrectAnswerCountDelta}">
-																	&nbsp;<i class="fa fa-arrow-circle-down" title="<fmt:message key="label.lowest"/>"></i>
+																	&nbsp;<i class="fa fa-arrow-circle-down" data-toggle="tooltip" title="<fmt:message key="label.lowest"/>"></i>
 																</c:when>
 															</c:choose>	
 														</c:otherwise>
@@ -502,10 +503,10 @@
 														<c:if test="${fn:length(groupDto.userList) > 1}">
 															<c:choose>
 																<c:when test="${not empty iraHighestCorrectAnswerCount && userDto.iraCorrectAnswerCount >= iraHighestCorrectAnswerCount}">
-																	&nbsp;<i class="fa fa-arrow-circle-up" title="<fmt:message key="label.highest"/>"></i>
+																	&nbsp;<i class="fa fa-arrow-circle-up" data-toggle="tooltip" title="<fmt:message key="label.highest"/>"></i>
 																</c:when>
 																<c:when test="${not empty iraLowestCorrectAnswerCount && userDto.iraCorrectAnswerCount <= iraLowestCorrectAnswerCount}">
-																	&nbsp;<i class="fa fa-arrow-circle-down" title="<fmt:message key="label.lowest"/>"></i>
+																	&nbsp;<i class="fa fa-arrow-circle-down" data-toggle="tooltip" title="<fmt:message key="label.lowest"/>"></i>
 																</c:when>
 															</c:choose>		
 														</c:if>
@@ -527,10 +528,10 @@
 															<c:if test="${fn:length(groupDto.userList) > 1}">
 																<c:choose>
 																	<c:when test="${not empty highestCorrectAnswerCountPercentDelta && userDto.correctAnswerCountPercentDelta >= highestCorrectAnswerCountPercentDelta}">
-																		&nbsp;<i class="fa fa-arrow-circle-up" title="<fmt:message key="label.highest"/>"></i>
+																		&nbsp;<i class="fa fa-arrow-circle-up" data-toggle="tooltip" title="<fmt:message key="label.highest"/>"></i>
 																	</c:when>
 																	<c:when test="${not empty lowestCorrectAnswerCountPercentDelta && userDto.correctAnswerCountPercentDelta <= lowestCorrectAnswerCountPercentDelta}">
-																		&nbsp;<i class="fa fa-arrow-circle-down" title="<fmt:message key="label.lowest"/>"></i>
+																		&nbsp;<i class="fa fa-arrow-circle-down" data-toggle="tooltip" title="<fmt:message key="label.lowest"/>"></i>
 																	</c:when>
 																</c:choose>		
 															</c:if>