Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rf86004309489cb81f283d1962b481b4bbb3facd6 -rafae0757f330babf44bd7d881bcb2961602d5055
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision f86004309489cb81f283d1962b481b4bbb3facd6)
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision afae0757f330babf44bd7d881bcb2961602d5055)
@@ -767,26 +767,36 @@
 	
 	<c:forEach var="sessionDto" items="${sessionDtos}" varStatus="status">
 	
-		<c:if test="${sessionMap.isGroupedActivity}">	
-		    <div class="panel panel-default" >
-		        <div class="panel-heading" id="heading${sessionDto.sessionId}">
-		        	<span class="panel-title collapsable-icon-left">
-		        		<a class="${status.first ? '' : 'collapsed'}" role="button" data-toggle="collapse" href="#collapse${sessionDto.sessionId}" 
-								aria-expanded="${status.first ? 'false' : 'true'}" aria-controls="collapse${sessionDto.sessionId}" >
-							<fmt:message key="monitoring.label.group" />:	<c:out value="${sessionDto.sessionName}" />
-						</a>
-					</span>
-					<c:if test="${assessment.useSelectLeaderToolOuput and sessionDto.numberLearners > 0 and not sessionDto.leaderFinished}">
-						<button type="button" class="btn btn-default btn-xs pull-right"
-								onClick="javascript:showChangeLeaderModal(${sessionDto.sessionId})">
-							<fmt:message key='label.monitoring.change.leader'/>
-						</button>
-					</c:if>
-		        </div>
-	        
-	        <div id="collapse${sessionDto.sessionId}" class="panel-collapse collapse ${status.first ? 'in' : ''}" 
-	        		role="tabpanel" aria-labelledby="heading${sessionSummary.sessionId}">
-		</c:if>
+		<c:choose>
+			<c:when test="${sessionMap.isGroupedActivity}">	
+			    <div class="panel panel-default" >
+			        <div class="panel-heading" id="heading${sessionDto.sessionId}">
+			        	<span class="panel-title collapsable-icon-left">
+			        		<a class="${status.first ? '' : 'collapsed'}" role="button" data-toggle="collapse" href="#collapse${sessionDto.sessionId}" 
+									aria-expanded="${status.first ? 'false' : 'true'}" aria-controls="collapse${sessionDto.sessionId}" >
+								<fmt:message key="monitoring.label.group" />:	<c:out value="${sessionDto.sessionName}" />
+							</a>
+						</span>
+						<c:if test="${assessment.useSelectLeaderToolOuput and sessionDto.numberLearners > 0 and not sessionDto.leaderFinished}">
+							<button type="button" class="btn btn-default btn-xs pull-right"
+									onClick="javascript:showChangeLeaderModal(${sessionDto.sessionId})">
+								<fmt:message key='label.monitoring.change.leader'/>
+							</button>
+						</c:if>
+			        </div>
+		        
+		        <div id="collapse${sessionDto.sessionId}" class="panel-collapse collapse ${status.first ? 'in' : ''}" 
+		        		role="tabpanel" aria-labelledby="heading${sessionSummary.sessionId}">
+			</c:when>
+			<c:when test="${assessment.useSelectLeaderToolOuput and sessionDto.numberLearners > 0 and not sessionDto.leaderFinished}">
+				<div style="text-align: right">
+					<button type="button" class="btn btn-default btn-sm voffset10" style="margin-bottom: 10px;"
+							onClick="javascript:showChangeLeaderModal(${sessionDto.sessionId})">
+						<fmt:message key='label.monitoring.change.leader'/>
+					</button>
+				</div>
+			</c:when>
+		</c:choose>
 				
 		<table id="list${sessionDto.sessionId}"></table>
 		<div class="voffset10"></div>
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
===================================================================
diff -u -r8d372a4476d25a498b5af8c04e82576edc7b0976 -rafae0757f330babf44bd7d881bcb2961602d5055
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java	(.../DokumaranService.java)	(revision 8d372a4476d25a498b5af8c04e82576edc7b0976)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java	(.../DokumaranService.java)	(revision afae0757f330babf44bd7d881bcb2961602d5055)
@@ -280,14 +280,10 @@
 	    return;
 	}
 	Dokumaran dokumaran = session.getDokumaran();
