Index: lams_central/src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -r5831c6c974ca7fef986ffd207d708a2a56bf39f1
--- lams_central/src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java	(.../PortraitTag.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_central/src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java	(.../PortraitTag.java)	(revision 5831c6c974ca7fef986ffd207d708a2a56bf39f1)
@@ -103,7 +103,7 @@
 		}
 
 		JspWriter writer = pageContext.getOut();
-		writer.println(code);
+		writer.print(code);
 	    }
 
 	} catch (NumberFormatException nfe) {
Index: lams_learning/web/grouping/show.jsp
===================================================================
diff -u -refa51a5d0464d96fada4e5a70f1fb86c2d726717 -r5831c6c974ca7fef986ffd207d708a2a56bf39f1
--- lams_learning/web/grouping/show.jsp	(.../show.jsp)	(revision efa51a5d0464d96fada4e5a70f1fb86c2d726717)
+++ lams_learning/web/grouping/show.jsp	(.../show.jsp)	(revision 5831c6c974ca7fef986ffd207d708a2a56bf39f1)
@@ -56,7 +56,7 @@
 								<td width="15%"><strong><c:out value="${group.groupName}" /></strong></td>
 								<td><c:forEach items="${group.users}" var="user">
 										<div name="u-${user.userId}" class="user-container">
-											<lams:Portrait userId="${user.userId}"/><c:out value="${user.firstName}" />&nbsp<c:out value="${user.lastName}" />
+											<lams:Portrait userId="${user.userId}"/>&nbsp;<c:out value="${user.firstName}" />&nbsp;<c:out value="${user.lastName}" />
 										</div>
 									</c:forEach></td>
 							</tr>
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java
===================================================================
diff -u -rc0799c23f6d6b6be5ca5b740b85c72e3cc89a5b1 -r5831c6c974ca7fef986ffd207d708a2a56bf39f1
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	(.../LearningAction.java)	(revision c0799c23f6d6b6be5ca5b740b85c72e3cc89a5b1)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	(.../LearningAction.java)	(revision 5831c6c974ca7fef986ffd207d708a2a56bf39f1)
@@ -227,7 +227,7 @@
 	    Set<ImageGalleryItem> groupImages = service.getImagesForGroup(imageGallery, sessionId);
 	    for (ImageGalleryItem image : groupImages) {
 
-		// initialize login name to avoid session close error in proxy object
+		// initialize login name abd userid to avoid session close error in proxy object
 		if (image.getCreateBy() != null) {
 		    image.getCreateBy().getLoginName();
 		}
Index: lams_tool_images/web/pages/learning/learning.jsp
===================================================================
diff -u -r4583983b64efe1d91fbb47cdde6a759a6a30e859 -r5831c6c974ca7fef986ffd207d708a2a56bf39f1
--- lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
+++ lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 5831c6c974ca7fef986ffd207d708a2a56bf39f1)
@@ -77,8 +77,12 @@
 					thumbheight: 80,//${thumbnailImageDimensions},
 				    data: [
 						<c:forEach var="image" items="${sessionMap.imageGalleryList}" varStatus="status">
+							<c:set var="description"><div><span class="caption-description">${image.descriptionEscaped}</span></c:set>
 							<c:if test="${!image.createByAuthor && (image.createBy != null)}">
-								<c:set var="imageAddedBy" ><div class="caption-description"><fmt:message key="label.learning.added.by" /> <c:out value="${image.createBy.firstName} ${commentsImage.createBy.lastName}" escapeXml="true"/></div></c:set>
+								<c:set var="portrait"><div class="roffset5"><lams:Portrait userId="${image.createBy.userId}"/></div></c:set>
+								<c:set var="portrait">${fn:replace(portrait, "'", "\\'")}</c:set> <%-- escape the url --%>
+								<c:set var="imageAddedBy"><div class="caption-description"><fmt:message key="label.learning.added.by" />&nbsp;<c:out value="${image.createBy.firstName} ${image.createBy.lastName}" escapeXml="true"/></div></c:set>
+								<c:set var="description"><table><tr><td>${portrait}</td><td>${description}${imageAddedBy}</td></tr></table></c:set>
 							</c:if>					
 						
 							{
@@ -87,8 +91,8 @@
 								full: '<html:rewrite page="/download/?uuid="/>${image.originalFileUuid}&preferDownload=false',
 								id: '${image.uid}', // Custom anchor is used with the hash:true option.
 								caption: '<div class="caption-heading">${image.titleEscaped}</div>'
-									+ '<span class="caption-description">${image.descriptionEscaped}</span>'
-									+'${imageAddedBy}',
+									+ '${description}'
+									+'</div>',
 								//html: $('selector'), // ...or '<div>123</div>'. Custom HTML inside the frame.
 								//fit: 'cover' // Override the global fit option.
 								//any: 'Any data relative to the frame you want to store'
Index: lams_tool_leader/web/pages/learning/leaderselection.jsp
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r5831c6c974ca7fef986ffd207d708a2a56bf39f1
--- lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision 5831c6c974ca7fef986ffd207d708a2a56bf39f1)
@@ -99,12 +99,13 @@
 		<fmt:message key="label.users.from.group" />
 	</div>
 
-	<div id="usersInGroup" class="voffset10">
+	<div id="usersInGroup">
 		<c:forEach var="user" items="${groupUsers}" varStatus="status">
-			<div id="user-${user.userId}">
-				<div class="user voffset2 loffset10">
+			<div id="user-${user.userId}" class="voffset5">
+				<lams:Portrait userId="${user.userId}"/>
+				<span class="portrait-sm-lineheight">
 					<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
-				</div>
+				</span>
 			</div>
 		</c:forEach>
 	</div>
Index: lams_tool_leader/web/pages/monitoring/manageLeaders.jsp
===================================================================
diff -u -rb1dc7223a287296ad4dc6ff5c3bb3ecd59997a32 -r5831c6c974ca7fef986ffd207d708a2a56bf39f1
--- lams_tool_leader/web/pages/monitoring/manageLeaders.jsp	(.../manageLeaders.jsp)	(revision b1dc7223a287296ad4dc6ff5c3bb3ecd59997a32)
+++ lams_tool_leader/web/pages/monitoring/manageLeaders.jsp	(.../manageLeaders.jsp)	(revision 5831c6c974ca7fef986ffd207d708a2a56bf39f1)
@@ -44,8 +44,9 @@
 						</c:if>
 						
 						<c:forEach var="user" items="${session.userDTOs}">
-							<div>
+							<div class="voffset5">
 								<input type="radio" name="sessionId${session.sessionID}" value="${user.uid}" <c:if test="${session.groupLeader.uid == user.uid}">checked="checked"</c:if>/>
+								&nbsp;<lams:Portrait userId="${user.userId}"/>&nbsp;
 								<c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/>
 							</div>
 						</c:forEach>
Index: lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp
===================================================================
diff -u -raeba69e88ab1e8231f91f2b5908dda5edf03f84f -r5831c6c974ca7fef986ffd207d708a2a56bf39f1
--- lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp	(.../fileinfo.jsp)	(revision aeba69e88ab1e8231f91f2b5908dda5edf03f84f)
+++ lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp	(.../fileinfo.jsp)	(revision 5831c6c974ca7fef986ffd207d708a2a56bf39f1)
@@ -3,7 +3,7 @@
 <script type="text/javascript" src="<lams:LAMSURL />/includes/javascript/jquery.timeago.js"></script>
 <script type="text/javascript" src="<lams:LAMSURL />/includes/javascript/timeagoi18n/jquery.timeago.${fn:toLowerCase(localeLanguage)}.js"></script>
 <c:if test="${status.first}">
-			<div class="lead"><strong><c:out value="${fileInfo.owner.firstName}" />&nbsp;<c:out value="${fileInfo.owner.lastName}" /></strong> <fmt:message key="label.submit.file.suffix" /></div>
+			<div class="lead"><lams:Portrait userId="${fileInfo.owner.userID}"/>&nbsp;<strong><c:out value="${fileInfo.owner.firstName}" />&nbsp;<c:out value="${fileInfo.owner.lastName}" /></strong> <fmt:message key="label.submit.file.suffix" /></div>
 </c:if> 
 
 <dl class="dl-horizontal">
Index: lams_tool_wiki/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r09dafa805c15b342353c81b85f9d3a237581df2e -r5831c6c974ca7fef986ffd207d708a2a56bf39f1
--- lams_tool_wiki/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 09dafa805c15b342353c81b85f9d3a237581df2e)
+++ lams_tool_wiki/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 5831c6c974ca7fef986ffd207d708a2a56bf39f1)
@@ -82,7 +82,7 @@
 label.wiki.add.toolTip  =Add a new Wiki page to this Wiki
 label.wiki.add.title.exists  =A Wiki page with title [{0}] already exists, please choose a different title.
 label.wiki.add.title.required  =A title is required for the Wiki page.
