Index: lams_admin/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_admin/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_admin/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_admin/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_admin/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_admin/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_central/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_central/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_central/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_central/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_central/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_central/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_central/web/css/_main_base.scss
===================================================================
diff -u -r9946788a0f2d89cd298e289eddbf59d3b38ba197 -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_central/web/css/_main_base.scss	(.../_main_base.scss)	(revision 9946788a0f2d89cd298e289eddbf59d3b38ba197)
+++ lams_central/web/css/_main_base.scss	(.../_main_base.scss)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -550,7 +550,7 @@
 	border-bottom: $border-thin-default;
 }
 .course-header i{
-	font-size: 16px;
+	font-size: 15px;
 }
 
 .j-course-contents {
Index: lams_gradebook/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_gradebook/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_gradebook/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_gradebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_gradebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_learning/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_learning/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_learning/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_learning/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_learning/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_learning/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_monitoring/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_monitoring/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_monitoring/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_monitoring/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_monitoring/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_monitoring/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_assessment/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -ra83b0eec89979dce7415b02afdda324b14018dbb -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision a83b0eec89979dce7415b02afdda324b14018dbb)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -489,11 +489,7 @@
 		</c:if>
 		
 		<c:if test="${isLeadershipEnabled}">
-			<h4>
-				<fmt:message key="label.group.leader" >
-					<fmt:param>${sessionMap.groupLeader.firstName} ${sessionMap.groupLeader.lastName}</fmt:param>
-				</fmt:message>
-			</h4>
+			<lams:LeaderDisplay username="${sessionMap.groupLeader.firstName} ${sessionMap.groupLeader.lastName}" userId="${sessionMap.groupLeader.userId}"/>
 		</c:if>
 
 		<div class="panel">
Index: lams_tool_assessment/web/pages/learning/results.jsp
===================================================================
diff -u -r3878cdc903ccd6b73c79c950d36c3df5197dc46d -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_assessment/web/pages/learning/results.jsp	(.../results.jsp)	(revision 3878cdc903ccd6b73c79c950d36c3df5197dc46d)
+++ lams_tool_assessment/web/pages/learning/results.jsp	(.../results.jsp)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -80,11 +80,7 @@
 		</c:if>
 		
 		<c:if test="${isLeadershipEnabled}">
-			<h4>
-				<fmt:message key="label.group.leader" >
-					<fmt:param>${sessionMap.groupLeader.firstName} ${sessionMap.groupLeader.lastName}</fmt:param>
-				</fmt:message>
-			</h4>
+			<lams:LeaderDisplay username="${sessionMap.groupLeader.firstName} ${sessionMap.groupLeader.lastName}" userId="${sessionMap.groupLeader.userId}"/>
 		</c:if>
 		
 		<%@ include file="/common/messages.jsp"%>
Index: lams_tool_bbb/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_tool_bbb/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_tool_bbb/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_tool_bbb/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_bbb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_tool_bbb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_chat/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_tool_chat/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_tool_chat/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_daco/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_tool_daco/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_tool_daco/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_forum/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_tool_forum/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_tool_forum/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_gmap/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_tool_gmap/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_tool_gmap/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_images/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_tool_images/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_tool_images/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_tool_images/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_images/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_tool_images/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_imscc/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_tool_imscc/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_tool_imscc/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_kaltura/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_tool_kaltura/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_tool_kaltura/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_tool_kaltura/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_kaltura/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_tool_kaltura/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_lamc/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_laqa/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_tool_laqa/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_tool_laqa/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_laqa/web/learning/AnswersContent.jsp
===================================================================
diff -u -r77ebc7ab2b77a77ed28554d583f327c3298a540f -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 77ebc7ab2b77a77ed28554d583f327c3298a540f)
+++ lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -223,11 +223,7 @@
 		</c:if>
 
 		<c:if test="${isLeadershipEnabled}">