-	DokumaranUser newLeader = getUserByIDAndContent(leaderUserId, dokumaran.getContentId());
+	DokumaranUser newLeader = getUserByIDAndSession(leaderUserId, toolSessionId);
 	if (newLeader == null) {
 	    return;
 	}
-	if (!newLeader.getSession().getSessionId().equals(toolSessionId)) {
-	    throw new InvalidParameterException("User with ID " + leaderUserId + " belongs to session with ID "
-		    + newLeader.getSession().getSessionId() + " and not to session with ID " + toolSessionId);
-	}
 
 	session.setGroupLeader(newLeader);
 	dokumaranSessionDao.update(session);
Index: lams_tool_doku/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r8d372a4476d25a498b5af8c04e82576edc7b0976 -rafae0757f330babf44bd7d881bcb2961602d5055
--- lams_tool_doku/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 8d372a4476d25a498b5af8c04e82576edc7b0976)
+++ lams_tool_doku/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision afae0757f330babf44bd7d881bcb2961602d5055)
@@ -532,27 +532,36 @@
 </c:if>
 
 <c:forEach var="groupSummary" items="${summaryList}" varStatus="status">
-	
-	<c:if test="${sessionMap.isGroupedActivity}">
-	    <div class="panel panel-default" >
-        <div class="panel-heading" id="heading${groupSummary.sessionId}">
-        	<span class="panel-title collapsable-icon-left">
-        		<a class="collapsed" role="button" data-toggle="collapse" href="#collapse${groupSummary.sessionId}" 
-						aria-expanded="false" aria-controls="collapse${groupSummary.sessionId}" >
-					<fmt:message key="monitoring.label.group" />&nbsp;${groupSummary.sessionName}
-				</a>
-			</span>
-			<c:if test="${dokumaran.useSelectLeaderToolOuput and groupSummary.numberOfLearners > 0 and not groupSummary.sessionFinished}">
-				<button type="button" class="btn btn-default btn-xs pull-right"
+	<c:choose>
+		<c:when test="${sessionMap.isGroupedActivity}">		
+		    <div class="panel panel-default" >
+	        <div class="panel-heading" id="heading${groupSummary.sessionId}">
+	        	<span class="panel-title collapsable-icon-left">
+	        		<a class="collapsed" role="button" data-toggle="collapse" href="#collapse${groupSummary.sessionId}" 
+							aria-expanded="false" aria-controls="collapse${groupSummary.sessionId}" >
+						<fmt:message key="monitoring.label.group" />&nbsp;${groupSummary.sessionName}
+					</a>
+				</span>
+				<c:if test="${dokumaran.useSelectLeaderToolOuput and groupSummary.numberOfLearners > 0 and not groupSummary.sessionFinished}">
+					<button type="button" class="btn btn-default btn-xs pull-right"
+							onClick="javascript:showChangeLeaderModal(${groupSummary.sessionId})">
+						<fmt:message key='label.monitoring.change.leader'/>
+					</button>
+				</c:if>
+	        </div>
+	        
+	        <div id="collapse${groupSummary.sessionId}" class="panel-collapse collapse etherpad-collapse" 
+	        	 role="tabpanel" aria-labelledby="heading${groupSummary.sessionId}">
+		</c:when>
+		<c:when test="${dokumaran.useSelectLeaderToolOuput and groupSummary.numberOfLearners > 0 and not groupSummary.sessionFinished}">
+			<div style="text-align: right">
+				<button type="button" class="btn btn-default" style="margin-bottom: 10px"
 						onClick="javascript:showChangeLeaderModal(${groupSummary.sessionId})">
 					<fmt:message key='label.monitoring.change.leader'/>
 				</button>
