Index: lams_central/web/css/_learner_base.scss
===================================================================
diff -u -refa51a5d0464d96fada4e5a70f1fb86c2d726717 -rb3c871874679a1d784db0d7dfac2fdabe65baf83
--- lams_central/web/css/_learner_base.scss	(.../_learner_base.scss)	(revision efa51a5d0464d96fada4e5a70f1fb86c2d726717)
+++ lams_central/web/css/_learner_base.scss	(.../_learner_base.scss)	(revision b3c871874679a1d784db0d7dfac2fdabe65baf83)
@@ -1030,6 +1030,7 @@
 // lineheight setting to use on the name if it is next to portrait, as generated by the Portrait tag. e.g. in Peer Review
 .portrait-sm-lineheight {
 	line-height: 32px;
+	vertical-align: top;
 }
 
 .portrait-generic-sm {
Index: lams_central/web/css/orgGroup.scss
===================================================================
diff -u -r4583983b64efe1d91fbb47cdde6a759a6a30e859 -rb3c871874679a1d784db0d7dfac2fdabe65baf83
--- lams_central/web/css/orgGroup.scss	(.../orgGroup.scss)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
+++ lams_central/web/css/orgGroup.scss	(.../orgGroup.scss)	(revision b3c871874679a1d784db0d7dfac2fdabe65baf83)
@@ -36,7 +36,7 @@
 }
 
 td#unassignedUserCell {
-	width: 200px;
+	width: 240px;
 	border-right: $border-thin-dotted;
 }
 