-			<lams:Alert type="info" id="leader-enabled" close="false">
-				<fmt:message key="label.group.leader">
-					<fmt:param>${sessionMap.groupLeader.fullname}</fmt:param>
-				</fmt:message>
-			</lams:Alert>
+			<lams:LeaderDisplay idName="leader-enabled" username="${sessionMap.groupLeader.fullname}" userId="${sessionMap.groupLeader.queUsrId}"/>
 		</c:if>
 
 		<!-- End advanced settings and notices -->
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
diff -u -r4583983b64efe1d91fbb47cdde6a759a6a30e859 -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -301,14 +301,7 @@
 		<!-- End Announcements and advanced settings -->
 
 		<c:if test="${isLeadershipEnabled}">
-			<c:set var="fullName">
-				<c:out value="${sessionMap.groupLeader.fullname}" escapeXml="true" />
-			</c:set>
-			<h4>
-				<fmt:message key="label.group.leader">
-					<fmt:param>${fullName}</fmt:param>
-				</fmt:message>
-			</h4>
+			<lams:LeaderDisplay idName="leader-enabled" username="${sessionMap.groupLeader.fullname}" userId="${sessionMap.groupLeader.queUsrId}"/>
 		</c:if>
 
 		<h4>
Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
===================================================================
diff -u -r4583983b64efe1d91fbb47cdde6a759a6a30e859 -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -291,12 +291,7 @@
 		</c:if>
 
 		<c:if test="${isLeadershipEnabled}">
-			<lams:Alert id="ratings-info" type="info" close="true">
-				<fmt:message key="label.group.leader">
-					<fmt:param>${sessionMap.groupLeader.fullname}</fmt:param>
-				</fmt:message>
-
-			</lams:Alert>
+			<lams:LeaderDisplay idName="ratings-info" username="${sessionMap.groupLeader.fullname}" userId="${sessionMap.groupLeader.queUsrId}"/>
 		</c:if>
 
 		<h4>
Index: lams_tool_larsrc/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_tool_larsrc/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_tool_larsrc/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_leader/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -re8e64d9bf168d4a28c26fedb8e4a998a672a90ef -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_leader/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e8e64d9bf168d4a28c26fedb8e4a998a672a90ef)
+++ lams_tool_leader/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -45,7 +45,7 @@
 textsearch.any.words  =has one or more of these words:
 output.desc.all.users.entries.definition.notebook  =Each learner's entry in Leader Selection
 output.desc.user.is.leader  =Is learner a leader
-label.group.leader  =Group leader:
+label.group.leader  =Group leader: {0}
 label.are.you.going.to.be.leader  =Are you going to be a leader of this group?
 label.leader.selection  =Leader selection
 label.users.from.group  =Learners in group:
Index: lams_tool_leader/conf/language/lams/ApplicationResources_el_GR.properties
===================================================================
diff -u -rc23263835cc742803f020b7755ff28717f41e423 -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_leader/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision c23263835cc742803f020b7755ff28717f41e423)
+++ lams_tool_leader/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -45,7 +45,7 @@
 textsearch.any.words  =\u03ad\u03c7\u03b5\u03b9 \u03bc\u03af\u03b1 \u03ae \u03c0\u03b5\u03c1\u03b9\u03c3\u03c3\u03cc\u03c4\u03b5\u03c1\u03b5\u03c2 \u03b1\u03c0\u03cc \u03b1\u03c5\u03c4\u03ad\u03c2 \u03c4\u03b9\u03c2 \u03bb\u03ad\u03be\u03b5\u03b9\u03c2:
 output.desc.all.users.entries.definition.notebook  =\u039a\u03b1\u03c4\u03b1\u03c7\u03c9\u03c1\u03ae\u03c3\u03b5\u03b9\u03c2 \u03b5\u03ba\u03c0\u03b1\u03b9\u03b4\u03b5\u03c5\u03bf\u03bc\u03ad\u03bd\u03c9\u03bd \u03b3\u03b9\u03b1 \u03b5\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03c3\u03c5\u03bd\u03c4\u03bf\u03bd\u03b9\u03c3\u03c4\u03ae
 output.desc.user.is.leader  =\u0395\u03af\u03bd\u03b1\u03b9 \u03bf/\u03b7 \u03b5\u03ba\u03c0\u03b1\u03b9\u03b4\u03b5\u03c5\u03cc\u03bc\u03b5\u03bd\u03bf\u03c2/\u03b7 \u03c3\u03c5\u03bd\u03c4\u03bf\u03bd\u03b9\u03c3\u03c4\u03ae\u03c2/\u03c4\u03c1\u03b9\u03b1
