Index: lams_admin/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_admin/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_admin/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_admin/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_admin/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_admin/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_central/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_central/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_central/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_central/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -ra13b927ed895f8e3eeaf559371262665e04ff07a -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_central/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision a13b927ed895f8e3eeaf559371262665e04ff07a)
+++ lams_central/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_gradebook/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_gradebook/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_gradebook/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_gradebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_gradebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_learning/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_learning/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_learning/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_learning/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_learning/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_learning/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_monitoring/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_monitoring/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_monitoring/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_monitoring/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_monitoring/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_monitoring/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_assessment/web/pages/learning/waitforleader.jsp
===================================================================
diff -u -rea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_assessment/web/pages/learning/waitforleader.jsp	(.../waitforleader.jsp)	(revision ea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74)
+++ lams_tool_assessment/web/pages/learning/waitforleader.jsp	(.../waitforleader.jsp)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -1,50 +1,7 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
 
-<lams:html>
-<lams:head>
-	<title><fmt:message key="activity.title" /></title>
+<lams:PageLearner title="${assessment.title}" toolSessionID="${toolSessionID}">
+	<lams:WaitForLeader mode="${mode}" groupUsers="${groupUsers}"/>	
+</lams:PageLearner>
 
-	<lams:css />
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-
-	<script type="text/javascript">
-		function refresh() {
-			location.reload();
-		}
-		
-		//refresh page every 30 sec
-		setTimeout("refresh();",30000);
-    </script>
-</lams:head>
-<body class="stripes">
-
-	<lams:Page type="learner" title="${content.title}">
-		
-		<h4>
-			<fmt:message key="label.waiting.for.leader" />
-		</h4>
-
-		<div>
-			<fmt:message key="label.users.from.group" />
-		</div>
-		
-		<div id="usersInGroup">
-			<c:forEach var="user" items="${groupUsers}">
-				<div class="voffset10 loffset10">
-					<lams:Portrait userId="${user.userId}"/>
-					<span>
-						<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
-					</span>
-				</div>
-			</c:forEach>
-		</div>
-		
-		<button type="button" name="refreshButton" onclick="refresh();" class="btn btn-sm btn-primary pull-right">
-			<fmt:message key="label.refresh" />
-		</button>
-
-	</lams:Page>
-
-</body>
-</lams:html>
Index: lams_tool_chat/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_tool_chat/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_tool_chat/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_tool_daco/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_tool_daco/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_tool_doku/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_tool_doku/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_doku/web/pages/learning/waitforleader.jsp
===================================================================
diff -u -rea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_doku/web/pages/learning/waitforleader.jsp	(.../waitforleader.jsp)	(revision ea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74)
+++ lams_tool_doku/web/pages/learning/waitforleader.jsp	(.../waitforleader.jsp)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -1,50 +1,7 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-<lams:html>
-<lams:head>
-	<title><fmt:message key="label.learning.title" /></title>
-	<%@ include file="/common/header.jsp"%>
-
-	<script type="text/javascript">
-		function refresh() {
-			location.reload();
-		}
-
-		//refresh page every 30 sec
-		setTimeout("refresh();", 30000);
-	</script>
-</lams:head>
-<body class="stripes">
-
-	<lams:Page type="learner" title="${dokumaran.title}">
-
-		<lams:Alert id="waitingForLeader" type="info" close="false">
-			<fmt:message key="label.waiting.for.leader" />
-		</lams:Alert>
-
-		<div class="voffset5">
-			<fmt:message key="label.users.from.group" />
-		</div>
-		
-		<div id="usersInGroup">
-			<c:forEach var="user" items="${groupUsers}">
-				<div class="voffset10 loffset10">
-					<lams:Portrait userId="${user.userId}"/>
-					<span>
-						<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
-					</span>
-				</div>
-			</c:forEach>
-		</div>
-
-		<div class="voffset10">
-			<button name="refreshButton" onclick="refresh();" class="btn btn-sm btn-default pull-right">
-				<fmt:message key="label.refresh" />
-			</button>
-		</div>
-
-		<div id="footer"></div>
-	</lams:Page>
-</body>
-</lams:html>
+<lams:PageLearner title="${dokumaran.title}" toolSessionID="${sessionMap.toolSessionID}">
+	<lams:WaitForLeader mode="${sessionMap.mode}" groupUsers="${groupUsers}"/>	
+</lams:PageLearner>
Index: lams_tool_forum/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_tool_forum/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_tool_forum/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_gmap/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_tool_gmap/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_tool_gmap/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_tool_images/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_tool_images/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_images/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_tool_images/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_tool_imscc/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_tool_imscc/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2f6e8f9ecfee5b8078479721374d0cbeee3d699d -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2f6e8f9ecfee5b8078479721374d0cbeee3d699d)
+++ lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -309,10 +309,6 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>
    	<tag-file>