@@ -56,7 +56,7 @@
 
 .groupContainer {
 	float: left;
-	width: 180px;
+	width: 200px;
 	height: 150px;
 	margin: 0 10px 10px 0;
 	padding: 5px;
Index: lams_central/web/emailuser.jsp
===================================================================
diff -u -r7e0024fe200c2db9360cbcc7e572e00888e05ad4 -rb3c871874679a1d784db0d7dfac2fdabe65baf83
--- lams_central/web/emailuser.jsp	(.../emailuser.jsp)	(revision 7e0024fe200c2db9360cbcc7e572e00888e05ad4)
+++ lams_central/web/emailuser.jsp	(.../emailuser.jsp)	(revision b3c871874679a1d784db0d7dfac2fdabe65baf83)
@@ -108,6 +108,7 @@
 					<input type="hidden" name="ccEmail" id="cc-email-hidden-input"
 						value="" /> <span><label><fmt:message
 								key="email.to" />:</label> <c:if test="${not empty user}">
+							<lams:Portrait userId="${user.userId}"/> 
 							<c:out value="${user.firstName} ${user.lastName}" /> &lt;<c:out
 								value="${user.email}" />&gt;
 							 </c:if> </span>
Index: lams_central/web/includes/javascript/orgGroup.js
===================================================================
diff -u -r4583983b64efe1d91fbb47cdde6a759a6a30e859 -rb3c871874679a1d784db0d7dfac2fdabe65baf83
--- lams_central/web/includes/javascript/orgGroup.js	(.../orgGroup.js)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
+++ lams_central/web/includes/javascript/orgGroup.js	(.../orgGroup.js)	(revision b3c871874679a1d784db0d7dfac2fdabe65baf83)
@@ -107,10 +107,17 @@
 		// create user DIVs
 		$.each(users, function(index, userJSON) {
 			var userDiv = $('<div />').attr('userId', userJSON.id)
-				.addClass('draggableItem')
-	    		.text(userJSON.firstName + ' ' + userJSON.lastName 
-	    				  + ' (' + userJSON.login + ')'
-	    			   );
+				.addClass('draggableItem');
+			var portraitDiv = $('<div />').attr({
+				'id': 'portrait-'+userJSON.id,
+				})
+				.addClass('roffset5')
+				.appendTo(userDiv);
+			addPortrait(portraitDiv, userJSON.portraitId, userJSON.id, 'small', true, LAMS_URL );
+			$('<span/>').text(userJSON.firstName + ' ' + userJSON.lastName + ' (' + userJSON.login + ')')
+				.addClass('portrait-sm-lineheight')
+				.appendTo(userDiv);
+
 			// for later use
 			userDivs.push(userDiv);
 			userIds.push(userJSON.id);
Index: lams_central/web/orgGroup.jsp
===================================================================
diff -u -radca50220a7d8b2e43c166ff51dd7e2d22e720e8 -rb3c871874679a1d784db0d7dfac2fdabe65baf83
--- lams_central/web/orgGroup.jsp	(.../orgGroup.jsp)	(revision adca50220a7d8b2e43c166ff51dd7e2d22e720e8)
+++ lams_central/web/orgGroup.jsp	(.../orgGroup.jsp)	(revision b3c871874679a1d784db0d7dfac2fdabe65baf83)
@@ -17,6 +17,7 @@
 	<script type="text/javascript" src="includes/javascript/bootstrap.min.js"></script>
 	<script type="text/javascript" src="includes/javascript/dialog.js"></script>
 	<script type="text/javascript" src="includes/javascript/orgGroup.js"></script>
+	<script type="text/javascript" src="includes/javascript/portrait.js"></script>
 	<script type="text/javascript">;
 		var grouping = ${grouping},
 			organisationId = grouping.organisationId,
Index: lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java
===================================================================
diff -u -r23b5b0a587e3c4dc659729270eb0d608fb4dd982 -rb3c871874679a1d784db0d7dfac2fdabe65baf83
--- lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java	(.../WebUtil.java)	(revision 23b5b0a587e3c4dc659729270eb0d608fb4dd982)
+++ lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java	(.../WebUtil.java)	(revision b3c871874679a1d784db0d7dfac2fdabe65baf83)
@@ -559,6 +559,7 @@
 	userJSON.put("firstName", user.getFirstName());
 	userJSON.put("lastName", user.getLastName());
 	userJSON.put("login", user.getLogin());
+	userJSON.put("portraitId",  user.getPortraitUuid());
 	return userJSON;
     }
 
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java
===================================================================
diff -u -rf0e43a945b290c73971b75babd77d0b4a2fac1d5 -rb3c871874679a1d784db0d7dfac2fdabe65baf83
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java	(.../NotebookAction.java)	(revision f0e43a945b290c73971b75babd77d0b4a2fac1d5)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java	(.../NotebookAction.java)	(revision b3c871874679a1d784db0d7dfac2fdabe65baf83)
@@ -105,42 +105,52 @@
     public ActionForward viewAllJournals(ActionMapping mapping, ActionForm actionForm, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException, ServletException {
 
-	// List of Journal entries
-	List<NotebookEntry> journals = null;
 
 	DynaActionForm notebookForm = (DynaActionForm) actionForm;
 
-	// lesson service
-	ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
-
 	// getting requested object according to coming parameters
 	Integer userID = LearningWebUtil.getUserId();
-
-	// lessonID
-	Long lessonID = (Long) notebookForm.get(AttributeNames.PARAM_LESSON_ID);
-	Lesson lesson = learnerService.getLesson(lessonID);
-
-	// check user has permission
 	User user = (User) LearnerServiceProxy.getUserManagementService(getServlet().getServletContext())
 		.findById(User.class, userID);
-
-	if ((lesson.getUser() != null) && lesson.getUser().getUserId().equals(userID)) {
-	    journals = getJournals(lesson.getLessonId());
-	}
-
-	if ((lesson == null) || (lesson.getLessonClass() == null) || !lesson.getLessonClass().isStaffMember(user)) {
+	
+	// lesson service
+	ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
+	Long lessonID = (Long) notebookForm.get(AttributeNames.PARAM_LESSON_ID);
+	Lesson lesson = learnerService.getLesson(lessonID);
+	
+	if ( ! hasStaffAccessToJournals(user, lesson) ) {
 	    throw new UserAccessDeniedException(
-		    "User " + userID + " may not retrieve journal entries for lesson " + lesson.getLessonId());
-	} else if (journals == null) {
-	    journals = getJournals(lesson.getLessonId());
+		    "User " + userID + " may not retrieve journal entries for lesson " + lessonID);
 	}
 
+	// List of Journal entries
+	List<NotebookEntry> journals = getJournals(lesson.getLessonId());
 	request.getSession().setAttribute("journals", journals);
 	request.setAttribute(AttributeNames.PARAM_LESSON_ID, lessonID);
 
 	return mapping.findForward(NotebookAction.VIEW_JOURNALS);
     }
 
+    // check user has permission to access all the journals for a lesson
+    private boolean hasStaffAccessToJournals(User user, Lesson lesson) {
+	
+	if (lesson == null) {
+	    return false;
+	}
+
+	// lesson owner okay
+	if ((lesson.getUser() != null) && lesson.getUser().getUserId().equals(user.getUserId())) {
+	    return true;
+	}
+
+	// staff member okay
+	if ((lesson.getLessonClass() != null) && lesson.getLessonClass().isStaffMember(user)) {
+	    return true;
+	} 
+	
+	return false;
+    }
+    
     /**
      *
      * @param lessonID
@@ -175,6 +185,21 @@
 
 	NotebookEntry entry = notebookService.getEntry(uid);
 
+	// getting requested object according to coming parameters
+	Integer userID = LearningWebUtil.getUserId();
+	User user = (User) LearnerServiceProxy.getUserManagementService(getServlet().getServletContext())
+		.findById(User.class, userID);
+
+	if ( entry.getUser() != null && ! entry.getUser().getUserId().equals(user.getUserId()) ) {
+	    // wants to look at someone else's entry - check they are a teacher
+	    ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
+	    Lesson lesson = learnerService.getLesson(currentLessonID);
+	    if ( ! hasStaffAccessToJournals(user, lesson) ) {
+		throw new UserAccessDeniedException(
+		    "User " + userID + " may not retrieve journal entries for lesson " + currentLessonID);
+	    }
+	}
+
 	if (mode != null) {
 	    request.setAttribute("mode", mode);
 	}
Index: lams_learning/web/notebook/view.jsp
===================================================================
diff -u -rf0e43a945b290c73971b75babd77d0b4a2fac1d5 -rb3c871874679a1d784db0d7dfac2fdabe65baf83
--- lams_learning/web/notebook/view.jsp	(.../view.jsp)	(revision f0e43a945b290c73971b75babd77d0b4a2fac1d5)
+++ lams_learning/web/notebook/view.jsp	(.../view.jsp)	(revision b3c871874679a1d784db0d7dfac2fdabe65baf83)
@@ -117,7 +117,7 @@
 							<i>
 								<fmt:message key="mynotes.entry.submitted.by">
 									<fmt:param>
-										<c:out value="${entry.user.fullName}" escapeXml="false" />
+										<lams:Portrait userId="${entry.user.userId}"/><c:out value="${entry.user.fullName}" escapeXml="false" />
 									</fmt:param>
 								</fmt:message>
 							</i>
@@ -148,9 +148,18 @@
 									<fmt:message key="label.edit.button" />
 								</a>
 							</c:if>
-							<c:set var="viewAll">
-								<html:rewrite page="/notebook.do?method=viewAll&currentLessonID=${param.currentLessonID}" />
-							</c:set>
+							<c:choose>
+								<c:when test="${mode == 'teacher'}">
+									<c:set var="viewAll">
+										<html:rewrite page="/notebook.do?method=viewAllJournals&lessonID=${param.currentLessonID}" />
+									</c:set>
+								</c:when>
+								<c:otherwise>
+									<c:set var="viewAll">
+										<html:rewrite page="/notebook.do?method=viewAll&currentLessonID=${param.currentLessonID}" />
+									</c:set>
+								</c:otherwise>
+							</c:choose>
 							<a href="${viewAll}" class="btn btn-default" id="viewAllBtn">
 								<fmt:message key="mynotes.view.all.button" />
 							</a>
Index: lams_learning/web/notebook/viewalljournals.jsp
===================================================================
diff -u -r0ddeb3a1dcf29cbbba6ed0fccbd139f9c31c347f -rb3c871874679a1d784db0d7dfac2fdabe65baf83
--- lams_learning/web/notebook/viewalljournals.jsp	(.../viewalljournals.jsp)	(revision 0ddeb3a1dcf29cbbba6ed0fccbd139f9c31c347f)
+++ lams_learning/web/notebook/viewalljournals.jsp	(.../viewalljournals.jsp)	(revision b3c871874679a1d784db0d7dfac2fdabe65baf83)
@@ -41,9 +41,7 @@
 			<!-- set user check flag -->
 			<c:if test="${status.first}">
 				<c:set var="userToCheck" value="${entry.user.userId}" />
-				<h2>
-					<c:out value="${entry.user.fullName}" escapeXml="false" />
-				</h2>
+				<h4><lams:Portrait userId="${entry.user.userId}"/><c:out value="${entry.user.fullName}" escapeXml="false" /></h4>
 				<tr>
 					<th scope="col" width="30%" colspan="2"><fmt:message key="mynotes.entry.title.label" /></th>
 					<th scope="col" width="25%" align="center"><fmt:message key="mynotes.entry.create.date.label" /></th>
@@ -56,9 +54,7 @@
 	</table>
 
 	<c:set var="userToCheck" value="${entry.user.userId}" />
-	<h2>
-		<c:out value="${entry.user.fullName}" escapeXml="false" />
-	</h2>
+	<h4><lams:Portrait userId="${entry.user.userId}"/><c:out value="${entry.user.fullName}" escapeXml="false" /></h4>
 	<table class="alternative-color" cellspacing="0">
 		<tr>
 			<th scope="col" width="30%" colspan="2"><fmt:message key="mynotes.entry.title.label" /></th>
@@ -68,9 +64,9 @@
 		</c:if>
 
 		<tr>
-			<td class="align-left" width="28%"><c:set var="viewnote">
-					<html:rewrite page="/notebook.do?method=viewEntry&mode=teacher&uid=" />
-					<c:out value="${entry.uid}" />
+			<td class="align-left" width="28%">
+				<c:set var="viewnote">
+					<html:rewrite page="/notebook.do?method=viewEntry&mode=teacher&uid=${entry.uid}&currentLessonID=${lessonID}" />
 				</c:set> <html:link href="${viewnote}">
 					<c:choose>
 						<c:when test="${empty entry.title}">
Index: lams_monitoring/web/css/_monitorLesson_base.scss
===================================================================
diff -u -r4583983b64efe1d91fbb47cdde6a759a6a30e859 -rb3c871874679a1d784db0d7dfac2fdabe65baf83
--- lams_monitoring/web/css/_monitorLesson_base.scss	(.../_monitorLesson_base.scss)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
+++ lams_monitoring/web/css/_monitorLesson_base.scss	(.../_monitorLesson_base.scss)	(revision b3c871874679a1d784db0d7dfac2fdabe65baf83)
@@ -372,22 +372,9 @@
 }
 
 td.progressBarLabel {
-	padding: 0;
-	background-color: $brand-primary-light;
+	line-height: 1 !important;
 }
 
-td.progressBarLabel div {
-	float: left;
-	padding: 10px 0 4px 20px;
-	font-weight: bold;
-}
-
-td.progressBarLabel a {
-	float: right;
-	margin: 6px 5px 4px 0;
-}
-
-
 /********** BOOTSTRAP ADDITIONS **********/
 
 .contributeActivityCell {
Index: lams_monitoring/web/grouping/viewGroups.jsp
===================================================================
diff -u -r51f0b0d75529c154910d175aad7d0f26acdf0597 -rb3c871874679a1d784db0d7dfac2fdabe65baf83
--- lams_monitoring/web/grouping/viewGroups.jsp	(.../viewGroups.jsp)	(revision 51f0b0d75529c154910d175aad7d0f26acdf0597)
+++ lams_monitoring/web/grouping/viewGroups.jsp	(.../viewGroups.jsp)	(revision b3c871874679a1d784db0d7dfac2fdabe65baf83)
@@ -30,6 +30,7 @@
 		padding: 2px;
 	}
 </style>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 <lams:Page type="learner" title="${title}">
 	<div class="table-responsive">
 		<table class="table table-condensed table-hover" cellspacing="0">
@@ -38,7 +39,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">
-								<i name="ui-${user.userId}" class="fa fa-xs fa-user"></i>&nbsp;<c:out value="${user.firstName}" />&nbsp<c:out value="${user.lastName}" />
+								<lams:Portrait userId="${user.userId}"/><c:out value="${user.firstName}" />&nbsp<c:out value="${user.lastName}" />
 							</div>
 						</c:forEach>
 					</td>
Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
diff -u -r671ef30a2629446df0eb07e9ef16c3193f534976 -rb3c871874679a1d784db0d7dfac2fdabe65baf83
--- lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision 671ef30a2629446df0eb07e9ef16c3193f534976)
+++ lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision b3c871874679a1d784db0d7dfac2fdabe65baf83)
@@ -760,8 +760,8 @@
     // initialise lesson dialog
 	var learnerGroupDialog = showDialog('learnerGroupDialog',{
 			'autoOpen'  : false,
-			'width'     : 400,
-			'height'	: 430,
+			'width'     : 450,
+			'height'	: 450,
 			'resizable' : true,
 			'open'      : function(){
 				autoRefreshBlocked = true;
@@ -1868,6 +1868,7 @@
  * Load the give page of learners' progress.
  */
 function loadLearnerProgressPage(pageNumber, learnersSearchPhrase){
+
 	// prevent double refresh at the same time
 	if (learnersRefreshInProgress) {
 		return;
@@ -1877,7 +1878,7 @@
 	if (!learnerProgressCellsTemplate) {
 		// fill the placeholder, after all required variables were initialised
 		learnerProgressCellsTemplate =
-		  '<tr><td class="active" id="progressBarLabel;00;"><strong>;11;</strong>';
+		  '<tr><td class="active progressBarLabel" id="progressBarLabel;00;"><div id="portrait-;00;" class="roffset5"/><span class="portrait-sm-lineheight" style="font-weight: bold">;11;</span>';
 
 		learnerProgressCellsTemplate +=
 			'<a class="btn btn-xs btn-default pull-right tour-email-button" href="#" onClick="javascript:showEmailDialog(;00;)"><i class="fa fa-envelope-o"></i> '
@@ -1927,6 +1928,7 @@
 						.replace(/;00;/g, this.id)
 						.replace(/;11;/g, getLearnerDisplayName(this));
 					$(learnerProgressCellsInstance).appendTo('#tabLearnersTable');
+					addPortrait($("#portrait-"+this.id), this.portraitId, this.id, 'small', true, LAMS_URL );
 					
 					// request data to build progress bar SVG
 					fillProgressBar(barId);
@@ -2125,7 +2127,7 @@
 	
 	// hide unnecessary controls
 	togglePagingCells(learnerGroupDialog, pageNumber, maxPageNumber);
-	
+
 	$.each(learners, function(learnerIndex, learner) {
 		var viewUrl = allowView ? LAMS_URL + 'monitoring/monitoring.do?method=getLearnerActivityURL&userID=' 
         				       	  + learner.id + '&activityID=' + ajaxProperties.data.activityID + '&lessonID=' + lessonId
@@ -2135,9 +2137,17 @@
 									'viewUrl'    : viewUrl
 									})
 			                      .addClass('dialogListItem')
-							      .html(getLearnerDisplayName(learner))
-							      .appendTo(learnerGroupList);
-			
+							      .appendTo(learnerGroupList),
+				portraitDiv = $('<div />').attr({
+						'id': 'user-'+learner.id,
+						})
+						.addClass('roffset5')
+						.appendTo(learnerDiv);
+				addPortrait( portraitDiv, learner.portraitId, learner.id, 'small', true, LAMS_URL );
+				$('<span/>').html(getLearnerDisplayName(learner))
+					.addClass('portrait-sm-lineheight')
+					.appendTo(learnerDiv);
+
 		if (allowForceComplete || allowView || allowEmail) {
 			learnerDiv.click(function(event){
 				// select the learner
Index: lams_monitoring/web/monitor.jsp
===================================================================
diff -u -r671ef30a2629446df0eb07e9ef16c3193f534976 -rb3c871874679a1d784db0d7dfac2fdabe65baf83
--- lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 671ef30a2629446df0eb07e9ef16c3193f534976)
+++ lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision b3c871874679a1d784db0d7dfac2fdabe65baf83)
@@ -48,6 +48,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.tabcontroller.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/bootstrap-tour.min.js"></script> 
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/portrait.js"></script>
 
 	
 	<script type="text/javascript">