-label.wiki.last.edit  =Last edited by {0}, at {1}
+label.wiki.last.edit  =Last edited by <b>{0}</b> - {1}
 label.wiki.refresh  =Refresh
 label.wiki.refresh.toolTip  =Refresh the page to get the current content
 label.wiki.view  =View
Index: lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r09dafa805c15b342353c81b85f9d3a237581df2e -r5831c6c974ca7fef986ffd207d708a2a56bf39f1
--- lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 09dafa805c15b342353c81b85f9d3a237581df2e)
+++ lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 5831c6c974ca7fef986ffd207d708a2a56bf39f1)
@@ -82,7 +82,7 @@
 label.wiki.add.toolTip  =Add a new Wiki page to this Wiki
 label.wiki.add.title.exists  =A Wiki page with title [{0}] already exists, please choose a different title.
 label.wiki.add.title.required  =A title is required for the Wiki page.
-label.wiki.last.edit  =Last edited by {0}, at {1}
+label.wiki.last.edit  =Last edited by <b>{0}</b> - {1}
 label.wiki.refresh  =Refresh
 label.wiki.refresh.toolTip  =Refresh the page to get the current content
 label.wiki.view  =View
Index: lams_tool_wiki/web/pages/learning/wiki.jsp
===================================================================
diff -u -rbbdbb65d0b80dc2c960c750e380f4b480da033ed -r5831c6c974ca7fef986ffd207d708a2a56bf39f1
--- lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision bbdbb65d0b80dc2c960c750e380f4b480da033ed)
+++ lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision 5831c6c974ca7fef986ffd207d708a2a56bf39f1)
@@ -204,21 +204,22 @@
 
                     <div class="panel panel-default" id="view">
                       <div class="panel-heading">
