Index: lams_admin/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_central/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_central/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_central/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_central/web/css/_learner_base.scss
===================================================================
diff -u -ra9f62e22a4fe8d5adcf84322fbd833c217028fde -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_central/web/css/_learner_base.scss	(.../_learner_base.scss)	(revision a9f62e22a4fe8d5adcf84322fbd833c217028fde)
+++ lams_central/web/css/_learner_base.scss	(.../_learner_base.scss)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -611,11 +611,6 @@
 	nav.sidebar.slidesidemenu{
 		padding:10px 10px 10px 12px;
 	}
-	/*Hide text when compressed*/
-	nav.sidebar p{
-		padding-right: 35px;
-		text-align: center;
-	}
  
 	/* colour in top box to match panel heading */
 	nav.sidebar .navbar-nav > li:first-child{
@@ -645,7 +640,7 @@
 		height: 100%;
 		margin-left: -135px;
 		float: left;
-		z-index: 8000;
+		z-index: 1000;
 		margin-top: 0px;
 		margin-bottom: 0px;
 	}
@@ -677,6 +672,33 @@
 	
 }
 
+/*alter portrait for displaying it in collapsed pregress bar*/
+@media (min-width: 768px) and (max-width: 1329px) {
+	
+	nav.sidebar:not(.expandmenu) #navbar-portrait {
+		float: right;
+    		padding: 5px 0 0;
+	}
+
+	nav.sidebar:not(.expandmenu) #navbar-portrait img{
+		border: 4px solid whitesmoke;
+	}
+
+	nav.sidebar:not(.expandmenu) .portrait-generic-sm::before{
+		font-size: 30px;
+		margin-right: 3px;
+	}
+
+	nav.sidebar:not(.expandmenu) p{
+		padding-right: 35px;
+	}
+}
+
+/*in case when portrait is not shown in a progress bar - give extra space to hamburger button*/
+nav.sidebar p.no-portrait{
+	padding-right: 35px;
+}
+
 /* .....NavBar: Fully showing nav bar..... */
 
 @media (min-width: 1330px) {
@@ -700,6 +722,11 @@
 	}
 }
 
+/* center portrait */
+nav.sidebar .navbar-nav > li:first-child{
+	text-align: center;
+}
+
 nav.sidebar .navbar-nav .open .dropdown-menu>li>a:hover, nav.sidebar .navbar-nav .open .dropdown-menu>li>a:focus {
 	background-color: transparent;
 }
Index: lams_central/web/includes/javascript/dialog.js
===================================================================
diff -u -r2e1ec8cd3d8ecc11a9c98a7f8deb9f5f468ac525 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_central/web/includes/javascript/dialog.js	(.../dialog.js)	(revision 2e1ec8cd3d8ecc11a9c98a7f8deb9f5f468ac525)
+++ lams_central/web/includes/javascript/dialog.js	(.../dialog.js)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -389,3 +389,28 @@
 		}
 	}, true);
 }
+
+
+//used by Page.tag
+function showMyPortraitDialog() {
+	showDialog("dialogMyProfile", {
+		'title' : "Portrait",
+		'modal' : true,
+		'width' : Math.max(380, Math.min(770, $(window).width() - 60)),
+		'open' : function() {
+			var dialog = $(this);
+			// load contents after opening the dialog
+			$('iframe', dialog).attr('src', LAMS_URL + 'index.do?method=portrait&isReturnButtonHidden=true');
+			
+			// in case of mobile devices allow iframe scrolling
+			if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) ) {
+			    setTimeout(function() {
+			    	dialog.css({
+			    		'overflow-y' : 'scroll',
+			    		'-webkit-overflow-scrolling' : 'touch'
+			    	});
+			    },500);
+			}
+		}
+	});
+}
Index: lams_central/web/portrait.jsp
===================================================================
diff -u -rba7ef9fb0209892892930cb3583066b70880b08b -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_central/web/portrait.jsp	(.../portrait.jsp)	(revision ba7ef9fb0209892892930cb3583066b70880b08b)
+++ lams_central/web/portrait.jsp	(.../portrait.jsp)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -218,12 +218,14 @@
 			    </div>
 			</div>
 		</div>