-label.group.leader  =\u03a3\u03c5\u03bd\u03c4\u03bf\u03bd\u03b9\u03c3\u03c4\u03ae\u03c2 \u03bf\u03bc\u03ac\u03b4\u03b1\u03c2:
+label.group.leader  =\u03a3\u03c5\u03bd\u03c4\u03bf\u03bd\u03b9\u03c3\u03c4\u03ae\u03c2 \u03bf\u03bc\u03ac\u03b4\u03b1\u03c2: {0}
 label.are.you.going.to.be.leader  =\u03a3\u03ba\u03bf\u03c0\u03b5\u03cd\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03b3\u03af\u03bd\u03b5\u03c4\u03b5 \u03c3\u03c5\u03bd\u03c4\u03bf\u03bd\u03b9\u03c3\u03c4\u03ae\u03c2 \u03b1\u03c5\u03c4\u03ae\u03c2 \u03c4\u03b7\u03c2 \u03bf\u03bc\u03ac\u03b4\u03b1\u03c2;
 label.leader.selection  =\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03a3\u03c5\u03bd\u03c4\u03bf\u03bd\u03b9\u03c3\u03c4\u03ae
 label.users.from.group  =\u039f\u03b9 \u03b5\u03ba\u03c0\u03b1\u03b9\u03b4\u03b5\u03c5\u03cc\u03bc\u03b5\u03bd\u03bf\u03b9 \u03c0\u03bf\u03c5 \u03c3\u03c5\u03bc\u03bc\u03b5\u03c4\u03ad\u03c7\u03bf\u03c5\u03bd \u03c3\u03c4\u03b7\u03bd \u03c4\u03c1\u03ad\u03c7\u03bf\u03c5\u03c3\u03b1 \u03bf\u03bc\u03ac\u03b4\u03b1:
Index: lams_tool_leader/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -re8e64d9bf168d4a28c26fedb8e4a998a672a90ef -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_leader/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision e8e64d9bf168d4a28c26fedb8e4a998a672a90ef)
+++ lams_tool_leader/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -45,7 +45,7 @@
 textsearch.any.words  =has one or more of these words:
 output.desc.all.users.entries.definition.notebook  =Each learner's entry in Leader Selection
 output.desc.user.is.leader  =Is learner a leader
-label.group.leader  =Group leader:
+label.group.leader  =Group leader: {0}
 label.are.you.going.to.be.leader  =Are you going to be a leader of this group?
 label.leader.selection  =Leader selection
 label.users.from.group  =Learners in group:
Index: lams_tool_leader/conf/language/lams/ApplicationResources_es_ES.properties
===================================================================
diff -u -re8e64d9bf168d4a28c26fedb8e4a998a672a90ef -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_leader/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision e8e64d9bf168d4a28c26fedb8e4a998a672a90ef)
+++ lams_tool_leader/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -45,7 +45,7 @@
 textsearch.any.words  =tiene una o m\u00e1s de estas palabras:
 output.desc.all.users.entries.definition.notebook  =La entrada de cada alumno en la Selecci\u00f3n de L\u00edder
 output.desc.user.is.leader  =\u00bfEs estudiante un l\u00edder?
-label.group.leader  =L\u00edder del Grupo:
+label.group.leader  =L\u00edder del Grupo: {0}
 label.are.you.going.to.be.leader  =\u00bfVas a ser el l\u00edder de este grupo?
 label.leader.selection  =Selecci\u00f3n de l\u00edder
 label.users.from.group  =Estudiantes en el grupo:
Index: lams_tool_leader/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
diff -u -r271d374f37c513e19ec64591efa9df228923ef09 -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_leader/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 271d374f37c513e19ec64591efa9df228923ef09)
+++ lams_tool_leader/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -45,7 +45,7 @@
 textsearch.any.words  =har en eller fler av disse ordene
 output.desc.all.users.entries.definition.notebook  =Hver students start i valg av leder
 output.desc.user.is.leader  =Er studenten en leder
