Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/ReflectDTO.java
===================================================================
diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -rf851d4f476f3856ffb55d5004602a57f0dbe02c0
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/ReflectDTO.java	(.../ReflectDTO.java)	(revision 5773f84ed608838de3521ecde87c52f3c72d478c)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/ReflectDTO.java	(.../ReflectDTO.java)	(revision f851d4f476f3856ffb55d5004602a57f0dbe02c0)
@@ -9,6 +9,7 @@
  */
 public class ReflectDTO {
     private Long userUid;
+    private Long userId;
     private String fullName;
     private String loginName;
     private boolean hasRefection;
@@ -20,6 +21,7 @@
 	this.setLoginName(user.getLoginName());
 	this.setFullName(user.getFirstName() + " " + user.getLastName());
 	this.setUserUid(user.getUid());
+	this.setUserId(user.getUserId());
     }
 
     public boolean isFinishReflection() {
@@ -77,4 +79,12 @@
     public void setUserUid(Long userUid) {
 	this.userUid = userUid;
     }
+
+    public Long getUserId() {
+	return userId;
+    }
+
+    public void setUserId(Long userId) {
+	this.userId = userId;
+    }
 }
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -rf851d4f476f3856ffb55d5004602a57f0dbe02c0
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java	(.../Summary.java)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java	(.../Summary.java)	(revision f851d4f476f3856ffb55d5004602a57f0dbe02c0)
@@ -54,6 +54,7 @@
     private boolean itemHide;
     private String itemTitle;
     private String username;
+    private Long userId; // LAMS user id
     private int numberOfVotes;
     private ItemRatingDTO itemRatingDto;
 
@@ -83,6 +84,7 @@
 	    this.itemTitle = item.getTitle();
 	    this.username = item.getCreateBy() == null ? ""
 		    : item.getCreateBy().getFirstName() + " " + item.getCreateBy().getLastName();
+	    this.userId = item.getCreateBy() == null ? null : item.getCreateBy().getUserId();
 	} else {
 	    this.itemUid = new Long(-1);
 	}
@@ -181,4 +183,12 @@
     public void setInitGroup(boolean isInitGroup) {
 	this.isInitGroup = isInitGroup;
     }
+
+    public Long getUserId() {
+	return userId;
+    }
+
+    public void setUserId(Long userId) {
+	this.userId = userId;
+    }
 }
\ No newline at end of file
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java
===================================================================
diff -u -r942b2a5bf6dac160bf9e00bac22e6232ae65ef98 -rf851d4f476f3856ffb55d5004602a57f0dbe02c0
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 942b2a5bf6dac160bf9e00bac22e6232ae65ef98)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision f851d4f476f3856ffb55d5004602a57f0dbe02c0)
@@ -144,7 +144,7 @@
 	ImageGallery imageGallery = (ImageGallery) sessionMap.get(ImageGalleryConstants.ATTR_IMAGE_GALLERY);
 	Long imageUid = new Long(request.getParameter(ImageGalleryConstants.PARAM_IMAGE_UID));
 	ImageGalleryItem image = getImageGalleryService().getImageGalleryItemByUid(imageUid);
-	Long toolSessionId = WebUtil.readLongParam(request, ImageGalleryConstants.ATTR_SESSION_MAP_ID);
+	Long toolSessionId = WebUtil.readLongParam(request, ImageGalleryConstants.PARAM_TOOL_SESSION_ID);
 	
 	if (imageGallery.isAllowVote()) {
 	    List<List<UserImageContributionDTO>> imageSummary = getImageGalleryService().getImageSummary(contentId,
Index: lams_tool_images/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r4583983b64efe1d91fbb47cdde6a759a6a30e859 -rf851d4f476f3856ffb55d5004602a57f0dbe02c0
--- lams_tool_images/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
+++ lams_tool_images/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision f851d4f476f3856ffb55d5004602a57f0dbe02c0)
@@ -1,7 +1,15 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:set var="summaryList" value="${sessionMap.summaryList}"/>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+<script type="text/javascript" src="${lams}/includes/javascript/portrait.js" ></script>
 
+<script type="text/javascript">
+$(document).ready(function(){
+	initializePortraitPopover('${lams}');
+});
+</script>
+
 <div class="panel">
 	<h4>
 	  <c:out value="${sessionMap.imageGallery.title}" escapeXml="true"/>
@@ -94,7 +102,7 @@
 						   	<html:rewrite page='/download/?uuid='/>${image.thumbnailFileUuid}&preferDownload=false
 						</c:set>
 						<c:set var="url" >
-							<c:url value='/monitoring/imageSummary.do'/>?sessionMapID=${sessionMapID}&imageUid=${image.uid}&KeepThis=true&TB_iframe=true&modal=true&toolSessionID=${sessionId}
+							<c:url value='/monitoring/imageSummary.do'/>?sessionMapID=${sessionMapID}&imageUid=${image.uid}&toolSessionID=${sessionId}&KeepThis=true&TB_iframe=true&modal=true
 						</c:set>				
 						<a href="${url}" class="thickbox" title="<fmt:message key='label.monitoring.imagesummary.image.summary' />" style="border-style: none;"> 
 							<c:set var="title">
@@ -107,15 +115,24 @@
 					<td style="vertical-align:middle;">
 						<c:set var="title">
 							<c:out value="${image.title}" escapeXml="true"/>
-							<c:if test="${!summary.itemCreateByAuthor}">
-								[ <fmt:message key="label.monitoring.by"/> <c:out value="${summary.username}" escapeXml="true"/> ]
-							</c:if>						
 						</c:set>
-						<a href="${url}" class="thickbox">
-							<c:out value="${title}" escapeXml="false"/>
-						</a>
+						<a href="${url}" class="thickbox"><c:out value="${title}" escapeXml="false"/></a>
+
+						<c:if test="${! summary.itemCreateByAuthor}">
+							<c:set var="portraitURL"><lams:Portrait userId="${summary.userId}" hover="true"><c:out value="${summary.username}" escapeXml="true"/></lams:Portrait></c:set>
+							<c:choose>
+							<c:when test="${fn:containsIgnoreCase(portraitURL,'<a ')}">
+								<c:set var="authorref">${fn:replace(portraitURL, "class=\"", "href=\"REPLACEMEURL\" class=\"thickbox ")}</c:set>
+								<c:set var="authorref">${fn:replace(authorref, "REPLACEMEURL", url)}</c:set>
+							</c:when>
+							<c:otherwise>
+								<c:set var="authorref"><c:out value="${summary.username}" escapeXml="true"/></c:set>
+							</c:otherwise>
+							</c:choose>
+							[ <fmt:message key="label.monitoring.by"/>&nbsp;${authorref} ]
+						</c:if>							
 					</td>
-					
+
 					<c:choose>
 						<c:when test="${sessionMap.imageGallery.allowRank}">
 							<td style="vertical-align:middle; padding-left:0px; text-align:center;">
@@ -195,7 +212,7 @@
 			<c:forEach var="user" items="${userList}" varStatus="refStatus">
 				<tr>
 					<td>
-						<c:out value="${user.fullName}" escapeXml="true"/>
+						<lams:Portrait userId="${user.userId}" hover="true"><c:out value="${user.fullName}" escapeXml="true"/></lams:Portrait>
 					</td>
 					<td>
 						<c:set var="viewReflection">
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dto/ReflectDTO.java
===================================================================
diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -rf851d4f476f3856ffb55d5004602a57f0dbe02c0
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dto/ReflectDTO.java	(.../ReflectDTO.java)	(revision 5773f84ed608838de3521ecde87c52f3c72d478c)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dto/ReflectDTO.java	(.../ReflectDTO.java)	(revision f851d4f476f3856ffb55d5004602a57f0dbe02c0)
@@ -9,6 +9,7 @@
  */
 public class ReflectDTO {
     private Long userUid;
+    private Long userId;
     private String fullName;
     private String loginName;
     private boolean hasRefection;
@@ -20,6 +21,7 @@
 	this.setLoginName(user.getLoginName());
 	this.setFullName(user.getFirstName() + " " + user.getLastName());
 	this.setUserUid(user.getUid());
+	this.setUserId(user.getUserId());
     }
 
     public boolean isFinishReflection() {
@@ -77,4 +79,12 @@
     public void setUserUid(Long userUid) {
 	this.userUid = userUid;
     }
+
+    public Long getUserId() {
+	return userId;
+    }
+
+    public void setUserId(Long userId) {
+	this.userId = userId;
+    }
 }
Index: lams_tool_imscc/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 -rf851d4f476f3856ffb55d5004602a57f0dbe02c0
--- lams_tool_imscc/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3)
+++ lams_tool_imscc/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision f851d4f476f3856ffb55d5004602a57f0dbe02c0)
@@ -2,6 +2,13 @@
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:set var="summaryList" value="${sessionMap.summaryList}"/>
 
