Index: lams_tool_bbb/web/WEB-INF/tags/Page.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.8 -r1.1.2.9
--- lams_tool_bbb/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:11:31 -0000	1.1.2.8
+++ lams_tool_bbb/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:43:59 -0000	1.1.2.9
@@ -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_tool_imscc/web/WEB-INF/tags/Page.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.7 -r1.1.2.8
--- lams_tool_imscc/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:13:39 -0000	1.1.2.7
+++ lams_tool_imscc/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:44:02 -0000	1.1.2.8
@@ -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_tool_kaltura/web/WEB-INF/tags/Page.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.7 -r1.1.2.8
--- lams_tool_kaltura/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:13:43 -0000	1.1.2.7
+++ lams_tool_kaltura/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:44:02 -0000	1.1.2.8
@@ -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_tool_preview/web/WEB-INF/tags/Page.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.7 -r1.1.2.8
--- lams_tool_preview/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:13:41 -0000	1.1.2.7
+++ lams_tool_preview/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:44:04 -0000	1.1.2.8
@@ -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_tool_sbmt/web/WEB-INF/tags/Page.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.8 -r1.1.2.9
--- lams_tool_sbmt/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:14:45 -0000	1.1.2.8
+++ lams_tool_sbmt/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:42:51 -0000	1.1.2.9
@@ -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_tool_spreadsheet/web/WEB-INF/tags/Page.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.8 -r1.1.2.9
--- lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:14:44 -0000	1.1.2.8
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:42:53 -0000	1.1.2.9
@@ -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_tool_survey/web/WEB-INF/tags/Page.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.8 -r1.1.2.9
--- lams_tool_survey/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:14:42 -0000	1.1.2.8
+++ lams_tool_survey/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:42:50 -0000	1.1.2.9
@@ -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_tool_task/web/WEB-INF/tags/Page.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.8 -r1.1.2.9
--- lams_tool_task/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:14:43 -0000	1.1.2.8
+++ lams_tool_task/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:42:52 -0000	1.1.2.9
@@ -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_tool_vote/web/WEB-INF/tags/Page.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.8 -r1.1.2.9
--- lams_tool_vote/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:15:12 -0000	1.1.2.8
+++ lams_tool_vote/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:43:08 -0000	1.1.2.9
@@ -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_tool_wiki/web/WEB-INF/tags/Page.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.8 -r1.1.2.9
--- lams_tool_wiki/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:15:13 -0000	1.1.2.8
+++ lams_tool_wiki/web/WEB-INF/tags/Page.tag	5 Aug 2016 01:43:24 -0000	1.1.2.9
@@ -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>