-	    <name>PageLearner</name>
-		<path>/WEB-INF/tags/PageLearner.tag</path>
-   	</tag-file> 
-   	<tag-file>
 	    <name>TSTable</name>
 		<path>/WEB-INF/tags/TSTable.tag</path>
    	</tag-file>    
@@ -352,27 +348,35 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
-	    <name>Widget</name>
-		<path>/WEB-INF/tags/Widget.tag</path>
-   	</tag-file>
-    <tag-file>
 	    <name>errors5</name>
 		<path>/WEB-INF/tags/Errors5.tag</path>
-   	</tag-file>        
+   	</tag-file>    
    	<tag-file>
+	    <name>Widget</name>
+		<path>/WEB-INF/tags/Widget.tag</path>
+   	</tag-file>   
+   	<tag-file>
 	    <name>Page5</name>
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -453,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_laqa/web/learning/WaitForLeader.jsp
===================================================================
diff -u -rea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_laqa/web/learning/WaitForLeader.jsp	(.../WaitForLeader.jsp)	(revision ea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74)
+++ lams_tool_laqa/web/learning/WaitForLeader.jsp	(.../WaitForLeader.jsp)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -1,52 +1,8 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-<lams:html>
-<lams:head>
-	<title><fmt:message key="activity.title" /></title>
-	<lams:css />
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
-	<script type="text/javascript">
-		function refresh() {
-			location.reload();
-		}
+<lams:PageLearner title="${content.title}" toolSessionID="${sessionMap.toolSessionID}" >
+	<lams:WaitForLeader mode="${mode}" groupUsers="${groupUsers}"/>	
+</lams:PageLearner>
 
-		//refresh page every 30 sec
-		setTimeout("refresh();", 30000);
-	</script>
-</lams:head>
-<body class="stripes">
-
-	<lams:Page type="learner" title="${content.title}">
-
-		<h4>
-			<fmt:message key="label.waiting.for.leader" />
-		</h4>
-
-		<div>
-			<fmt:message key="label.users.from.group" />
-		</div>
-
-		<div id="usersInGroup">
-			<c:forEach var="user" items="${groupUsers}">
-				<div class="voffset10 loffset10">
-					<lams:Portrait userId="${user.queUsrId}"/>
-					<span>
-						<c:out value="${user.fullname}" escapeXml="true" />
-					</span>
-				</div>
-			</c:forEach>
-		</div>
-
-		<div class="right-buttons pull-right">
-			<button onclick="refresh();" class="btn btn-default voffset5">
-				<fmt:message key="label.refresh" />
-			</button>
-		</div>
-
-
-		<div id="footer">
-	</lams:Page>
-
-</body>
-</lams:html>
Index: lams_tool_larsrc/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_tool_larsrc/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_tool_larsrc/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_tool_leader/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_tool_leader/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_mindmap/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_tool_mindmap/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_tool_mindmap/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_tool_nb/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_tool_nb/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r72bf0041a18e7e902404c65e55e167bf6ff84269 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 72bf0041a18e7e902404c65e55e167bf6ff84269)
+++ lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -367,8 +371,12 @@
    	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
Index: lams_tool_notebook/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_tool_notebook/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_tool_notebook/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_tool_pixlr/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_tool_pixlr/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_preview/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_tool_preview/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_tool_preview/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_tool_sbmt/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_tool_sbmt/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -reb89290d3882c2f77a92373fb37c53a38f8efef9 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision eb89290d3882c2f77a92373fb37c53a38f8efef9)
+++ lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -371,8 +371,12 @@
    	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