+<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/portrait.js" ></script>
+<script type="text/javascript">
+$(document).ready(function(){
+	initializePortraitPopover('<lams:LAMSURL />');
+});
+</script>
+
 <div class="panel">
 	<h4>
 	  <c:out value="${sessionMap.commonCartridge.title}" escapeXml="true"/>
@@ -143,7 +150,7 @@
 						</c:if>
 						<tr>
 							<td colspan="2">
-								<c:out value="${user.fullName}" escapeXml="true"/>
+								<lams:Portrait userId="${user.userId}" hover="true"><c:out value="${user.fullName}" escapeXml="true"/></lams:Portrait>
 							</td>
 							<td colspan="2" class="align-right">
 								<c:set var="viewReflection">
Index: lams_tool_imscc/web/pages/monitoring/userlist.jsp
===================================================================
diff -u -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 -rf851d4f476f3856ffb55d5004602a57f0dbe02c0
--- lams_tool_imscc/web/pages/monitoring/userlist.jsp	(.../userlist.jsp)	(revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3)
+++ lams_tool_imscc/web/pages/monitoring/userlist.jsp	(.../userlist.jsp)	(revision f851d4f476f3856ffb55d5004602a57f0dbe02c0)
@@ -4,8 +4,14 @@
 <lams:html>
 <lams:head>
 	<%@ include file="/common/header.jsp" %>
+	<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/portrait.js" ></script>
+	<script type="text/javascript">
+		$(document).ready(function(){
+			initializePortraitPopover('<lams:LAMSURL />');
+		});
+	</script>
 </lams:head>
-
+	
 <body class="stripes">
 
 	<c:set var="title"><fmt:message key="label.monitoring.heading.access" /></c:set>
@@ -27,7 +33,8 @@
 						<lams:Date value="${user.accessDate}"/>
 					</td>
 					<td>
-						<c:out value="${user.firstName},${user.lastName}" escapeXml="true"/>
+						<lams:Portrait userId="${user.userId}" hover="true"><c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/></lams:Portrait>
+						
 					</td>
 				</tr>
 			</c:forEach>
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dto/NotebookEntryDTO.java
===================================================================
diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -rf851d4f476f3856ffb55d5004602a57f0dbe02c0
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dto/NotebookEntryDTO.java	(.../NotebookEntryDTO.java)	(revision 5773f84ed608838de3521ecde87c52f3c72d478c)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dto/NotebookEntryDTO.java	(.../NotebookEntryDTO.java)	(revision f851d4f476f3856ffb55d5004602a57f0dbe02c0)
@@ -7,6 +7,8 @@
 public class NotebookEntryDTO {
 
     private Long uid;
+    
+    private Long userId;
 
     private String entry;
 
@@ -63,4 +65,12 @@
 	this.fullName = fullName;
     }
 
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
 }
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java
===================================================================
diff -u -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b -rf851d4f476f3856ffb55d5004602a57f0dbe02c0
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java	(.../KalturaService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java	(.../KalturaService.java)	(revision f851d4f476f3856ffb55d5004602a57f0dbe02c0)
@@ -400,6 +400,7 @@
 		if (entry != null) {
 		    NotebookEntryDTO notebookEntryDTO = new NotebookEntryDTO(entry);
 		    notebookEntryDTO.setFullName(user.getFirstName() + " " + user.getLastName());
+		    notebookEntryDTO.setUserId(user.getUserId());
 		    Date postedDate = (entry.getLastModified() != null) ? entry.getLastModified()
 			    : entry.getCreateDate();
 		    notebookEntryDTO.setLastModified(postedDate);
Index: lams_tool_kaltura/web/pages/monitoring/reflections.jsp
===================================================================
diff -u -re535a51e19cbc72d07bda00b019c947847d869b0 -rf851d4f476f3856ffb55d5004602a57f0dbe02c0
--- lams_tool_kaltura/web/pages/monitoring/reflections.jsp	(.../reflections.jsp)	(revision e535a51e19cbc72d07bda00b019c947847d869b0)
+++ lams_tool_kaltura/web/pages/monitoring/reflections.jsp	(.../reflections.jsp)	(revision f851d4f476f3856ffb55d5004602a57f0dbe02c0)
@@ -1,5 +1,12 @@
 <%@ include file="/common/taglibs.jsp"%>
 
+<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/portrait.js" ></script>
+<script type="text/javascript">
+	$(document).ready(function(){
+		initializePortraitPopover('<lams:LAMSURL />');
+	});
+</script>
+
 <c:if test="${kaltura.reflectOnActivity && not empty reflectList}">
 
 	<div class="panel-group" id="reflections" role="tablist" aria-multiselectable="true"> 
@@ -17,7 +24,7 @@
 					<c:forEach var="reflectDTO" items="${reflectList}">
 						<tr>
 							<td>
-								<strong><c:out value="${reflectDTO.fullName}" escapeXml="true"/></strong> - <lams:Date value="${reflectDTO.lastModified}"/>
+								<lams:Portrait userId="${reflectDTO.userId}" hover="true"><strong><c:out value="${reflectDTO.fullName}" escapeXml="true"/></strong></lams:Portrait> - <lams:Date value="${reflectDTO.lastModified}"/>
 								<br>
 								<lams:out value="${reflectDTO.entry}" escapeHtml="true" />
 							</td>
Index: lams_tool_lamc/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r6c575f01c954df59ea67ff2bc26b0a0af4a2ade8 -rf851d4f476f3856ffb55d5004602a57f0dbe02c0
--- lams_tool_lamc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6c575f01c954df59ea67ff2bc26b0a0af4a2ade8)
+++ lams_tool_lamc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f851d4f476f3856ffb55d5004602a57f0dbe02c0)
@@ -210,6 +210,8 @@
 label.number.learners.in.mark.range  =Number of learners in mark range
 label.number.groups.in.mark.range  =Number of groups in mark range
 label.average.mark  =Average mark