-                        <h4 class="panel-title">${fn:escapeXml(currentWikiPage.title)}</h4>
-                        <!-- Last edited -->
+                        <!-- Title and Last edited -->
+                        <c:choose>
+                            <c:when test="${currentWikiPage.currentWikiContentDTO.editorDTO == null}">
+                                <c:set var="lastEditName"><fmt:message key="label.wiki.history.editor.author"/></c:set>
+                            </c:when>
+                            <c:otherwise>
+                                <c:set var="lastEditPortrait"><div class="pull-right"><lams:Portrait userId="${currentWikiPage.currentWikiContentDTO.editorDTO.userId}"/></div></c:set>
+                                <c:set var="lastEditName"><c:out value="${currentWikiPage.currentWikiContentDTO.editorDTO.firstName} ${currentWikiPage.currentWikiContentDTO.editorDTO.lastName}" escapeXml="true"/></c:set>
+                            </c:otherwise>
+                        </c:choose>
+                        ${lastEditPortrait}
+                        <h4 class="panel-title">${fn:escapeXml(currentWikiPage.title)}</h4> 
                         <div class="voffset5" style="font-size: 12px">
                           <fmt:message key="label.wiki.last.edit">
+                            <fmt:param>${lastEditName}</fmt:param>
                             <fmt:param>
