Index: lams_admin/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6 -rc827366cd835ca1cc10cbaca5c0afb0ff66eb2ac
--- lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
+++ lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c827366cd835ca1cc10cbaca5c0afb0ff66eb2ac)
@@ -58,21 +58,26 @@
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolSessionId" value="${param.toolSessionId}" />
 			</c:if>
-			<c:if test="${empty toolSessionID}">
+			<c:if test="${empty toolSessionId}">
 				<c:set var="toolSessionId" value="${param.toolSessionID}" />
 			</c:if>
+ 			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+ 				<c:if test="${not empty sessionMapID}">
+					<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+					<c:if test="${empty toolSessionId}">
+						<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionId}" />
+					</c:if>
+				</c:if>
+			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 				<c:if test="${not empty toolForm}"> 
 				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
 				</c:if>
 			</c:if>
- 			<c:if test="${empty toolSessionId}">
-				<c:if test="${empty sessionMapID}">
-					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
-				</c:if>
-				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
-			</c:if>
 		</c:if>
 		
 		<script type="text/javascript">
@@ -206,12 +211,12 @@
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
 							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
-							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+							<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-recycle"></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-wrench"></i></a>
+							<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>
Index: lams_central/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6 -rc827366cd835ca1cc10cbaca5c0afb0ff66eb2ac
--- lams_central/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
+++ lams_central/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c827366cd835ca1cc10cbaca5c0afb0ff66eb2ac)
@@ -58,21 +58,26 @@
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolSessionId" value="${param.toolSessionId}" />
 			</c:if>
-			<c:if test="${empty toolSessionID}">
+			<c:if test="${empty toolSessionId}">
 				<c:set var="toolSessionId" value="${param.toolSessionID}" />
 			</c:if>
+ 			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+ 				<c:if test="${not empty sessionMapID}">
+					<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+					<c:if test="${empty toolSessionId}">
+						<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionId}" />
+					</c:if>
+				</c:if>
+			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 				<c:if test="${not empty toolForm}"> 
 				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
 				</c:if>
 			</c:if>
- 			<c:if test="${empty toolSessionId}">
-				<c:if test="${empty sessionMapID}">
-					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
-				</c:if>
-				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
-			</c:if>
 		</c:if>
 		
 		<script type="text/javascript">
@@ -206,12 +211,12 @@
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
 							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
-							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+							<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-recycle"></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-wrench"></i></a>
+							<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>
Index: lams_central/web/css/defaultHTML_learner.css
===================================================================
diff -u -r0ddeb3a1dcf29cbbba6ed0fccbd139f9c31c347f -rc827366cd835ca1cc10cbaca5c0afb0ff66eb2ac
--- lams_central/web/css/defaultHTML_learner.css	(.../defaultHTML_learner.css)	(revision 0ddeb3a1dcf29cbbba6ed0fccbd139f9c31c347f)
+++ lams_central/web/css/defaultHTML_learner.css	(.../defaultHTML_learner.css)	(revision c827366cd835ca1cc10cbaca5c0afb0ff66eb2ac)
@@ -411,6 +411,8 @@
 	/*give sidebar 100% width;*/
 	nav.sidebar li {
 		width: 100%;
+		margin-top: 3px;
+		margin-bottom: 3px;
 	}
 
  	/* Move nav to full on mouse over*/
@@ -427,6 +429,9 @@
 		opacity: 0;
 	}
 	
+	nav.sidebar .fa{
+		font-size: 18px;
+	}
 }
 
 /* .....NavBar: Fully showing nav bar..... */
Index: lams_learning/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6 -rc827366cd835ca1cc10cbaca5c0afb0ff66eb2ac
--- lams_learning/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
+++ lams_learning/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c827366cd835ca1cc10cbaca5c0afb0ff66eb2ac)
@@ -58,21 +58,26 @@
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolSessionId" value="${param.toolSessionId}" />
 			</c:if>
-			<c:if test="${empty toolSessionID}">
+			<c:if test="${empty toolSessionId}">
 				<c:set var="toolSessionId" value="${param.toolSessionID}" />
 			</c:if>
+ 			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+ 				<c:if test="${not empty sessionMapID}">
+					<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+					<c:if test="${empty toolSessionId}">
+						<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionId}" />
+					</c:if>
+				</c:if>
+			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 				<c:if test="${not empty toolForm}"> 
 				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
 				</c:if>
 			</c:if>
- 			<c:if test="${empty toolSessionId}">
-				<c:if test="${empty sessionMapID}">
-					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
-				</c:if>
-				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
-			</c:if>
 		</c:if>
 		
 		<script type="text/javascript">
@@ -206,12 +211,12 @@
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
 							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
-							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+							<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-recycle"></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-wrench"></i></a>
+							<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>
Index: lams_monitoring/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6 -rc827366cd835ca1cc10cbaca5c0afb0ff66eb2ac
--- lams_monitoring/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
+++ lams_monitoring/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c827366cd835ca1cc10cbaca5c0afb0ff66eb2ac)
@@ -58,21 +58,26 @@
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolSessionId" value="${param.toolSessionId}" />
 			</c:if>
-			<c:if test="${empty toolSessionID}">
+			<c:if test="${empty toolSessionId}">
 				<c:set var="toolSessionId" value="${param.toolSessionID}" />
 			</c:if>
+ 			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+ 				<c:if test="${not empty sessionMapID}">
+					<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+					<c:if test="${empty toolSessionId}">
+						<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionId}" />
+					</c:if>
+				</c:if>
+			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 				<c:if test="${not empty toolForm}"> 
 				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
 				</c:if>
 			</c:if>
- 			<c:if test="${empty toolSessionId}">
-				<c:if test="${empty sessionMapID}">
-					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
-				</c:if>
-				<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
-			</c:if>
 		</c:if>
 		
 		<script type="text/javascript">
@@ -206,12 +211,12 @@
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu()">
 							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
-							<p class="lessonName"><%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%></p></a></li>
+							<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-recycle"></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-wrench"></i></a>
+							<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>