-label.group.leader  =Gruppe leder:
+label.group.leader  =Gruppe leder: {0}
 label.are.you.going.to.be.leader  =Vil du bli en leder av denne gruppen ?
 label.leader.selection  =Valg av leder
 label.users.from.group  =Studenter som deltar i gruppen:
Index: lams_tool_leader/conf/language/lams/ApplicationResources_pt_BR.properties
===================================================================
diff -u -rb75faef6da6fb97cab318b2ec1f7a70985672e44 -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_leader/conf/language/lams/ApplicationResources_pt_BR.properties	(.../ApplicationResources_pt_BR.properties)	(revision b75faef6da6fb97cab318b2ec1f7a70985672e44)
+++ lams_tool_leader/conf/language/lams/ApplicationResources_pt_BR.properties	(.../ApplicationResources_pt_BR.properties)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -45,7 +45,7 @@
 textsearch.any.words  =tem uma ou mais destas palavras:
 output.desc.all.users.entries.definition.notebook  =Cada entrada do aluno na Sele\u00e7\u00e3o L\u00edder
 output.desc.user.is.leader  =\u00c9 um l\u00edder aprendiz
-label.group.leader  =L\u00edder do Grupo:
+label.group.leader  =L\u00edder do Grupo: {0}
 label.are.you.going.to.be.leader  =Vai ser um l\u00edder deste grupo?
 label.leader.selection  =Sele\u00e7\u00e3o L\u00edder
 label.users.from.group  =Os alunos que participam no grupo atual:
Index: lams_tool_leader/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_tool_leader/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_tool_leader/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_leader/web/pages/learning/leaderselection.jsp
===================================================================
diff -u -r9baf82320488e653a83d6aa179fd01dc707ef10d -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision 9baf82320488e653a83d6aa179fd01dc707ef10d)
+++ lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -81,10 +81,7 @@
 
 	<c:choose>
 		<c:when test="${not empty groupLeader}">
-			<h4>
-				<fmt:message key="label.group.leader" /> &nbsp;
-				<mark><c:out value="${groupLeader.firstName} ${groupLeader.lastName}" escapeXml="true" /></mark>
-			</h4>
+			<lams:LeaderDisplay username="${groupLeader.firstName} ${groupLeader.lastName}" userId="${groupLeader.userId}"/>
 		</c:when>
 		<c:otherwise>
 			<lams:Alert type="warning" id="no-leader" close="false">
Index: lams_tool_mindmap/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_tool_mindmap/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_tool_mindmap/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_nb/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_tool_nb/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_tool_nb/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_notebook/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_tool_notebook/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_tool_notebook/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_pixlr/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_tool_pixlr/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_tool_pixlr/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_preview/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_tool_preview/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_tool_preview/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_sbmt/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_tool_sbmt/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_tool_sbmt/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
===================================================================
diff -u -rc6ad8493ef2064430e8783b28258cc9f223a3844 -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java	(.../ScratchieConstants.java)	(revision c6ad8493ef2064430e8783b28258cc9f223a3844)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java	(.../ScratchieConstants.java)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -165,6 +165,8 @@
 
     public static final String ATTR_GROUP_LEADER_NAME = "groupLeaderName";
 
+    public static final String ATTR_GROUP_LEADER_USER_ID = "groupLeaderUserId";
+
     public static final String ATTR_IS_USER_LEADER = "isUserLeader";
     
     public static final String ATTR_IS_TIME_LIMIT_ENABLED = "isTimeLimitEnabled";
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
===================================================================
diff -u -rf06669784fcf047185a7f9c48587b3096474aa2a -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	(.../LearningAction.java)	(revision f06669784fcf047185a7f9c48587b3096474aa2a)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	(.../LearningAction.java)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -201,6 +201,7 @@
 	sessionMap.put(ScratchieConstants.ATTR_USER_UID, user.getUid());
 	String groupLeaderName = groupLeader.getFirstName() + " " + groupLeader.getLastName();
 	sessionMap.put(ScratchieConstants.ATTR_GROUP_LEADER_NAME, groupLeaderName);