Index: lams_tool_sbmt/web/learner/waitforleader.jsp
===================================================================
diff -u -rc508d4130028a481087f0a08d6987713ab55239d -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_sbmt/web/learner/waitforleader.jsp	(.../waitforleader.jsp)	(revision c508d4130028a481087f0a08d6987713ab55239d)
+++ lams_tool_sbmt/web/learner/waitforleader.jsp	(.../waitforleader.jsp)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -2,55 +2,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-
-<lams:PageLearner title="${sessionMap.title}" toolSessionID="${sessionMap.toolSessionID}" >
-
-	<div id="instructions" class="instructions">
-		<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true" />
-	</div>
-	<hr class="mx-5">
-	<div class="container-lg">
-
-		<div class="card lcard lcard-no-borders shadow mb-3">
-			<div class="card-header lcard-header-button-border">
-				<fmt:message key="${waitingMessageKey}" />
-			</div>
-			<div class="card-body mb-3">
-				<c:if test="${not empty groupUsers}">
-
-					<div class="mb-2">
-						<fmt:message key="label.users.from.group" />
-					</div>
-					
-					<div id="usersInGroup" class="row mt-2" role="list">
-						<c:forEach var="user" items="${groupUsers}">
-							<div role="listitem" class="col-md-4 my-2 text-md-start">
-								<lams:Portrait userId="${user.userID}"/>
-								<span>
-									<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
-								</span>
-							</div>
-						</c:forEach>
-					</div>
-					
-				</c:if>
-			</div>
-		</div>
-		<div class="activity-bottom-buttons">
-			<button id="finishButton" name="refreshButton" onclick="refresh();" class="btn btn-primary">
-				<fmt:message key="label.refresh" />
-			</button>
-		</div>
-
-	</div>				
-	<script type="text/javascript">
-		function refresh() {
-			location.reload(true);
-		}
-		
-		//refresh page every 30 sec
-		setTimeout("refresh();",30000);
-	
-	</script>
+<lams:PageLearner title="${sessionMap.title}" toolSessionID="${sessionMap.toolSessionID}">
+	<lams:WaitForLeader mode="${sessionMap.mode}" groupUsers="${groupUsers}" isUserIdPropertyCapitalized="true"/>	
 </lams:PageLearner>
-
Index: lams_tool_scratchie/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_tool_scratchie/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_tool_scratchie/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_scratchie/web/pages/learning/waitforleader.jsp
===================================================================
diff -u -rea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_scratchie/web/pages/learning/waitforleader.jsp	(.../waitforleader.jsp)	(revision ea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74)
+++ lams_tool_scratchie/web/pages/learning/waitforleader.jsp	(.../waitforleader.jsp)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -1,55 +1,6 @@
 <!DOCTYPE html>
-
 <%@ include file="/common/taglibs.jsp"%>
 