-			</c:if>
-        </div>
-        
-        <div id="collapse${groupSummary.sessionId}" class="panel-collapse collapse etherpad-collapse" 
-        	 role="tabpanel" aria-labelledby="heading${groupSummary.sessionId}">
-	</c:if>
+			</div>
+		</c:when>
+	</c:choose>
 	
 	<c:choose>
 		<c:when test="${groupSummary.sessionFaulty}">
Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp
===================================================================
diff -u -rf86004309489cb81f283d1962b481b4bbb3facd6 -rafae0757f330babf44bd7d881bcb2961602d5055
--- lams_tool_laqa/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision f86004309489cb81f283d1962b481b4bbb3facd6)
+++ lams_tool_laqa/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision afae0757f330babf44bd7d881bcb2961602d5055)
@@ -22,27 +22,37 @@
 </div>
 
 <c:forEach var="groupDto" items="${listAllGroupsDTO}" varStatus="status">
-			  
-	<c:if test="${isGroupedActivity}">	
-	    <div class="panel panel-default" >
-        <div class="panel-heading" id="heading${sessionDto.sessionID}">
-        	<span class="panel-title collapsable-icon-left">
-	        	<a class="${status.first ? '' : 'collapsed'}" role="button" data-toggle="collapse" href="#collapse${groupDto.sessionId}" 
-						aria-expanded="${status.first ? 'false' : 'true'}" aria-controls="collapse${groupDto.sessionId}" >
-					<fmt:message key="group.label" />:	<c:out value="${groupDto.sessionName}" />
-				</a>
-			</span>
-			<c:if test="${content.useSelectLeaderToolOuput and groupDto.numberOfLearners > 0 and not groupDto.sessionFinished}">
-				<button type="button" class="btn btn-default btn-xs pull-right"
+
+	<c:choose>
+		<c:when test="${isGroupedActivity}">		  
+		    <div class="panel panel-default" >
+	        <div class="panel-heading" id="heading${sessionDto.sessionID}">
+	        	<span class="panel-title collapsable-icon-left">
+		        	<a class="${status.first ? '' : 'collapsed'}" role="button" data-toggle="collapse" href="#collapse${groupDto.sessionId}" 
+							aria-expanded="${status.first ? 'false' : 'true'}" aria-controls="collapse${groupDto.sessionId}" >
+						<fmt:message key="group.label" />:	<c:out value="${groupDto.sessionName}" />
+					</a>
+				</span>
+				<c:if test="${content.useSelectLeaderToolOuput and groupDto.numberOfLearners > 0 and not groupDto.sessionFinished}">
+					<button type="button" class="btn btn-default btn-xs pull-right"
+							onClick="javascript:showChangeLeaderModal(${groupDto.sessionId})">
+						<fmt:message key='label.monitoring.change.leader'/>
+					</button>
+				</c:if>
+	        </div>
+	        
+	        <div id="collapse${groupDto.sessionId}" class="panel-collapse collapse ${status.first ? 'in' : ''}" role="tabpanel"
+				aria-labelledby="heading${groupDto.sessionId}">
+		</c:when>
+		<c:when test="${content.useSelectLeaderToolOuput and groupDto.numberOfLearners > 0 and not groupDto.sessionFinished}">
+			<div style="text-align: right">
+				<button type="button" class="btn btn-default" style="margin-bottom: 10px"
 						onClick="javascript:showChangeLeaderModal(${groupDto.sessionId})">
 					<fmt:message key='label.monitoring.change.leader'/>
 				</button>
