Index: lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.45 -r1.46
--- lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties	10 Jan 2014 19:34:54 -0000	1.45
+++ lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties	29 Jan 2014 20:22:12 -0000	1.46
@@ -294,6 +294,7 @@
 label.group.leader  =Group Leader: {0}
 label.refresh  =Refresh
 label.prefix.sequential.letters.for.each.answer  =Prefix sequential letters for each answer
+label.info.use.select.leader.outputs  =Group leader's option is enabled
+label.monitoring.group.leader  =Group leader
 
-
 #======= End labels: Exported 288 labels for en AU =====
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUserMarkDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUserMarkDTO.java,v
diff -u -r1.9 -r1.10
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUserMarkDTO.java	3 Sep 2013 16:56:41 -0000	1.9
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUserMarkDTO.java	29 Jan 2014 20:22:12 -0000	1.10
@@ -25,6 +25,7 @@
 import java.util.Date;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
+import org.lamsfoundation.lams.tool.mc.pojos.McQueUsr;
 
 /**
  * <p>
@@ -39,6 +40,7 @@
     private String queUsrId;
     private String userName;
     private String fullName;
+    private boolean isUserLeader;
     private Date attemptTime;
     private Integer[] marks;
     private String[] answeredOptions;
@@ -125,6 +127,14 @@
 	this.fullName = fullName;
     }
     
+    public boolean setUserGroupLeader(boolean isUserLeader) {
+	return this.isUserLeader = isUserLeader;
+    }
+    
+    public boolean isUserGroupLeader() {
+	return isUserLeader;
+    }
+    
     public int compareTo(Object o) {
 	McUserMarkDTO mcUserMarkDTO = (McUserMarkDTO) o;
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McSession.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McSession.java,v
diff -u -r1.7 -r1.8
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McSession.java	8 Jan 2014 17:49:42 -0000	1.7
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McSession.java	29 Jan 2014 20:22:12 -0000	1.8
@@ -229,4 +229,12 @@
     public void setGroupLeader(McQueUsr groupLeader) {
 	this.groupLeader = groupLeader;
     }
+    
+    public boolean isUserGroupLeader(McQueUsr user) {
+
+	McQueUsr groupLeader = this.getGroupLeader();
+	
+	boolean isUserLeader = (groupLeader != null) && user.getUid().equals(groupLeader.getUid());
+	return isUserLeader;
+    }
 }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java,v
diff -u -r1.74 -r1.75
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java	17 Jan 2014 22:04:49 -0000	1.74
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java	29 Jan 2014 20:22:12 -0000	1.75
@@ -55,13 +55,6 @@
 public interface IMcService {
     
     /**
-     * @param user
-     * @param toolSessionId
-     * @return
-     */
-    boolean isUserGroupLeader(McQueUsr user, Long toolSessionId);
-    
-    /**
      * Set specified user as a leader. Also the previous leader (if any) is marked as non-leader.
      * 
      * @param userId
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java,v
diff -u -r1.121 -r1.122
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	17 Jan 2014 22:04:49 -0000	1.121
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	29 Jan 2014 20:22:12 -0000	1.122
@@ -154,16 +154,6 @@
     }
     
     @Override
-    public boolean isUserGroupLeader(McQueUsr user, Long toolSessionId) {
-
-	McSession session = this.getMcSessionById(toolSessionId);
-	McQueUsr groupLeader = session.getGroupLeader();
-	
-	boolean isUserLeader = (groupLeader != null) && user.getUid().equals(groupLeader.getUid());
-	return isUserLeader;
-    }
-    
-    @Override
     public McQueUsr checkLeaderSelectToolForSessionLeader(McQueUsr user, Long toolSessionId) {
 	if (user == null || toolSessionId == null) {
 	    return null;
@@ -551,6 +541,7 @@
 		mcUserMarkDTO.setSessionId(session.getMcSessionId().toString());
 		mcUserMarkDTO.setSessionName(session.getSession_name().toString());
 		mcUserMarkDTO.setFullName(user.getFullname());
+		mcUserMarkDTO.setUserGroupLeader(session.isUserGroupLeader(user));
 		mcUserMarkDTO.setUserName(user.getUsername());
 		mcUserMarkDTO.setQueUsrId(user.getUid().toString());
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java,v
diff -u -r1.86 -r1.87
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	17 Jan 2014 22:04:48 -0000	1.86
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	29 Jan 2014 20:22:12 -0000	1.87
@@ -241,7 +241,7 @@
 	}
 	
 	sessionMap.put(ATTR_GROUP_LEADER, groupLeader);
-	boolean isUserLeader = mcService.isUserGroupLeader(user, new Long(toolSessionID));
+	boolean isUserLeader = mcSession.isUserGroupLeader(user);
 	sessionMap.put(ATTR_IS_USER_LEADER, isUserLeader);
 	sessionMap.put(AttributeNames.ATTR_MODE, mode);
 	sessionMap.put(ATTR_CONTENT, mcContent);
Index: lams_tool_lamc/web/monitoring/SummaryContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/SummaryContent.jsp,v
diff -u -r1.36 -r1.37
--- lams_tool_lamc/web/monitoring/SummaryContent.jsp	20 Sep 2013 15:48:55 -0000	1.36
+++ lams_tool_lamc/web/monitoring/SummaryContent.jsp	29 Jan 2014 20:22:12 -0000	1.37
@@ -75,12 +75,12 @@
 			}).hideCol("userId").hideCol("sessionId");
 			
    	        <c:forEach var="userMarkEntity" items="${sessionMarkDto.userMarks}" varStatus="i">
-   	     		<c:set var="mcSessionMarkDTO" scope="request" value="${userMarkEntity.value}"/>
+   	     		<c:set var="mcUserMarkDTO" scope="request" value="${userMarkEntity.value}"/>
    	     		jQuery("#group${sessionMarkDto.sessionId}").addRowData(${i.index + 1}, {
    	   	     		id:"${i.index + 1}",
-   	   	     		userUid:"${mcSessionMarkDTO.queUsrId}",
-   	   	     		userName:"${mcSessionMarkDTO.fullName}",
-   	   	     		total:"${mcSessionMarkDTO.totalMark}"
+   	   	     		userUid:"${mcUserMarkDTO.queUsrId}",
+   	   	     		userName:"${mcUserMarkDTO.fullName} <c:if test='${mcUserMarkDTO.userGroupLeader}'>( <fmt:message key='label.monitoring.group.leader' />)</c:if>",
+   	   	     		total:"${mcUserMarkDTO.totalMark}"
    	   	   	    });
 	        </c:forEach>
 	        
@@ -155,57 +155,66 @@
 
 </script>
 
-<%@ include file="parts/advanceOptions.jsp"%>
-<%@ include file="parts/dateRestriction.jsp"%>
 <%@ include file="parts/advanceQuestions.jsp"%>
 
-	<c:if test="${(mcGeneralMonitoringDTO.userExceptionNoToolSessions == 'true')}"> 	
-		<c:if test="${notebookEntriesExist != 'true' }"> 			
-			<table align="center">
-				<tr> 
-					<td NOWRAP valign=top align=center> 
-						<b>  <fmt:message key="error.noLearnerActivity"/> </b>
-					</td> 
-				<tr>
-			</table>
-		</c:if>
+<c:if test="${useSelectLeaderToolOuput}">
+	<div class="info">
+		<fmt:message key="label.info.use.select.leader.outputs" />
+	</div>
+	<br>
+</c:if>
+
+<c:if test="${(mcGeneralMonitoringDTO.userExceptionNoToolSessions == 'true')}"> 	
+	<c:if test="${notebookEntriesExist != 'true' }"> 			
+		<table align="center">
+			<tr> 
+				<td NOWRAP valign=top align=center> 
+					<b>  <fmt:message key="error.noLearnerActivity"/> </b>
+				</td> 
+			<tr>
+		</table>
 	</c:if>
+</c:if>
 			
-		<c:if test="${mcGeneralMonitoringDTO.userExceptionNoToolSessions != 'true'}">
+<c:if test="${mcGeneralMonitoringDTO.userExceptionNoToolSessions != 'true'}">
 
-			<h2>    
-				<fmt:message key="label.studentMarks"/>
-			</h2>
+	<h2 style="font-size: 15px; margin-left: 30px;">    
+		<fmt:message key="label.studentMarks"/>
+	</h2>
 
-			<div id="masterDetailArea">
-				<%@ include file="masterDetailLoadUp.jsp"%>
-			</div>
+	<div id="masterDetailArea">
+		<%@ include file="masterDetailLoadUp.jsp"%>
+	</div>
 		
-			<c:forEach var="sessionMarkDto" items="${listMonitoredMarksContainerDto}" varStatus="status">
+	<c:forEach var="sessionMarkDto" items="${listMonitoredMarksContainerDto}" varStatus="status">
 			
-				<div style="padding-left: 30px; <c:if test='${! status.last}'>padding-bottom: 30px;</c:if><c:if test='${ status.last}'>padding-bottom: 15px;</c:if> ">
-					<c:if test="${isGroupedActivity}">
-						<div style="padding-bottom: 5px; font-size: small;">
-							<B><fmt:message key="group.label" /></B> ${sessionMarkDto.sessionName}
-						</div>
-					</c:if>
-					
-					<table id="group${sessionMarkDto.sessionId}" class="scroll" cellpadding="0" cellspacing="0"></table>
-					<div style="margin-top: 10px; width:99%;">
-						<table id="userSummary${sessionMarkDto.sessionId}" class="scroll" cellpadding="0" cellspacing="0"></table>
-					</div>
+		<div style="padding-left: 30px; <c:if test='${! status.last}'>padding-bottom: 30px;</c:if><c:if test='${ status.last}'>padding-bottom: 15px;</c:if> ">
+			<c:if test="${isGroupedActivity}">
+				<div style="padding-bottom: 5px; font-size: small;">
+					<B><fmt:message key="group.label" /></B> ${sessionMarkDto.sessionName}
 				</div>
+			</c:if>
+					
+			<table id="group${sessionMarkDto.sessionId}" class="scroll" cellpadding="0" cellspacing="0"></table>
+			
+			<div style="margin-top: 10px; width:99%;">
+				<table id="userSummary${sessionMarkDto.sessionId}" class="scroll" cellpadding="0" cellspacing="0"></table>
+			</div>
+		</div>
 				
-			</c:forEach>
+	</c:forEach>
 
-			<jsp:include page="/monitoring/Reflections.jsp" />
+	<jsp:include page="/monitoring/Reflections.jsp" />
 				
-			<html:link href="#" onclick="javascript:submitMonitoringMethod('downloadMarks');" styleClass="button float-right">
-				<fmt:message key="label.monitoring.downloadMarks.button" />
-			</html:link>					
-		</c:if>						
-		
-		
-		<c:if test="${noSessionsNotebookEntriesExist == 'true'}"> 							
-			<jsp:include page="/monitoring/Reflections.jsp" />
-		</c:if>
+	<html:link href="#" onclick="javascript:submitMonitoringMethod('downloadMarks');" styleClass="button float-right">
+		<fmt:message key="label.monitoring.downloadMarks.button" />
+	</html:link>
+	<br><br>			
+</c:if>
+
+<c:if test="${noSessionsNotebookEntriesExist == 'true'}"> 							
+	<jsp:include page="/monitoring/Reflections.jsp" />
+</c:if>
+
+<%@ include file="parts/advanceOptions.jsp"%>
+<%@ include file="parts/dateRestriction.jsp"%>
Index: lams_tool_lamc/web/monitoring/parts/advanceQuestions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/parts/advanceQuestions.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_lamc/web/monitoring/parts/advanceQuestions.jsp	5 Sep 2013 17:35:12 -0000	1.1
+++ lams_tool_lamc/web/monitoring/parts/advanceQuestions.jsp	29 Jan 2014 20:22:12 -0000	1.2
@@ -1,11 +1,10 @@
-<h1 style="padding-bottom: 10px;">
+<h1>
 	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon3" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advanced-questions'), document.getElementById('treeIcon3'), '<lams:LAMSURL/>');" />
 
 	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advanced-questions'), document.getElementById('treeIcon3'),'<lams:LAMSURL/>');" >
 		<fmt:message key="label.Questions" />
 	</a>
 </h1>
-<br />
 
 <div class="monitoring-advanced" id="advanced-questions" style="display:none">