-<lams:html>
-<lams:head>
-	<title><fmt:message key="label.learning.title" /></title>
-	<%@ include file="/common/header.jsp"%>
-
-	<script type="text/javascript">
-		function refresh() {
-			location.reload();
-		}
-
-		<c:if test="${mode != teacher}">
-			//refresh page every 30 sec
-			setTimeout("refresh();", 30000);
-		</c:if>
-	</script>
-</lams:head>
-<body class="stripes">
-
-	<lams:Page type="learner" title="${scratchie.title}">
-
-		<lams:Alert id="waitingForLeader" type="info" close="false">
-			<fmt:message key="label.waiting.for.leader" />
-		</lams:Alert>
-
-		<div class="voffset5">
-			<fmt:message key="label.users.from.group" />
-		</div>
-
-		<div id="usersInGroup">
-			<c:forEach var="user" items="${groupUsers}">
-				<div class="voffset10 loffset10">
-					<lams:Portrait userId="${user.userId}"/>
-					<span>
-						<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
-					</span>
-				</div>
-			</c:forEach>
-		</div>
-
-		<c:if test="${mode != teacher}">
-			<div class="voffset10">
-				<button name="refreshButton" onclick="refresh();" class="btn btn-sm btn-default pull-right">
-					<fmt:message key="label.refresh" />
-				</button>
-			</div>
-		</c:if>
-
-		<div id="footer"></div>
-	</lams:Page>
-</body>
-</lams:html>
+<lams:PageLearner title="${scratchie.title}" toolSessionID="${toolSessionID}">
+	<lams:WaitForLeader mode="${mode}" groupUsers="${groupUsers}"/>	
+</lams:PageLearner>
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_tool_scribe/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_tool_scribe/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_tool_spreadsheet/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_survey/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_tool_survey/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_tool_survey/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_task/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_tool_task/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_tool_task/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_tool_task/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_whiteboard/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_tool_whiteboard/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_tool_whiteboard/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_tool_whiteboard/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_whiteboard/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_tool_whiteboard/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_tool_wiki/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_tool_wiki/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_zoom/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_tool_zoom/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_tool_zoom/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_tool_zoom/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_tool_zoom/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_tool_zoom/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_www/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u
--- lams_www/web/WEB-INF/tags/WaitForLeader.tag	(revision 0)
+++ lams_www/web/WEB-INF/tags/WaitForLeader.tag	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -0,0 +1,75 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="mode" required="true" rtexprvalue="true"%>
+<%@ attribute name="groupUsers" required="true" rtexprvalue="true"
+	type="java.util.AbstractCollection<org.lamsfoundation.lams.usermanagement.User>"%>
+<%@ attribute name="isUserIdPropertyCapitalized" required="fale" rtexprvalue="true"%>
+<%@ attribute name="refreshKey" required="false" rtexprvalue="true"%> 
+<%@ attribute name="waitingForLeaderKey" required="false" rtexprvalue="true"%>
+
+<%-- Default value for I18N keys --%>
+<c:if test="${empty isUserIdPropertyCapitalized}">
+	//org.lamsfoundation.lams.usermanagement.User has non-capitalized userId property
+	<c:set var="isUserIdPropertyCapitalized" value="false" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="waitingForLeaderKey" value="label.waiting.for.leader" />
+</c:if> 
+<c:if test="${empty refreshKey}">
+	<c:set var="refreshKey" value="label.refresh" />
+</c:if>
+
+<script type="text/javascript">
+	function refresh() {
+		location.reload();
+	}
+
+	<c:if test="${mode != teacher}">
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</c:if>
+</script>
+
+<div class="container-lg">
+	<lams:Alert5 id="waiting-for-leader-alert" type="info">
+		<fmt:message key="${waitingForLeaderKey}" />
+	</lams:Alert5>
+
+	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+		<div class="card-header lcard-header-button-border">
+			<fmt:message key="label.users.from.group" />
+		</div>
+
+		<div class="card-body mb-3">
+			<div id="usersInGroup" class="row mt-2" role="list">
+				<c:forEach var="user" items="${groupUsers}">
+					<c:choose>
+						<c:when test="${isUserIdPropertyCapitalized}">
+							<c:set var="userId" value="${user.userID}"/>
+						</c:when>
+						<c:otherwise>
+							<c:set var="userId" value="${user.userId}"/>
+						</c:otherwise>
+					</c:choose>
+					<div role="listitem" class="col-md-4 my-2 text-md-start">
+						<lams:Portrait userId="${userId}" />
+						<span> 
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+
+	<c:if test="${mode != teacher}">
+		<div class="activity-bottom-buttons">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary">
+				<fmt:message key="${refreshKey}" />
+			</button>
+		</div>
+	</c:if>
+</div>
\ No newline at end of file
Index: lams_www/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6a7abdf7fa2c5646e736550302dcc376397cd645 -r14a43ff0db3bd18db9a56dde9555420f04347c47
--- lams_www/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
+++ lams_www/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 14a43ff0db3bd18db9a56dde9555420f04347c47)
@@ -348,11 +348,15 @@
        <name>Etherpad</name>
        <path>/WEB-INF/tags/Etherpad.tag</path>
    	</tag-file> 
-	<tag-file>
+   	<tag-file>
 	    <name>errors</name>
 		<path>/WEB-INF/tags/Errors.tag</path>
    	</tag-file> 
    	<tag-file>
+	    <name>errors5</name>
+		<path>/WEB-INF/tags/Errors5.tag</path>
+   	</tag-file>    
+   	<tag-file>
 	    <name>Widget</name>
 		<path>/WEB-INF/tags/Widget.tag</path>
    	</tag-file>   
@@ -361,10 +365,18 @@
 		<path>/WEB-INF/tags/Page5.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageLearner</name>
+		<path>/WEB-INF/tags/PageLearner.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>TSTable5</name>
 		<path>/WEB-INF/tags/TSTable5.tag</path>
-   	</tag-file>    
+   	</tag-file>  
    	<tag-file>
+	    <name>WaitForLeader</name>
+		<path>/WEB-INF/tags/WaitForLeader.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
@@ -445,4 +457,4 @@
        <name>Switch</name>
        <path>/WEB-INF/tags/Switch.tag</path>
    	</tag-file>
-</taglib>
+</taglib>
\ No newline at end of file