-			</c:if>
-        </div>
-        
-        <div id="collapse${groupDto.sessionId}" class="panel-collapse collapse ${status.first ? 'in' : ''}" role="tabpanel"
-				aria-labelledby="heading${groupDto.sessionId}">
-	</c:if>	 
+			</div>
+		</c:when>
+	</c:choose>
 	
 	<c:if test="${content.reflect}"> 			
 		<div style="margin-bottom: 20px">
Index: lams_tool_sbmt/web/monitoring/parts/summary.jsp
===================================================================
diff -u -rf86004309489cb81f283d1962b481b4bbb3facd6 -rafae0757f330babf44bd7d881bcb2961602d5055
--- lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision f86004309489cb81f283d1962b481b4bbb3facd6)
+++ lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision afae0757f330babf44bd7d881bcb2961602d5055)
@@ -196,24 +196,34 @@
 
 <c:forEach var="sessionDto" items="${sessions}" varStatus="status">
 		
-	<c:if test="${isGroupedActivity}">	
-	    <div class="panel panel-default" >
-        <div class="panel-heading" id="heading${sessionDto.sessionID}">
-        	<span class="panel-title collapsable-icon-left">
-        	<a class="${status.first ? '' : 'collapsed'}" role="button" data-toggle="collapse" href="#collapse${sessionDto.sessionID}" 
-					aria-expanded="${status.first ? 'false' : 'true'}" aria-controls="collapse${sessionDto.sessionID}" >
-			<fmt:message key="label.session.name" />:	<c:out value="${sessionDto.sessionName}" /></a>
-			</span>
-			<c:if test="${content.useSelectLeaderToolOuput and sessionDto.numberOfLearners > 0 and not sessionDto.sessionFinished}">
-				<button type="button" class="btn btn-default btn-xs pull-right"
+	<c:choose>
+		<c:when test="${isGroupedActivity}">		  
+		    <div class="panel panel-default" >
+	        <div class="panel-heading" id="heading${sessionDto.sessionID}">
+	        	<span class="panel-title collapsable-icon-left">
+	        	<a class="${status.first ? '' : 'collapsed'}" role="button" data-toggle="collapse" href="#collapse${sessionDto.sessionID}" 
+						aria-expanded="${status.first ? 'false' : 'true'}" aria-controls="collapse${sessionDto.sessionID}" >
+				<fmt:message key="label.session.name" />:	<c:out value="${sessionDto.sessionName}" /></a>
+				</span>
+				<c:if test="${content.useSelectLeaderToolOuput and sessionDto.numberOfLearners > 0 and not sessionDto.sessionFinished}">
+					<button type="button" class="btn btn-default btn-xs pull-right"
+							onClick="javascript:showChangeLeaderModal(${sessionDto.sessionID})">
+						<fmt:message key='label.monitoring.change.leader'/>
+					</button>
+				</c:if>
+	        </div>
+	        
+	        <div id="collapse${sessionDto.sessionID}" class="panel-collapse collapse ${status.first ? 'in' : ''}" role="tabpanel" aria-labelledby="heading${sessionDto.sessionID}">
+		</c:when>
+		<c:when test="${content.useSelectLeaderToolOuput and sessionDto.numberOfLearners > 0 and not sessionDto.sessionFinished}">
+			<div style="text-align: right">
+				<button type="button" class="btn btn-default" style="margin-bottom: 10px"
 						onClick="javascript:showChangeLeaderModal(${sessionDto.sessionID})">
 					<fmt:message key='label.monitoring.change.leader'/>
 				</button>
-			</c:if>
-        </div>
-        
-        <div id="collapse${sessionDto.sessionID}" class="panel-collapse collapse ${status.first ? 'in' : ''}" role="tabpanel" aria-labelledby="heading${sessionDto.sessionID}">
-	</c:if>
+			</div>
+		</c:when>
+	</c:choose>
 	
 	<lams:TSTable numColumns="${reflectOn ? 4 : 3}" dataId="data-session-id='${sessionDto.sessionID}'">
 			<th><fmt:message key="monitoring.user.fullname"/></th>