+label.error  =Error
+error.loaderror  =There was an error loading the grid. If this problem persists, please contact your system administrator.
+label.ok  =OK
 
-
 #======= End labels: Exported 204 labels for en AU =====
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
===================================================================
diff -u -rec381d32c228f460e0fd3ce3857aab14d4f6fd87 -rf851d4f476f3856ffb55d5004602a57f0dbe02c0
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java	(.../IMcUserDAO.java)	(revision ec381d32c228f460e0fd3ce3857aab14d4f6fd87)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java	(.../IMcUserDAO.java)	(revision f851d4f476f3856ffb55d5004602a57f0dbe02c0)
@@ -26,6 +26,7 @@
 
 import org.lamsfoundation.lams.tool.mc.dto.McUserMarkDTO;
 import org.lamsfoundation.lams.tool.mc.pojos.McQueUsr;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 
 /**
  * @author Ozgur Demirtas
@@ -72,7 +73,7 @@
     void removeMcUser(McQueUsr mcUser);
 
     List<McUserMarkDTO> getPagedUsersBySession(Long sessionId, int page, int size, String sortBy, String sortOrder,
-	    String searchString);
+	    String searchString, IUserManagementService userManagementService);
 
     int getCountPagedUsersBySession(Long sessionId, String searchString);
     
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
===================================================================
diff -u -rec381d32c228f460e0fd3ce3857aab14d4f6fd87 -rf851d4f476f3856ffb55d5004602a57f0dbe02c0
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java	(.../McUserDAO.java)	(revision ec381d32c228f460e0fd3ce3857aab14d4f6fd87)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java	(.../McUserDAO.java)	(revision f851d4f476f3856ffb55d5004602a57f0dbe02c0)
@@ -33,6 +33,7 @@
 import org.lamsfoundation.lams.tool.mc.dao.IMcUserDAO;
 import org.lamsfoundation.lams.tool.mc.dto.McUserMarkDTO;
 import org.lamsfoundation.lams.tool.mc.pojos.McQueUsr;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -100,19 +101,30 @@
     public void removeMcUser(McQueUsr mcUser) {
 	this.getSession().delete(mcUser);
     }
+    
+    final String LOAD_USERS_SELECT = "SELECT user.uid, user.que_usr_id, user.fullname, user.last_attempt_total_mark ";
+    final String LOAD_USERS_FROM = " FROM tl_lamc11_que_usr user ";
+    final String LOAD_USERS_JOINWHERE = " JOIN tl_lamc11_session session on user.mc_session_id = session.uid "
+    	+ " WHERE session.mc_session_id = :sessionId "
+	+ " AND (user.fullname LIKE CONCAT('%', :searchString, '%')) "
+	+ " ORDER BY CASE WHEN :sortBy='userName' THEN user.fullname "
+	+ " WHEN :sortBy='total' THEN user.last_attempt_total_mark END ";
 
     @SuppressWarnings("unchecked")
     @Override
     public List<McUserMarkDTO> getPagedUsersBySession(Long sessionId, int page, int size, String sortBy,
-	    String sortOrder, String searchString) {
+	    String sortOrder, String searchString, IUserManagementService userManagementService) {
 
-	final String LOAD_USERS = "SELECT DISTINCT user.uid, user.fullname, user.lastAttemptTotalMark " + "FROM "
-		+ McQueUsr.class.getName() + " user " + "WHERE user.mcSession.mcSessionId = :sessionId "
-		+ " AND (user.fullname LIKE CONCAT('%', :searchString, '%')) " + " ORDER BY " + " CASE "
-		+ " 	WHEN :sortBy='userName' THEN user.fullname "
-		+ " 	WHEN :sortBy='total' THEN user.lastAttemptTotalMark " + " END " + sortOrder;
+	String[] portraitStrings = userManagementService.getPortraitSQL("user.que_usr_id");
 
-	Query query = getSession().createQuery(LOAD_USERS);
+	StringBuilder bldr = new StringBuilder(LOAD_USERS_SELECT)
+		.append(portraitStrings[0])
+		.append(LOAD_USERS_FROM)
+		.append(portraitStrings[1])
+		.append(LOAD_USERS_JOINWHERE)
+		.append(sortOrder);
+
+	SQLQuery query = getSession().createSQLQuery(bldr.toString());
 	query.setLong("sessionId", sessionId);
 	// support for custom search from a toolbar
 	searchString = searchString == null ? "" : searchString;
@@ -126,14 +138,18 @@
 	if (list != null && list.size() > 0) {
 	    for (Object[] element : list) {
 
-		Long userId = ((Number) element[0]).longValue();
-		String fullName = (String) element[1];
-		Integer totalMark = element[2] == null ? 0 : ((Number) element[2]).intValue();
+		Long userUid = ((Number) element[0]).longValue();
+		Long userId = ((Number) element[1]).longValue();
+		String fullName = (String) element[2];
+		Integer totalMark = element[3] == null ? 0 : ((Number) element[3]).intValue();
+		Long portraitId = element[4] == null ? null : ((Number) element[4]).longValue();
 
 		McUserMarkDTO userDto = new McUserMarkDTO();
-		userDto.setQueUsrId(userId.toString());
+		userDto.setQueUsrId(userUid.toString());
+		userDto.setUserId(userId.toString());
 		userDto.setFullName(fullName);
 		userDto.setTotalMark(new Long(totalMark));
+		userDto.setPortraitId(portraitId==null ? null : portraitId.toString());
 		userDtos.add(userDto);
 	    }
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McUserMarkDTO.java
===================================================================
diff -u -r289926a27bdbc9bd2519e3064a85f489fc1845ec -rf851d4f476f3856ffb55d5004602a57f0dbe02c0
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McUserMarkDTO.java	(.../McUserMarkDTO.java)	(revision 289926a27bdbc9bd2519e3064a85f489fc1845ec)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McUserMarkDTO.java	(.../McUserMarkDTO.java)	(revision f851d4f476f3856ffb55d5004602a57f0dbe02c0)
@@ -36,7 +36,9 @@
 public class McUserMarkDTO implements Comparable {
     private String sessionId;
     private String sessionName;
-    private String queUsrId;
+    private String queUsrId; // mc user uid
+    private String userId; // LAMS userId
+    private String portraitId;
     private String userName;
     private String fullName;
     private boolean isUserLeader;
@@ -205,4 +207,20 @@
     public void setAttemptTime(Date attemptTime) {
 	this.attemptTime = attemptTime;
     }
+
+    public String getUserId() {
+	return userId;
+    }
+
+    public void setUserId(String userId) {
+	this.userId = userId;
+    }
+
+    public String getPortraitId() {
+	return portraitId;
+    }
+
+    public void setPortraitId(String portraitId) {
+	this.portraitId = portraitId;
+    }
 }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/ReflectionDTO.java
===================================================================
diff -u -r289926a27bdbc9bd2519e3064a85f489fc1845ec -rf851d4f476f3856ffb55d5004602a57f0dbe02c0
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/ReflectionDTO.java	(.../ReflectionDTO.java)	(revision 289926a27bdbc9bd2519e3064a85f489fc1845ec)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/ReflectionDTO.java	(.../ReflectionDTO.java)	(revision f851d4f476f3856ffb55d5004602a57f0dbe02c0)
@@ -23,6 +23,8 @@
 package org.lamsfoundation.lams.tool.mc.dto;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
+import org.lamsfoundation.lams.notebook.model.NotebookEntry;
+import org.lamsfoundation.lams.tool.mc.pojos.McQueUsr;
 
 /**
  * <p>
@@ -42,6 +44,15 @@
 
     protected String entry;
 
+    public ReflectionDTO(McQueUsr user, String sessionId, NotebookEntry notebookEntry) {
+	this.setUserId(user.getQueUsrId().toString());
+	this.setSessionId(sessionId);
+	this.setUserName(user.getFullname());
+	this.setReflectionUid(notebookEntry.getUid().toString());
+	// String notebookEntryPresentable = McUtils.replaceNewLines(notebookEntry.getEntry());
+	this.setEntry(notebookEntry.getEntry());
+    }
+    
     @Override
     public int compareTo(Object o) {
 	ReflectionDTO reflectionDTO = (ReflectionDTO) o;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
===================================================================
diff -u -r85ef8aca5722a36582117db1e8b988e2c16b6369 -rf851d4f476f3856ffb55d5004602a57f0dbe02c0
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(.../McService.java)	(revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(.../McService.java)	(revision f851d4f476f3856ffb55d5004602a57f0dbe02c0)
@@ -418,7 +418,8 @@
     @Override
     public List<McUserMarkDTO> getPagedUsersBySession(Long sessionId, int page, int size, String sortBy,
 	    String sortOrder, String searchString) {
-	return mcUserDAO.getPagedUsersBySession(sessionId, page, size, sortBy, sortOrder, searchString);
+	return mcUserDAO.getPagedUsersBySession(sessionId, page, size, sortBy, sortOrder, searchString,
+		userManagementService);
     }
 
     @Override
@@ -572,6 +573,7 @@
 		mcUserMarkDTO.setUserGroupLeader(session.isUserGroupLeader(user));
 		mcUserMarkDTO.setUserName(user.getUsername());
 		mcUserMarkDTO.setQueUsrId(user.getUid().toString());
+		mcUserMarkDTO.setUserId(user.getQueUsrId().toString());
 
 		if (isFullAttemptDetailsRequired) {
 
@@ -1689,54 +1691,22 @@
     @Override
     public List<ReflectionDTO> getReflectionList(McContent mcContent, Long userID) {
 	List<ReflectionDTO> reflectionsContainerDTO = new LinkedList<ReflectionDTO>();
-	if (userID == null) {
-	    // all users mode
-	    for (McSession mcSession : (Set<McSession>) mcContent.getMcSessions()) {
-
-		for (McQueUsr user : (Set<McQueUsr>) mcSession.getMcQueUsers()) {
-
+	for (McSession mcSession : (Set<McSession>) mcContent.getMcSessions()) {
+	    for (McQueUsr user : (Set<McQueUsr>) mcSession.getMcQueUsers()) {
+		// if all users mode or single user mode and found right user
+		if (userID == null || user.getQueUsrId().equals(userID)) {
 		    NotebookEntry notebookEntry = this.getEntry(mcSession.getMcSessionId(),
 			    CoreNotebookConstants.NOTEBOOK_TOOL, McAppConstants.TOOL_SIGNATURE,
 			    new Integer(user.getQueUsrId().toString()));
 
 		    if (notebookEntry != null) {
-			ReflectionDTO reflectionDTO = new ReflectionDTO();
-			reflectionDTO.setUserId(user.getQueUsrId().toString());
-			reflectionDTO.setSessionId(mcSession.getMcSessionId().toString());
-			reflectionDTO.setUserName(user.getFullname());
-			reflectionDTO.setReflectionUid(notebookEntry.getUid().toString());
-			// String notebookEntryPresentable = McUtils.replaceNewLines(notebookEntry.getEntry());
-			reflectionDTO.setEntry(notebookEntry.getEntry());
+			ReflectionDTO reflectionDTO = new ReflectionDTO(user, 
+				mcSession.getMcSessionId().toString(), notebookEntry);
 			reflectionsContainerDTO.add(reflectionDTO);
 		    }
 		}
 	    }
-	} else {
-	    // single user mode
-	    for (Iterator sessionIter = mcContent.getMcSessions().iterator(); sessionIter.hasNext();) {
-		McSession mcSession = (McSession) sessionIter.next();
-		for (Iterator userIter = mcSession.getMcQueUsers().iterator(); userIter.hasNext();) {
-		    McQueUsr user = (McQueUsr) userIter.next();
-		    if (user.getQueUsrId().equals(userID)) {
-			NotebookEntry notebookEntry = this.getEntry(mcSession.getMcSessionId(),
-				CoreNotebookConstants.NOTEBOOK_TOOL, McAppConstants.TOOL_SIGNATURE,
-				new Integer(user.getQueUsrId().toString()));
-
-			if (notebookEntry != null) {
-			    ReflectionDTO reflectionDTO = new ReflectionDTO();
-			    reflectionDTO.setUserId(user.getQueUsrId().toString());
-			    reflectionDTO.setSessionId(mcSession.getMcSessionId().toString());
-			    reflectionDTO.setUserName(user.getFullname());
-			    reflectionDTO.setReflectionUid(notebookEntry.getUid().toString());
-			    // String notebookEntryPresentable = McUtils.replaceNewLines(notebookEntry.getEntry());
-			    reflectionDTO.setEntry(notebookEntry.getEntry());
-			    reflectionsContainerDTO.add(reflectionDTO);
-			}
-		    }
-		}
-	    }
 	}
-
 	return reflectionsContainerDTO;
     }
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
===================================================================
diff -u -r4170df8bc66e658ef4dcd47e99eceddec3c2673a -rf851d4f476f3856ffb55d5004602a57f0dbe02c0
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java	(.../McMonitoringAction.java)	(revision 4170df8bc66e658ef4dcd47e99eceddec3c2673a)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java	(.../McMonitoringAction.java)	(revision f851d4f476f3856ffb55d5004602a57f0dbe02c0)
@@ -302,6 +302,8 @@
 	    JSONArray visitLogData = new JSONArray();
 	    Long userUid = Long.parseLong(userDto.getQueUsrId());
 	    visitLogData.put(userUid);
+	    visitLogData.put(userDto.getUserId());
+
 	    String fullName = StringEscapeUtils.escapeHtml(userDto.getFullName());
 	    if (groupLeader != null && groupLeader.getUid().equals(userUid)) {
 		fullName += " (" + mcService.getLocalizedMessage("label.monitoring.group.leader") + ")";
@@ -311,6 +313,8 @@
 	    Long totalMark = (userDto.getTotalMark() == null) ? 0 : userDto.getTotalMark();
 	    visitLogData.put(totalMark);
 
+	    visitLogData.put(userDto.getPortraitId());
+
 	    JSONObject userRow = new JSONObject();
 	    userRow.put("id", i++);
 	    userRow.put("cell", visitLogData);
Index: lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -rec381d32c228f460e0fd3ce3857aab14d4f6fd87 -rf851d4f476f3856ffb55d5004602a57f0dbe02c0
--- lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision ec381d32c228f460e0fd3ce3857aab14d4f6fd87)
+++ lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision f851d4f476f3856ffb55d5004602a57f0dbe02c0)
@@ -8,7 +8,7 @@
 	<title><fmt:message key="label.monitoring"/></title>
 	
 	<%@ include file="/common/monitoringheader.jsp"%>
-	<link href="${lams}css/chart.css" rel="stylesheet" type="text/css"/>
+	<lams:css suffix="chart"/>
 
 	<script type="text/javascript">
 	
Index: lams_tool_lamc/web/monitoring/Reflections.jsp
===================================================================
diff -u -r463f7b3dbb88ee41210f7170dc19dc25360cd26f -rf851d4f476f3856ffb55d5004602a57f0dbe02c0
--- lams_tool_lamc/web/monitoring/Reflections.jsp	(.../Reflections.jsp)	(revision 463f7b3dbb88ee41210f7170dc19dc25360cd26f)
+++ lams_tool_lamc/web/monitoring/Reflections.jsp	(.../Reflections.jsp)	(revision f851d4f476f3856ffb55d5004602a57f0dbe02c0)
@@ -29,8 +29,9 @@
 			
 						<html:link href="javascript:launchPopup('${fn:escapeXml(openNotebook)}');" styleClass="btn btn-default btn-sm">
 							<fmt:message key="label.view" />
-						</html:link>
-						&nbsp;<c:out value="${userName}" escapeXml="true"/> 
+						</html:link>&nbsp;
+						<lams:Portrait userId="${userId}" hover="true"><c:out value="${userName}" escapeXml="true"/> </lams:Portrait>
+						
 					</td>
 				</tr>	
 			</c:forEach>		
Index: lams_tool_lamc/web/monitoring/SummaryContent.jsp
===================================================================
diff -u -r463f7b3dbb88ee41210f7170dc19dc25360cd26f -rf851d4f476f3856ffb55d5004602a57f0dbe02c0
--- lams_tool_lamc/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 463f7b3dbb88ee41210f7170dc19dc25360cd26f)
+++ lams_tool_lamc/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision f851d4f476f3856ffb55d5004602a57f0dbe02c0)
@@ -5,6 +5,8 @@
 <link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet">
 <link href="${lams}css/jquery.jqGrid.css" rel="stylesheet" type="text/css"/>
 
+<script type="text/javascript" src="${lams}/includes/javascript/portrait.js" ></script>
+
 <style media="screen,projection" type="text/css">
 	.ui-jqgrid {
 		border-left-style: none !important;
@@ -36,6 +38,8 @@
 <script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 <script type="text/javascript">
 	$(document).ready(function(){
+		initializePortraitPopover('${lams}');
+
 		<c:forEach var="sessionDto" items="${sessionDtos}" varStatus="status">
 		
 			jQuery("#group${sessionDto.sessionId}").jqGrid({
@@ -45,23 +49,30 @@
 				autowidth: true,
 				shrinkToFit: true,
 				pager: 'pager-${sessionDto.sessionId}',
-				rowList:[10,20,30,40,50,100],
+				rowList:[2,10,20,30,40,50,100],
 				rowNum:10,
 				viewrecords:true,
 			   	/* caption: "${sessionDto.sessionName}", */
 			   	colNames:[
 						'userUid',
+						'userId',
 						"<fmt:message key="label.monitoring.summary.user.name" />",
-					    "<fmt:message key="label.monitoring.summary.total" />"],
+					    "<fmt:message key="label.monitoring.summary.total" />",
+					    'portraitId'],
 			   	colModel:[
 			   		{name:'userUid',index:'userUid', width:0, hidden: true},
-			   		{name:'userName',index:'userName', width:200, searchoptions: { clearSearch: false }},
-			   		{name:'total',index:'total', width:50,align:"right",sorttype:"int", search:false}		
+			   		{name:'userId',index:'userId', width:0, hidden: true},
+			   		{name:'userName',index:'userName', width:200, searchoptions: { clearSearch: false }, formatter:userNameFormatter},
+			   		{name:'total',index:'total', width:50,align:"right",sorttype:"int", search:false}	,
+			   		{name:'portraitId', index:'portraitId', width:0, hidden: true}
 			   	],
 			   	loadError: function(xhr,st,err) {
 			   		jQuery("#group${sessionDto.sessionId}").clearGridData();
-			   		info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="gradebook.error.loaderror"/>", "<fmt:message key="label.ok"/>");
+			   		info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="error.loaderror"/>", "<fmt:message key="label.ok"/>");
 			   	},