-                              <c:choose>
-                                <c:when test="${currentWikiPage.currentWikiContentDTO.editorDTO == null}">
-                                  <fmt:message key="label.wiki.history.editor.author"/>
-                                </c:when>
-                                <c:otherwise>
-                                  <c:out value="${currentWikiPage.currentWikiContentDTO.editorDTO.firstName} ${currentWikiPage.currentWikiContentDTO.editorDTO.lastName}" escapeXml="true"/>
-                                </c:otherwise>
-                              </c:choose>
-                            </fmt:param>
-                            <fmt:param>
                               <lams:Date value="${currentWikiPage.currentWikiContentDTO.editDate}" timeago="true"/>
                             </fmt:param>
                           </fmt:message> 
@@ -278,7 +279,7 @@
                             <th>
                               <fmt:message key="label.wiki.history.date"></fmt:message>
                             </th>
-                            <th>
+                            <th>	
                               <fmt:message key="label.wiki.history.editor"></fmt:message>
                             </th>
                             <th>
@@ -297,6 +298,7 @@
                                 <td>
                                   <c:choose>
                                     <c:when test="${wikiContentPageVersion.editorDTO != null}">
+                                     	<lams:Portrait userId="${wikiContentPageVersion.editorDTO.userId}"/>
                                       <c:out value="${wikiContentPageVersion.editorDTO.firstName} ${wikiContentPageVersion.editorDTO.lastName}" escapeXml="true"/>
                                     </c:when>
                                     <c:otherwise>
Index: lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp
===================================================================
diff -u -r1957fd76826f5186dce77b204acfbbc73afbf22b -r5831c6c974ca7fef986ffd207d708a2a56bf39f1
--- lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp	(.../wikiDisplay.jsp)	(revision 1957fd76826f5186dce77b204acfbbc73afbf22b)
+++ lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp	(.../wikiDisplay.jsp)	(revision 5831c6c974ca7fef986ffd207d708a2a56bf39f1)
@@ -66,21 +66,22 @@
 		<!-- Wiki main -->
 	     <div class="panel panel-default" id="view">
 	       <div class="panel-heading">
+	         <!-- Title & Last edited -->
+             <c:choose>
+               <c:when test="${currentWikiPage.currentWikiContentDTO.editorDTO == null}">
+                  <c:set var="lastEditName"><fmt:message key="label.wiki.history.editor.author"/></c:set>
+               </c:when>
+               <c:otherwise>
+                <c:set var="lastEditPortrait"><div class="pull-right"><lams:Portrait userId="${currentWikiPage.currentWikiContentDTO.editorDTO.userId}"/></div></c:set>
+                  <c:set var="lastEditName"><c:out value="${currentWikiPage.currentWikiContentDTO.editorDTO.firstName} ${currentWikiPage.currentWikiContentDTO.editorDTO.lastName}" escapeXml="true"/></c:set>
+               </c:otherwise>
+             </c:choose>
+             ${lastEditPortrait}
 	         <h4 class="panel-title">${fn:escapeXml(currentWikiPage.title)}</h4>
-	         <!-- Last edited -->
 	         <div class="voffset5" style="font-size: 12px">
 	           <fmt:message key="label.wiki.last.edit">
+	             <fmt:param>${lastEditName}</fmt:param>
 	             <fmt:param>
-	               <c:choose>
-	                 <c:when test="${currentWikiPage.currentWikiContentDTO.editorDTO == null}">
-	                   <fmt:message key="label.wiki.history.editor.author"/>
-	                 </c:when>
-	                 <c:otherwise>
-	                   <c:out value="${currentWikiPage.currentWikiContentDTO.editorDTO.firstName} ${currentWikiPage.currentWikiContentDTO.editorDTO.lastName}" escapeXml="true"/>
-	                 </c:otherwise>
-	               </c:choose>
-	             </fmt:param>
-	             <fmt:param>
 	               <lams:Date value="${currentWikiPage.currentWikiContentDTO.editDate}" timeago="true"/>
 	             </fmt:param>
 	           </fmt:message> 
@@ -129,6 +130,7 @@
 								<td>
 									<c:choose>
 										<c:when test="${wikiContentPageVersion.editorDTO != null}">
+	                                     	<lams:Portrait userId="${wikiContentPageVersion.editorDTO.userId}"/>
 											${wikiContentPageVersion.editorDTO.firstName} ${wikiContentPageVersion.editorDTO.lastName}
 										</c:when>
 										<c:otherwise>