-		
-		<div align="right">
-			<a class="btn btn-sm btn-file btn-default offset5" role="button" href="<c:url value='/index.do'/>?method=profile">
-				<fmt:message key="label.return.to.myprofile" />
-			</a>
-		</div>
+
+		<c:if test="${!param.isReturnButtonHidden}">
+			<div align="right">
+				<a class="btn btn-sm btn-file btn-default offset5" role="button" href="<c:url value='/index.do'/>?method=profile">
+					<fmt:message key="label.return.to.myprofile" />
+				</a>
+			</div>
+		</c:if>
 	</div>
 	</div>
 	</div>	
Index: lams_gradebook/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_gradebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_gradebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_learning/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_learning/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_learning/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_monitoring/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_monitoring/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_monitoring/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_tool_assessment/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_tool_bbb/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_tool_bbb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_bbb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_tool_chat/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_tool_chat/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_chat/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_tool_daco/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_tool_forum/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_tool_gmap/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_tool_gmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_gmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_tool_images/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_tool_images/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_images/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_tool_imscc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_tool_imscc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_imscc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_tool_kaltura/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_tool_kaltura/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_kaltura/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_tool_lamc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_tool_laqa/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_tool_larsrc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_tool_leader/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_tool_leader/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_leader/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_tool_mindmap/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_tool_mindmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_mindmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,53 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_tool_nb/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_tool_notebook/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_tool_pixlr/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_tool_sbmt/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_tool_scratchie/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_tool_scribe/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_tool_survey/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_tool_survey/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_survey/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_tool_task/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_tool_vote/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_tool_wiki/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>
Index: lams_www/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r9854a395461bf77e72934605a08a95b73ce8e12b
--- lams_www/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_www/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
@@ -11,9 +11,13 @@
 <%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+
 <c:if test="${empty usePanel}">				
 	<c:set var="usePanel">true</c:set>
 </c:if>
+<c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
 
 <c:choose>
 
@@ -22,7 +26,7 @@
 		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
-		<jsp:doBody />
+			<jsp:doBody />
 		</div>
 		</div>
 		</div>
@@ -47,6 +51,8 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -282,21 +288,52 @@
 					</button>
 					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
 				</div>
+				
 				<!-- Collect the nav links, forms, and other content for toggling -->
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
-						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars"></i>
-							<p class="lessonName"></p></a></li>
-						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
-						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
-						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-fast-backward "></i></a></li>
-						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+						<li>
+							<c:if test="${displayPortrait}">
+								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
+									<c:set var="userId"><lams:user property="userID" /></c:set>
+									<lams:Portrait userId="${userId}"/>	
+								</a>
+							</c:if>
+					
+							<a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<c:if test="${!displayPortrait}">
+									<i class="pull-right fa fa-bars"></i>
+								</c:if>
+								
+								<p class="lessonName <c:if test='${!displayPortrait}'>no-portrait</c:if>"></p>
+							</a>
+						</li>
+						<li>
+							<a href="#" onClick="javascript:viewNotebookEntries(); return false;" >
+								<span id="notebooklabel">Notebook</span>
+								<i class="pull-right fa fa-book"></i>
+							</a>
+						</li>
+						<li id="restartitem" style="display:none">
+							<a href="#" onClick="javascript:restartLesson()">
+								<span id="restartlabel">Restart</span>
+								<i class="pull-right fa fa-fast-backward "></i>
+							</a>
+						</li>
+						<li id="supportitem" style="display:none">
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="supportlabel">Support Activities</span>
+								<i class="pull-right fa fa-th-large"></i>
+							</a>
 							<div id="supportPart" class="progressBarContainer"></div>
-						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
-							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+						</li>
+						<li>
+							<a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+								<span id="progresslabel">My Progress</span>
+								<i class="pull-right fa fa-map"></i>
+							</a>
+							<div id="progressBarDiv" class="progressBarContainer"></div>
+						</li>
 					</ul>
 				</div>
 			</div>