+			   	loadComplete: function () {
+			   	 	initializePortraitPopover('<lams:LAMSURL/>');
+			    	},
 			  	onSelectRow: function(rowid) { 
 			  	    if(rowid == null) { 
 			  	    	rowid=0; 
@@ -167,6 +178,10 @@
             });
         };
         setTimeout(function(){ window.dispatchEvent(new Event('resize')); }, 300);
+        
+    		function userNameFormatter (cellvalue, options, rowObject) {
+	    		return definePortraitPopover(rowObject[4], rowObject[0],  rowObject[2]);
+    		}
 	});
 
 </script>
@@ -251,8 +266,6 @@
 	</div>
 	</c:if>
 
-	<jsp:include page="/monitoring/Reflections.jsp" />
-				
 </c:if>
 
 <c:if test="${not empty reflectionsContainerDTO}"> 							
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rf851d4f476f3856ffb55d5004602a57f0dbe02c0
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.java	(.../QaUsrResp.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.java	(.../QaUsrResp.java)	(revision f851d4f476f3856ffb55d5004602a57f0dbe02c0)
@@ -68,6 +68,7 @@
 
     //DTO fields
     private ItemRatingDTO itemRatingDto;
+    private Long portraitId;
 
     /** full constructor */
     public QaUsrResp(Long responseId, String answer, String answerAutosaved, Date attemptTime, String timezone,
@@ -271,4 +272,12 @@
 	this.itemRatingDto = itemRatingDto;
     }
 
+    public Long getPortraitId() {
+	return portraitId;
+    }
+
+    public void setPortraitId(Long portraitId) {
+	this.portraitId = portraitId;
+    }
+
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaUsrRespDAO.java
===================================================================
diff -u -r6668d717bec2c56125019a19b256013f5c05269e -rf851d4f476f3856ffb55d5004602a57f0dbe02c0
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaUsrRespDAO.java	(.../IQaUsrRespDAO.java)	(revision 6668d717bec2c56125019a19b256013f5c05269e)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaUsrRespDAO.java	(.../IQaUsrRespDAO.java)	(revision f851d4f476f3856ffb55d5004602a57f0dbe02c0)
@@ -26,6 +26,7 @@
 import java.util.List;
 
 import org.lamsfoundation.lams.tool.qa.QaUsrResp;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 
 /**
  * @author Ozgur Demirtas
@@ -49,7 +50,8 @@
     List<QaUsrResp> getResponseBySessionAndQuestion(final Long qaSessionId, final Long questionId);
 
     List<QaUsrResp> getResponsesForTablesorter(final Long toolContentId, final Long qaSessionId, final Long questionId,
-	    final Long excludeUserId, boolean isOnlyLeadersIncluded, int page, int size, int sorting, String searchString);
+	    final Long excludeUserId, boolean isOnlyLeadersIncluded, int page, int size, 
+	    int sorting, String searchString, IUserManagementService userManagementService);
 
     int getCountResponsesBySessionAndQuestion(final Long qaSessionId, final Long questionId, final Long excludeUserId,
 	    boolean isOnlyLeadersIncluded, String searchString);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java
===================================================================
diff -u -rd155ca37f59279685d43369e8d0496700ccef527 -rf851d4f476f3856ffb55d5004602a57f0dbe02c0
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java	(.../QaUsrRespDAO.java)	(revision d155ca37f59279685d43369e8d0496700ccef527)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java	(.../QaUsrRespDAO.java)	(revision f851d4f476f3856ffb55d5004602a57f0dbe02c0)
@@ -23,15 +23,18 @@
 
 package org.lamsfoundation.lams.tool.qa.dao.hibernate;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.hibernate.Query;
+import org.hibernate.type.IntegerType;
 import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.qa.QaAppConstants;
 import org.lamsfoundation.lams.tool.qa.QaUsrResp;
 import org.lamsfoundation.lams.tool.qa.dao.IQaUsrRespDAO;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -106,20 +109,21 @@
 	return filteredSearchString;
     }
 
-    private static final String SQL_LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH_AVG_RATING1 = "SELECT resp.*, AVG(rating.rating) avg_rating "
-	    + " FROM tl_laqa11_usr_resp resp" + " JOIN tl_laqa11_que_usr usr"
+    private static final String SQL_LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH_AVG_RATING_SELECT = "SELECT resp.*, AVG(rating.rating) avg_rating ";
+    private static final String SQL_LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH_AVG_RATING_FROM = " FROM tl_laqa11_usr_resp resp ";
+    private static final String SQL_LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH_AVG_RATING_JOIN = " JOIN tl_laqa11_que_usr usr"
 	    + " ON resp.answer IS NOT NULL AND resp.qa_que_content_id = :questionId AND resp.que_usr_id = usr.uid "
 	    + " AND usr.que_usr_id!=:excludeUserId " + " JOIN tl_laqa11_session sess "
 	    + " ON usr.qa_session_id = sess.uid AND sess.qa_session_id = :qaSessionId ";
 
-    private static final String SQL_LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH_AVG_RATING2 = " LEFT JOIN ("
+    private static final String SQL_LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH_AVG_RATING_JOIN_RATING = " LEFT JOIN ("
 	    + " 	SELECT rat.item_id, rat.rating FROM lams_rating rat" + "         JOIN lams_rating_criteria crit"
 	    + " 	ON rat.rating_criteria_id = crit.rating_criteria_id AND crit.tool_content_id = :toolContentId"
 	    + " 	) rating" + " ON rating.item_id = resp.response_id" + " GROUP BY response_id" + " ORDER BY ";
 
-    private static final String SQL_LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_COMMENT_COUNT = "SELECT resp.*, COUNT(rating_comment.item_id) count_comment "
-	    + " FROM tl_laqa11_usr_resp resp" 
-	    + " JOIN tl_laqa11_que_usr usr"
+    private static final String SQL_LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_COMMENT_COUNT_SELECT = "SELECT resp.*, COUNT(rating_comment.item_id) count_comment ";
+    private static final String SQL_LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_COMMENT_COUNT_FROM = " FROM tl_laqa11_usr_resp resp ";
+    private static final String SQL_LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_COMMENT_COUNT_JOIN = " JOIN tl_laqa11_que_usr usr"
 	    + " ON resp.answer IS NOT NULL AND resp.qa_que_content_id = :questionId AND resp.que_usr_id = usr.uid "
 	    + " AND usr.que_usr_id!=:excludeUserId " 
 	    + " JOIN tl_laqa11_session sess "
@@ -128,35 +132,42 @@
 	    + " 	SELECT ratcom.item_id FROM lams_rating_comment ratcom JOIN lams_rating_criteria crit"
 	    + " 	ON ratcom.rating_criteria_id = crit.rating_criteria_id AND crit.tool_content_id = :toolContentId"
 	    + " 	) rating_comment " 
-	    + " ON rating_comment.item_id = resp.response_id  GROUP BY response_id ORDER BY count_comment ASC, response_id ASC";
+	    + " ON rating_comment.item_id = resp.response_id ";
+    private static final String SQL_LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_COMMENT_COUNT_ORDER_BY = " GROUP BY response_id ORDER BY count_comment ASC, response_id ASC";
 
     
-    private static final String LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH1 = "from qaUsrResp in class QaUsrResp "
-	    + " WHERE qaUsrResp.answer IS NOT NULL AND qaUsrResp.qaQueUser.qaSession.qaSessionId=:qaSessionId AND qaUsrResp.qaQuestion.uid=:questionId AND qaUsrResp.qaQueUser.queUsrId!=:excludeUserId ";
-    private static final String LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH2 = " AND qaUsrResp.qaQueUser.qaSession.groupLeader.queUsrId=qaUsrResp.qaQueUser.queUsrId ";
-    private static final String LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH3 = " order by ";
+    private static final String LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH_SELECT = "SELECT resp.* ";
+    private static final String LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH_FROM = " FROM tl_laqa11_usr_resp resp ";
+    private static final String LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH_JOIN1 = " JOIN tl_laqa11_que_usr usr"
+	    + " ON resp.answer IS NOT NULL AND resp.qa_que_content_id = :questionId AND resp.que_usr_id = usr.uid "
+	    + " AND usr.que_usr_id!=:excludeUserId " 
+	    + " JOIN tl_laqa11_session sess "
+	    + " ON usr.qa_session_id = sess.uid AND sess.qa_session_id = :qaSessionId ";
+    private static final String LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH_JOIN2 = " AND sess.qa_group_leader_uid = usr.uid ";
+    private static final String LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH_ORDER_BY = " order by ";
 
     @SuppressWarnings("unchecked")
     @Override
     public List<QaUsrResp> getResponsesForTablesorter(final Long toolContentId, final Long qaSessionId,
-	    final Long questionId, final Long excludeUserId, boolean isOnlyLeadersIncluded, int page, int size, int sorting, String searchString) {
+	    final Long questionId, final Long excludeUserId, boolean isOnlyLeadersIncluded, int page, int size, 
+	    int sorting, String searchString, IUserManagementService userManagementService) {
 	String sortingOrder;
 
 	switch (sorting) {
 	    case QaAppConstants.SORT_BY_NO:
-		sortingOrder = "qaUsrResp.attemptTime";
+		sortingOrder = " attempt_time";
 		break;
 	    case QaAppConstants.SORT_BY_ANSWER_ASC:
-		sortingOrder = "answer ASC";
+		sortingOrder = " answer ASC";
 		break;
 	    case QaAppConstants.SORT_BY_ANSWER_DESC:
-		sortingOrder = "answer DESC";
+		sortingOrder = " answer DESC";
 		break;
 	    case QaAppConstants.SORT_BY_USERNAME_ASC:
-		sortingOrder = "qaUsrResp.qaQueUser.fullname ASC";
+		sortingOrder = " usr.fullname ASC";
 		break;
 	    case QaAppConstants.SORT_BY_USERNAME_DESC:
-		sortingOrder = "qaUsrResp.qaQueUser.fullname DESC";
+		sortingOrder = " usr.fullname DESC";
 		break;
 	    case QaAppConstants.SORT_BY_RATING_ASC:
 		sortingOrder = " avg_rating ASC";
@@ -172,46 +183,70 @@
 		sortingOrder = " resp.attempt_time"; // default if we get an unexpected sort order
 	}
 
-	Query query = null;
-
-	// Build the query based on the type of sorting, pasting the username/fullname lookup in the middle of the SQL/HQL if searchString exists
-	// One query is SQL, so uses the user reference "usr", the other uses HQL so it uses "qaUsrResp.qaQueUser" to reference the username/fullname.
+	StringBuilder queryText = null;
+	String[] portraitStrings = userManagementService.getPortraitSQL("usr.que_usr_id");
+	boolean needsToolContentId = false;
+	
 	if (sorting == QaAppConstants.SORT_BY_RATING_ASC || sorting == QaAppConstants.SORT_BY_RATING_DESC) {
 
 	    String filteredSearchString = buildNameSearch(searchString, "usr");
-	    String queryText = SQL_LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH_AVG_RATING1
-		    + (filteredSearchString != null ? filteredSearchString : "")
-		    + SQL_LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH_AVG_RATING2 + sortingOrder;
-
-	    query = getSessionFactory().getCurrentSession().createSQLQuery(queryText).addEntity(QaUsrResp.class)
-		    .setLong("toolContentId", toolContentId.longValue());
+	    queryText = new StringBuilder(SQL_LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH_AVG_RATING_SELECT)
+		    .append(portraitStrings[0])
+		    .append(SQL_LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH_AVG_RATING_FROM)
+		    .append(SQL_LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH_AVG_RATING_JOIN)
+		    .append(filteredSearchString != null ? filteredSearchString : "")
+		    .append(portraitStrings[1])
+		    .append(SQL_LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH_AVG_RATING_JOIN_RATING)
+		    .append(sortingOrder);
+	    needsToolContentId = true;
 	    
 	} else if (sorting == QaAppConstants.SORT_BY_COMMENT_COUNT ) {
 
-	    query = getSessionFactory().getCurrentSession()
-		    .createSQLQuery(SQL_LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_COMMENT_COUNT)
-		    .addEntity(QaUsrResp.class)
-		    .setLong("toolContentId", toolContentId.longValue());
+	    queryText = new StringBuilder(SQL_LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_COMMENT_COUNT_SELECT)
+		    .append(portraitStrings[0])
+		    .append(SQL_LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_COMMENT_COUNT_FROM)
+		    .append(SQL_LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_COMMENT_COUNT_JOIN)
+		    .append(portraitStrings[1])
+		    .append(SQL_LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_COMMENT_COUNT_ORDER_BY);
+	    needsToolContentId = true;
 		    
 	} else {
-	    String filteredSearchString = buildNameSearch(searchString, "qaUsrResp.qaQueUser");
-	    String queryText = LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH1
-		    + (filteredSearchString != null ? filteredSearchString : "")
-		    + (isOnlyLeadersIncluded ? LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH2 : "")
-		    + LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH3 + sortingOrder;
+	    String filteredSearchString = buildNameSearch(searchString, "usr");
+	    queryText = new StringBuilder(LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH_SELECT)
+		    .append(portraitStrings[0])
+		    .append(LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH_FROM)
+		    .append(LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH_JOIN1)
+		    .append(filteredSearchString != null ? filteredSearchString : "")
+		    .append(isOnlyLeadersIncluded ? LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH_JOIN2 : "")
+		    .append(portraitStrings[1])
+		    .append(LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH_ORDER_BY)
+		    .append(sortingOrder);
 
-	    query = getSessionFactory().getCurrentSession().createQuery(queryText);
 	}
 
-	// now set all the common parts of the query and return the value.
-	query.setLong("questionId", questionId.longValue());
-	query.setLong("qaSessionId", qaSessionId.longValue());
-	query.setLong("excludeUserId", excludeUserId.longValue());
+	Query query = getSessionFactory().getCurrentSession()
+		.createSQLQuery(queryText.toString())
+		.addEntity(QaUsrResp.class)
+		.addScalar("portraitId", IntegerType.INSTANCE);
 
-	query.setFirstResult(page * size);
-	query.setMaxResults(size);
+	if ( needsToolContentId ) { 
+	    query.setLong("toolContentId", toolContentId.longValue());
+	}
+	query.setLong("questionId", questionId.longValue())
+		.setLong("qaSessionId", qaSessionId.longValue())
+    		.setLong("excludeUserId", excludeUserId.longValue())
+    		.setFirstResult(page * size)
+    		.setMaxResults(size);
 
-	return query.list();
+	List<Object[]> list = (List<Object[]>) query.list();
+	List<QaUsrResp> respList = new ArrayList<QaUsrResp>(list.size());
+	for ( Object[] row : list ) {
+	    QaUsrResp resp = (QaUsrResp) row[0];
+	    if ( row.length > 1 && row[1] != null)
+		resp.setPortraitId(((Number)row[1]).longValue());
+	    respList.add(resp);
+	}
+	return respList;
     }
 
     @Override
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java
===================================================================
diff -u -r85ef8aca5722a36582117db1e8b988e2c16b6369 -rf851d4f476f3856ffb55d5004602a57f0dbe02c0
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java	(.../QaService.java)	(revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java	(.../QaService.java)	(revision f851d4f476f3856ffb55d5004602a57f0dbe02c0)
@@ -298,7 +298,7 @@
 	    final Long questionId, final Long excludeUserId, boolean isOnlyLeadersIncluded, int page, int size,
 	    int sorting, String searchString) {
 	return qaUsrRespDAO.getResponsesForTablesorter(toolContentId, qaSessionId, questionId, excludeUserId,
-		isOnlyLeadersIncluded, page, size, sorting, searchString);
+		isOnlyLeadersIncluded, page, size, sorting, searchString, userManagementService);
     }
 
     @Override
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningAction.java
===================================================================
diff -u -rd155ca37f59279685d43369e8d0496700ccef527 -rf851d4f476f3856ffb55d5004602a57f0dbe02c0
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningAction.java	(.../QaLearningAction.java)	(revision d155ca37f59279685d43369e8d0496700ccef527)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningAction.java	(.../QaLearningAction.java)	(revision f851d4f476f3856ffb55d5004602a57f0dbe02c0)
@@ -1114,6 +1114,8 @@
 	    responseRow.put("answer", response.getAnswer());
 	    responseRow.put("userName", StringEscapeUtils.escapeCsv(user.getFullname()));
 	    responseRow.put("visible", new Boolean(response.isVisible()).toString());
+	    responseRow.put("userID", user.getQueUsrId());
+	    responseRow.put("portraitId", response.getPortraitId());
 
 	    // format attemptTime - got straight from server time to other timezones in formatter
 	    // as trying to convert dates runs into tz issues - any Date object created is still
Index: lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -r4583983b64efe1d91fbb47cdde6a759a6a30e859 -rf851d4f476f3856ffb55d5004602a57f0dbe02c0
--- lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
+++ lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision f851d4f476f3856ffb55d5004602a57f0dbe02c0)
@@ -86,6 +86,7 @@
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.timeago.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/timeagoi18n/jquery.timeago.${fn:toLowerCase(localeLanguage)}.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/portrait.js"></script>
 	<script type="text/javascript">
 	
 		var POSTED_BY_LABEL = '<fmt:message key="label.posted.by"><fmt:param>{0}</fmt:param><fmt:param>{1}</fmt:param></fmt:message>';
@@ -125,14 +126,14 @@
 				    		
 							for (i = 0; i < data.rows.length; i++){
 								var userData = data.rows[i];
-								var itemId = userData["responseUid"];
+								var itemId = userData["responseUid"],
+									fullName = userData["userName"];
 								
 								rows += '<tr>';
 								rows += '<td>';
 								
 									rows += '<div>';
-									rows += 	'<span class="field-name">';
-									rows += 		userData["userName"];
+									rows += 	definePortraitPopover(userData["portraitId"], userData["userID"], fullName, fullName) 
 									rows += 	'</span> ';
 									rows += 	'(<time class="timeago" title="';
 									rows += 	userData["attemptTime"]
@@ -223,6 +224,7 @@
 				.bind('pagerInitialized pagerComplete', function(event, options){
 					$("time.timeago").timeago();
 					initializeJRating();
+					initializePortraitPopover('${lams}');
 				})
 			});