+	sessionMap.put(ScratchieConstants.ATTR_GROUP_LEADER_USER_ID, groupLeader.getUserId());
 	boolean isUserLeader = toolSession.isUserGroupLeader(user.getUid());
 	sessionMap.put(ScratchieConstants.ATTR_IS_USER_LEADER, isUserLeader);
 	boolean isUserFinished = (user != null) && user.isSessionFinished();
Index: lams_tool_scratchie/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_tool_scratchie/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_tool_scratchie/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_scratchie/web/pages/learning/learning.jsp
===================================================================
diff -u -rbeb150b1b726c122ccc5af1ba95083105f9948b8 -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision beb150b1b726c122ccc5af1ba95083105f9948b8)
+++ lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -165,13 +165,7 @@
 
 	<lams:Page type="learner" title="${scratchie.title}">
 
-		<h4>
-			<fmt:message key="label.group.leader">
-				<fmt:param>
-					<mark><c:out value="${sessionMap.groupLeaderName}" escapeXml="true" /></mark>
-				</fmt:param>
-			</fmt:message>
-		</h4>
+		<lams:LeaderDisplay username="${sessionMap.groupLeaderName}" userId="${sessionMap.groupLeaderUserId}"/>
 
 		<div class="panel">
 			<c:out value="${scratchie.instructions}" escapeXml="false" />
Index: lams_tool_scribe/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_tool_scribe/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_tool_scribe/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_tool_spreadsheet/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_survey/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_tool_survey/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_tool_survey/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_task/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_tool_task/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_tool_task/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_tool_task/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java
===================================================================
diff -u -r3881c4a0f846958e51830bfded88dcf6410e9167 -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java	(.../VoteAppConstants.java)	(revision 3881c4a0f846958e51830bfded88dcf6410e9167)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java	(.../VoteAppConstants.java)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -93,7 +93,7 @@
     public static final String ATTR_SUBMISSION_DEADLINE_DATESTRING = "submissionDateString";
     public static final String ATTR_GROUP_USERS = "groupUsers";
     public static final String ATTR_GROUP_LEADER_NAME = "groupLeaderName";
-
+    public static final String ATTR_GROUP_LEADER_USER_ID  = "groupLeaderUserId";
     /*
      * refers to number of questions presented initially, we have a single record for default content
      */
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningAction.java
===================================================================
diff -u -r4ff01ddd9be0b8c91ac92569f68d02ca33a18f46 -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningAction.java	(.../LearningAction.java)	(revision 4ff01ddd9be0b8c91ac92569f68d02ca33a18f46)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningAction.java	(.../LearningAction.java)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -658,6 +658,9 @@
 	String groupLeaderName = request.getParameter(ATTR_GROUP_LEADER_NAME);
 	voteLearningForm.setGroupLeaderName(groupLeaderName);
 
+	String groupLeaderUserId = request.getParameter(ATTR_GROUP_LEADER_USER_ID);
+	voteLearningForm.setGroupLeaderUserId(groupLeaderUserId);
+
 	boolean isUserLeader = WebUtil.readBooleanParam(request, "userLeader");
 	voteLearningForm.setIsUserLeader(isUserLeader);
     }
@@ -822,6 +825,7 @@
 
 	    // store group leader information
 	    voteLearningForm.setGroupLeaderName(groupLeader.getFullname());
+	    voteLearningForm.setGroupLeaderUserId(groupLeader.getQueUsrId() != null ? groupLeader.getQueUsrId().toString() : "");
 	    boolean isUserLeader = voteService.isUserGroupLeader(user, new Long(toolSessionID));
 	    voteLearningForm.setIsUserLeader(isUserLeader);
 	}
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VoteLearningForm.java
===================================================================
diff -u -r8557dd81ad41c4747ec6af15b1eff9691f67adeb -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VoteLearningForm.java	(.../VoteLearningForm.java)	(revision 8557dd81ad41c4747ec6af15b1eff9691f67adeb)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VoteLearningForm.java	(.../VoteLearningForm.java)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -109,6 +109,7 @@
 
     protected boolean isUserLeader;
     protected String groupLeaderName;
+    protected String groupLeaderUserId;
 
     /**
      * @return Returns the learningMode.
@@ -961,6 +962,14 @@
 	this.groupLeaderName = groupLeaderName;
     }
 
+    public String getGroupLeaderUserId() {
+	return groupLeaderUserId;
+    }
+
+    public void setGroupLeaderUserId(String groupLeaderUserId) {
+	this.groupLeaderUserId = groupLeaderUserId;
+    }
+
     public boolean isUserLeader() {
 	return isUserLeader;
     }
Index: lams_tool_vote/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_vote/web/learning/AllNominations.jsp
===================================================================
diff -u -r06a6c167950bd4a3bc90be12854509e2a0ac6588 -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision 06a6c167950bd4a3bc90be12854509e2a0ac6588)
+++ lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -51,18 +51,15 @@
 		<html:hidden property="showResults" />
 		<html:hidden property="userLeader" />
 		<html:hidden property="groupLeaderName" />
+		<html:hidden property="groupLeaderUserId" />
 		<html:hidden property="useSelectLeaderToolOuput" />
 
 		<lams:Page type="learner" title="${voteGeneralLearnerFlowDTO.activityTitle}">
 
 
 
 			<c:if test="${isLeadershipEnabled}">
-				<lams:Alert type="info" id="leaderEnabled" close="false">
-					<fmt:message key="label.group.leader">
-						<fmt:param>${formBean.groupLeaderName}</fmt:param>
-					</fmt:message>
-				</lams:Alert>
+				<lams:LeaderDisplay idName="leaderEnabled" username="${formBean.groupLeaderName}" userId="${formBean.groupLeaderUserId}"/>
 			</c:if>
 
 			<h4>
Index: lams_tool_vote/web/learning/AnswersContent.jsp
===================================================================
diff -u -r6f218a9b53c2931aba5ec703040db658da98fa52 -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_vote/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 6f218a9b53c2931aba5ec703040db658da98fa52)
+++ lams_tool_vote/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -132,6 +132,7 @@
 		<html:hidden property="showResults" />
 		<html:hidden property="userLeader" />
 		<html:hidden property="groupLeaderName" />
+		<html:hidden property="groupLeaderUserId" />
 		<html:hidden property="useSelectLeaderToolOuput" />
 
 
@@ -141,11 +142,7 @@
 
 			<!-- Announcements and advanced settings -->
 			<c:if test="${formBean.useSelectLeaderToolOuput}">
-				<lams:Alert id="groupLeader" type="info" close="false">
-					<fmt:message key="label.group.leader">
-						<fmt:param>${formBean.groupLeaderName}</fmt:param>
-					</fmt:message>
-				</lams:Alert>
+				<lams:LeaderDisplay idName="groupLeader" username="${formBean.groupLeaderName}" userId="${formBean.groupLeaderUserId}"/>
 			</c:if>
 
 			<c:if test="${not empty voteGeneralLearnerFlowDTO.submissionDeadline}">
Index: lams_tool_vote/web/learning/ExitLearning.jsp
===================================================================
diff -u -r06a6c167950bd4a3bc90be12854509e2a0ac6588 -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_vote/web/learning/ExitLearning.jsp	(.../ExitLearning.jsp)	(revision 06a6c167950bd4a3bc90be12854509e2a0ac6588)
+++ lams_tool_vote/web/learning/ExitLearning.jsp	(.../ExitLearning.jsp)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -53,6 +53,7 @@
 		<html:hidden property="showResults" />
 		<html:hidden property="userLeader" />
 		<html:hidden property="groupLeaderName" />
+		<html:hidden property="groupLeaderUserId" />
 		<html:hidden property="useSelectLeaderToolOuput" />
 
 		<lams:Page type="learner" title="${voteGeneralLearnerFlowDTO.activityTitle}">
@@ -64,11 +65,7 @@
 			</c:if>
 
 			<c:if test="${isLeadershipEnabled}">
-				<lams:Alert id="leaderEnabled" type="info" close="false">
-					<fmt:message key="label.group.leader">
-						<fmt:param>${formBean.groupLeaderName}</fmt:param>
-					</fmt:message>
-				</lams:Alert>
+				<lams:LeaderDisplay idName="leaderEnabled" username="${formBean.groupLeaderName}" userId="${formBean.groupLeaderUserId}"/>
 			</c:if>
 
 			<c:if test="${VoteLearningForm.showResults == 'true'}">
Index: lams_tool_vote/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -r6f218a9b53c2931aba5ec703040db658da98fa52 -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_vote/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 6f218a9b53c2931aba5ec703040db658da98fa52)
+++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -46,6 +46,7 @@
 		<html:hidden property="showResults" />
 		<html:hidden property="userLeader" />
 		<html:hidden property="groupLeaderName" />
+		<html:hidden property="groupLeaderUserId" />
 		<html:hidden property="useSelectLeaderToolOuput" />
 
 		<lams:Page type="learner" title="${voteGeneralLearnerFlowDTO.activityTitle}">
@@ -57,11 +58,7 @@
 			</c:if>
 
 			<c:if test="${isLeadershipEnabled}">
-				<lams:Alert id="leaderEnabled" type="info" close="false">
-					<fmt:message key="label.group.leader">
-						<fmt:param>${formBean.groupLeaderName}</fmt:param>
-					</fmt:message>
-				</lams:Alert>
+				<lams:LeaderDisplay idName="leaderEnabled" username="${formBean.groupLeaderName}" userId="${formBean.groupLeaderUserId}"/>
 			</c:if>
 
 			<div class="row">
Index: lams_tool_vote/web/learning/Notebook.jsp
===================================================================
diff -u -r06a6c167950bd4a3bc90be12854509e2a0ac6588 -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_vote/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 06a6c167950bd4a3bc90be12854509e2a0ac6588)
+++ lams_tool_vote/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -34,6 +34,7 @@
 			<html:hidden property="userID" />
 			<html:hidden property="userLeader" />
 			<html:hidden property="groupLeaderName" />
+			<html:hidden property="groupLeaderUserId" />
 			<html:hidden property="useSelectLeaderToolOuput" />
 
 			<div class="panel">
Index: lams_tool_vote/web/learning/RevisitedAllNominations.jsp
===================================================================
diff -u -r06a6c167950bd4a3bc90be12854509e2a0ac6588 -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_vote/web/learning/RevisitedAllNominations.jsp	(.../RevisitedAllNominations.jsp)	(revision 06a6c167950bd4a3bc90be12854509e2a0ac6588)
+++ lams_tool_vote/web/learning/RevisitedAllNominations.jsp	(.../RevisitedAllNominations.jsp)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -52,16 +52,13 @@
 		<html:hidden property="showResults" />
 		<html:hidden property="userLeader" />
 		<html:hidden property="groupLeaderName" />
+		<html:hidden property="groupLeaderUserId" />
 		<html:hidden property="useSelectLeaderToolOuput" />
 
 		<lams:Page type="learner" title="${voteGeneralLearnerFlowDTO.activityTitle}">
 
 			<c:if test="${isLeadershipEnabled}">
-				<lams:Alert type="info" id="leaderEnabled" close="false">
-					<fmt:message key="label.group.leader">
-						<fmt:param>${formBean.groupLeaderName}</fmt:param>
-					</fmt:message>
-				</lams:Alert>
+				<lams:LeaderDisplay idName="leaderEnabled" username="${formBean.groupLeaderName}" userId="${formBean.groupLeaderUserId}"/>
 			</c:if>
 
 			<div class="row">
Index: lams_tool_wiki/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_tool_wiki/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_tool_wiki/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_www/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_www/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_www/web/WEB-INF/tags/LeaderDisplay.tag	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info" style="margin=0px">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_www/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r839af8b148458fd7202f178fb52274dca01fc090
--- lams_www/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision c90250258ad030c59157aa61c61e47583e26df5e)
+++ lams_www/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
@@ -515,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>