Index: lams_tool_lamc/conf/language/ApplicationResources.properties
===================================================================
diff -u -r9a9a07e847b719c4f7c333148efaa35e6b4ab516 -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 9a9a07e847b719c4f7c333148efaa35e6b4ab516)
+++ lams_tool_lamc/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -238,5 +238,6 @@
 label.randomize  =Present answers in randomized order
 answers.submitted.none = Submission is not allowed. Please select at least one answer.
 
+message.no.reflection.available = No notebook available
 
 #======= End labels: Exported 230 labels for en AU =====
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
===================================================================
diff -u -re4b2a3cbdfdd26b99ead9b77705faa5a333d326e -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java	(.../IMcService.java)	(revision e4b2a3cbdfdd26b99ead9b77705faa5a333d326e)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java	(.../IMcService.java)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -280,6 +280,7 @@
 	public NotebookEntry getEntry(Long id, Integer idType, String signature,
 			Integer userID);
 	
+	public void updateEntry(NotebookEntry notebookEntry);
 	
     public void persistFile(McContent content, McUploadedFile file) throws McApplicationException;
     
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
diff -u -r027758c2ee944683de01e4cd689fe3244d031920 -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision 027758c2ee944683de01e4cd689fe3244d031920)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -2692,6 +2692,11 @@
 		}
 	}
 
+	
+	public void updateEntry(NotebookEntry notebookEntry) {
+		coreNotebookService.updateEntry(notebookEntry);
+	}
+
     
     /**
      * @return Returns the coreNotebookService.
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
===================================================================
diff -u -r259312ece4305731fc5b29d76b8288bca029d248 -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	(.../McLearningAction.java)	(revision 259312ece4305731fc5b29d76b8288bca029d248)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	(.../McLearningAction.java)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -2029,8 +2029,20 @@
 	    logger.debug("userID:" + userID);
 	    logger.debug("reflectionEntry:" + reflectionEntry);
 	    
-		mcService.createNotebookEntry(new Long(toolSessionID), CoreNotebookConstants.NOTEBOOK_TOOL,
-				MY_SIGNATURE, new Integer(userID), reflectionEntry);
+	    logger.debug("attempt getting notebookEntry: ");
+		NotebookEntry notebookEntry = mcService.getEntry(new Long(toolSessionID),
+				CoreNotebookConstants.NOTEBOOK_TOOL,
+				MY_SIGNATURE, new Integer(userID));
+		
+        logger.debug("notebookEntry: " + notebookEntry);
+		
+		if (notebookEntry != null) {
+			notebookEntry.setEntry(reflectionEntry);
+			mcService.updateEntry(notebookEntry);
+		} else {
+			mcService.createNotebookEntry(new Long(toolSessionID), CoreNotebookConstants.NOTEBOOK_TOOL,
+					MY_SIGNATURE, new Integer(userID), reflectionEntry);
+		}
 	    
 	    return endLearning(mapping, form, request, response);
 	}
@@ -2072,9 +2084,37 @@
 	    reflectionSubject=McUtils.replaceNewLines(reflectionSubject);
 	    mcGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject);
         
+	    String userID = "";
+	    HttpSession ss = SessionManager.getSession();
+	    logger.debug("ss: " + ss);
+	    
+	    if (ss != null)
+	    {
+		    UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+		    if ((user != null) && (user.getUserID() != null))
+		    {
+		    	userID = user.getUserID().toString();
+			    logger.debug("retrieved userId: " + userID);
+		    }
+	    }
+	    
+	    logger.debug("attempt getting notebookEntry: ");
+		NotebookEntry notebookEntry = mcService.getEntry(new Long(toolSessionID),
+				CoreNotebookConstants.NOTEBOOK_TOOL,
+				MY_SIGNATURE, new Integer(userID));
+		
+        logger.debug("notebookEntry: " + notebookEntry);
+		
+		if (notebookEntry != null) {
+		    String notebookEntryPresentable=McUtils.replaceNewLines(notebookEntry.getEntry());
+		    mcLearningForm.setEntryText(notebookEntryPresentable);
+		    
+		}
+
         request.setAttribute(MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
 		logger.debug("final mcGeneralLearnerFlowDTO: " + mcGeneralLearnerFlowDTO);
 		
+		
 		logger.debug("fwd'ing to: " + NOTEBOOK);
         return (mapping.findForward(NOTEBOOK));
 	}
Index: lams_tool_lamc/web/Template.jsp
===================================================================
diff -u -rb73ea10c36c8939d404f95b6e39cbcb4efbd64ba -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/Template.jsp	(.../Template.jsp)	(revision b73ea10c36c8939d404f95b6e39cbcb4efbd64ba)
+++ lams_tool_lamc/web/Template.jsp	(.../Template.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -20,7 +20,7 @@
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
             "http://www.w3.org/TR/html4/loose.dtd">
-<html:html locale = "true">
+<lams:html>
     <body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
       <table width="900" border="0" cellspacing="0" cellpadding="0" align="center"> 
 	        <!-- header -->
@@ -35,4 +35,4 @@
 	        <!-- end of footer -->
       </table>
     </body>
-</html:html>
+</lams:html>
Index: lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp
===================================================================
diff -u -race8b408295af831e2715b2013d64a000aa09549 -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision ace8b408295af831e2715b2013d64a000aa09549)
+++ lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -40,7 +40,7 @@
 		pageContext.setAttribute("tabsBasic", tabsBasic);
 	%>
 
-<html:html locale="true">		
+<lams:html>		
 	<head>
 	<title><fmt:message key="activity.title" /></title>
 
@@ -195,7 +195,7 @@
 
 
 </body>
-</html:html>
+</lams:html>
 
 
 
Index: lams_tool_lamc/web/authoring/BasicContentViewOnly.jsp
===================================================================
diff -u -r9ad7805407672e72dfc83fb0ba49ccafb0d43d6f -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/authoring/BasicContentViewOnly.jsp	(.../BasicContentViewOnly.jsp)	(revision 9ad7805407672e72dfc83fb0ba49ccafb0d43d6f)
+++ lams_tool_lamc/web/authoring/BasicContentViewOnly.jsp	(.../BasicContentViewOnly.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -51,7 +51,7 @@
 						</tr>
 
 						<tr>
-							<td colspan=2 align=right>			
+							<td colspan=2 class="align-right">			
 				   				<html:submit onclick="javascript:submitMethod('editActivityQuestions');" styleClass="button">
 									<fmt:message key="label.edit"/>
 								</html:submit>	 				 		  					
Index: lams_tool_lamc/web/authoring/candidateAnswersAddList.jsp
===================================================================
diff -u -r2bd6155d7fad435e1238088f98650b0ec731d0f1 -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/authoring/candidateAnswersAddList.jsp	(.../candidateAnswersAddList.jsp)	(revision 2bd6155d7fad435e1238088f98650b0ec731d0f1)
+++ lams_tool_lamc/web/authoring/candidateAnswersAddList.jsp	(.../candidateAnswersAddList.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -43,20 +43,20 @@
 
 
 		<tr>
-				<td width="4%" align="right">
+				<td width="4%" class="align-right">
 				</td>
 	
-				<td align="left">
+				<td class="align-left">
 				</td>
 	
 				<td width="16%" align="center">
 					<fmt:message key="label.isCorrect" />
 				</td>
 	
-				<td width="12%" align="left">
+				<td width="12%" class="align-left">
 				</td>
 	
-				<td width="10%" align="left">
+				<td width="10%" class="align-left">
 				</td>
 		</tr>
 
@@ -65,11 +65,11 @@
 			<c:set var="caIndex" scope="request" value="${caIndex +1}" />
 
 			<tr>
-				<td width="4%" align="right">
+				<td width="4%" class="align-right">
 					<c:out value="${caIndex}" />
 				</td>
 
-				<td align="left">
+				<td class="align-left">
 					<input type="text" name="ca${caIndex}"
 						value="${currentCandidateDTO.candidateAnswer}" size="50">
 				</td>
@@ -94,7 +94,7 @@
 
 				</td>
 
-				<td width="12%" align="left">
+				<td width="12%" class="align-left">
 					<c:if test="${caCount != 1}">
 
 						<c:if test="${caIndex == 1}">
@@ -125,7 +125,7 @@
 					</c:if>
 				</td>
 
-				<td width="10%" align="left">
+				<td width="10%" class="align-left">
 					<img src="<c:out value="${tool}"/>images/delete.gif" border="0"
 						title="<fmt:message key='label.tip.removeCandidate'/>"
 						onclick=" if (validateMinumumCandidateCount()) { removeAddedCandidate(${caIndex}); } ">
Index: lams_tool_lamc/web/authoring/candidateAnswersList.jsp
===================================================================
diff -u -r2bd6155d7fad435e1238088f98650b0ec731d0f1 -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/authoring/candidateAnswersList.jsp	(.../candidateAnswersList.jsp)	(revision 2bd6155d7fad435e1238088f98650b0ec731d0f1)
+++ lams_tool_lamc/web/authoring/candidateAnswersList.jsp	(.../candidateAnswersList.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -35,20 +35,20 @@
 	<c:set var="queIndex" scope="request" value="0" />
 	
 	<tr>
-			<td width="4%" align="right">
+			<td width="4%" class="align-right">
 			</td>
 
-			<td align="left">
+			<td class="align-left">
 			</td>
 
 			<td width="16%" align="center">
 				<fmt:message key="label.isCorrect" />
 			</td>
 
-			<td width="12%" align="left">
+			<td width="12%" class="align-left">
 			</td>
 
-			<td width="10%" align="left">
+			<td width="10%" class="align-left">
 			</td>
 	</tr>
 	
@@ -70,11 +70,11 @@
 				<c:set var="caIndex" scope="request" value="${caIndex +1}" />
 
 				<tr>
-					<td width="4%" align="right">
+					<td width="4%" class="align-right">
 						<c:out value="${caIndex}" />
 					</td>
 
-					<td align="left">
+					<td class="align-left">
 						<input type="text" name="ca${caIndex}"
 							value="${currentCandidateDTO.candidateAnswer}" size="50">
 					</td>
@@ -97,7 +97,7 @@
 							</c:forEach>
 					</td>
 
-					<td width="12%" align="left">
+					<td width="12%" class="align-left">
 						<c:if test="${caCount != 1}">
 
 							<c:if test="${caIndex == 1}">
@@ -128,7 +128,7 @@
 						</c:if>
 					</td>
 
-					<td width="10%" align="left">
+					<td width="10%" class="align-left">
 						<img src="<c:out value="${tool}"/>images/delete.gif" border="0"
 							title="<fmt:message key='label.tip.removeCandidate'/>"
 							onclick=" if (validateMinumumCandidateCount()) {removeCandidate(${queIndex}, ${caIndex});} ">
Index: lams_tool_lamc/web/authoring/editQuestionBox.jsp
===================================================================
diff -u -r97811271c990c44fedeafc6dec2a4de9fbade0af -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/authoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision 97811271c990c44fedeafc6dec2a4de9fbade0af)
+++ lams_tool_lamc/web/authoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -22,7 +22,7 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
-<html>
+<lams:html>
 	<head>
 		<%@ include file="/common/header.jsp"%>
 
@@ -252,4 +252,4 @@
 
 		</html:form>
 	</body>
-</html>
+</lams:html>
Index: lams_tool_lamc/web/authoring/itemlistViewOnly.jsp
===================================================================
diff -u -rc57a6dbde80627861f46bf25cd764f47d4890bb7 -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/authoring/itemlistViewOnly.jsp	(.../itemlistViewOnly.jsp)	(revision c57a6dbde80627861f46bf25cd764f47d4890bb7)
+++ lams_tool_lamc/web/authoring/itemlistViewOnly.jsp	(.../itemlistViewOnly.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -26,7 +26,7 @@
 <img src="${ctxPath}/includes/images/indicator.gif" style="display:none" id="resourceListArea_Busy" /></h2>
 
 <c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-<table id="itemTable" style="align:left;width:650px" >
+<table id="itemTable" class="align-left" style="width:650px" >
     <c:set var="queIndex" scope="request" value="0"/>
     
     
@@ -37,25 +37,25 @@
 	<c:set var="displayOrder" scope="request" value="${currentDTO.displayOrder}"/>	
 
 	<tr>
-		<td width="10%" align="right">
+		<td width="10%" class="align-right">
 				<strong> <fmt:message key="label.question" />: </strong>
 		</td>
 
-		<td width="60%" align="left">
+		<td width="60%" class="align-left">
 			<div style="overflow: auto;">				
 				<c:out value="${question}" escapeXml="false"/> 
 			</div>											
 		</td>		
 
 
-		<td width="10%" align="right">
+		<td width="10%" class="align-right">
 		</td>
        	
-		<td width="10%" align="right">
+		<td width="10%" class="align-right">
 
 		</td>
 
-		<td width="10%" align="right">
+		<td width="10%" class="align-right">
 
 		</td>
 	</tr>
Index: lams_tool_lamc/web/authoring/newQuestionBox.jsp
===================================================================
diff -u -r97811271c990c44fedeafc6dec2a4de9fbade0af -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision 97811271c990c44fedeafc6dec2a4de9fbade0af)
+++ lams_tool_lamc/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -22,7 +22,7 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
-<html>
+<lams:html>
 	<head>
 		<%@ include file="/common/header.jsp"%>
 		<lams:css style="tabbed" />
@@ -229,4 +229,4 @@
 
 		</html:form>
 	</body>
-</html>
+</lams:html>
Index: lams_tool_lamc/web/export/exportportfolio.jsp
===================================================================
diff -u -r8b5fd331984013fa4afe645a4753ae7562b0dc84 -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 8b5fd331984013fa4afe645a4753ae7562b0dc84)
+++ lams_tool_lamc/web/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -25,7 +25,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 
-	<html:html locale="true">
+	<lams:html>
 	<head>
 	<title> <fmt:message key="label.exportPortfolio"/> </title>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -70,17 +70,17 @@
 				  	 			<td>&nbsp;</td>
 				  	 		</tr>
 							<tr>			
-								<td NOWRAP valign=top align=left><b>  <fmt:message key="label.question.only"/> <c:out value="${queIndex}"/>:</b>
+								<td NOWRAP valign=top class="align-left"><b>  <fmt:message key="label.question.only"/> <c:out value="${queIndex}"/>:</b>
 									<c:out value="${currentDto.question}" escapeXml="false"/> &nbsp; (<fmt:message key="label.mark"/> 
 									<c:out value="${currentDto.mark}"/>)
 								 </td>
 							</tr>	
 							<tr>					
-								<td NOWRAP valign=top align=left>  <b> <fmt:message key="label.mc.options.col"/>  </b> 
-									<table align=left>
+								<td NOWRAP valign=top class="align-left">  <b> <fmt:message key="label.mc.options.col"/>  </b> 
+									<table class="align-left">
 										<c:forEach var="answersData" items="${currentDto.candidateAnswersCorrect}">
 											<tr>			
-												<td NOWRAP valign=top align=left>
+												<td NOWRAP valign=top class="align-left">
 													<c:out value="${answersData.candidateAnswer}" escapeXml="false"/> 
 													
 													<c:if test="${answersData.correct == 'true'}"> 		
@@ -96,7 +96,7 @@
 						</c:forEach>		  	
 		
 			  	 		<tr>
-			  	 			<td NOWRAP valign=top align=left> <b> 
+			  	 			<td NOWRAP valign=top class="align-left"> <b> 
 			  	 				<fmt:message key="label.passingMark"/> </b> <c:out value="${passMark}"/>  
 			  	 			</td>
 			  	 		</tr>
@@ -117,17 +117,17 @@
 		
 		
 					  	 		<tr>
-									 <td NOWRAP valign=top align=left> <b> <fmt:message key="label.user"/> </b> </td>  
+									 <td NOWRAP valign=top class="align-left"> <b> <fmt:message key="label.user"/> </b> </td>  
 						  	 		<c:set var="queIndex" scope="request" value="0"/>
 									<c:forEach var="currentDto" items="${listMonitoredAnswersContainerDto}">
 									<c:set var="queIndex" scope="request" value="${queIndex +1}"/>
-										<td NOWRAP valign=top align=left> <b>  <fmt:message key="label.question.only"/> 
+										<td NOWRAP valign=top class="align-left"> <b>  <fmt:message key="label.question.only"/> 
 											<c:out value="${queIndex}"/></b>
 											 &nbsp (<fmt:message key="label.mark"/> <c:out value="${currentDto.mark}"/>)
 										</td>
 									</c:forEach>		  	
 									 
-									 <td NOWRAP valign=top align=left> <b> <fmt:message key="label.total"/>  </b> </td>  
+									 <td NOWRAP valign=top class="align-left"> <b> <fmt:message key="label.total"/>  </b> </td>  
 						  	 		</tr>						 
 		
 											<c:forEach var="markData" items="${mapUserMarksDto}">						
@@ -136,17 +136,17 @@
 		
 												<c:if test="${currentUserSessionId == currentSessionId}"> 	
 													<tr>									  	 		
-									  	 				<td NOWRAP valign=top align=left> 
+									  	 				<td NOWRAP valign=top class="align-left"> 
 																<c:out value="${data.userName}"/> 
 														</td>	
 					
 														<c:forEach var="mark" items="${data.marks}">
-															<td NOWRAP valign=top align=left> 
+															<td NOWRAP valign=top class="align-left"> 
 																	<c:out value="${mark}"/> 								
 															</td>
 														</c:forEach>		  										
 					
-														<td NOWRAP valign=top align=left> 
+														<td NOWRAP valign=top class="align-left"> 
 																	<c:out value="${data.totalMark}"/> 																
 														</td>							
 													</tr>													
@@ -176,17 +176,17 @@
 					  	 			<td> &nbsp;</td>
 					  	 		</tr>
 								<tr>			
-									<td NOWRAP valign=top align=left><b>  <fmt:message key="label.question.only"/> <c:out value="${mainQueIndex}"/>:</b>
+									<td NOWRAP valign=top class="align-left"><b>  <fmt:message key="label.question.only"/> <c:out value="${mainQueIndex}"/>:</b>
 										<c:out value="${currentDto.question}"  escapeXml="false"/> &nbsp; (<fmt:message key="label.mark"/> 
 										<c:out value="${currentDto.mark}"/>)
 									 </td>
 								</tr>	
 								<tr>					
-									<td NOWRAP valign=top align=left>  <b> <fmt:message key="label.mc.options.col"/>  </b> 
-										<table align=left>
+									<td NOWRAP valign=top class="align-left">  <b> <fmt:message key="label.mc.options.col"/>  </b> 
+										<table class="align-left">
 											<c:forEach var="answersData" items="${currentDto.candidateAnswersCorrect}">
 												<tr>			
-													<td NOWRAP valign=top align=left>
+													<td NOWRAP valign=top class="align-left">
 														<c:out value="${answersData.candidateAnswer}"  escapeXml="false"/> 
 														
 														<c:if test="${answersData.correct == 'true'}"> 		
@@ -200,13 +200,13 @@
 								</tr>			
 										
 								<tr>
-									<td  NOWRAP align=left valign=top> 											
-									<table align=left>
+									<td  NOWRAP class="align-left" valign=top> 											
+									<table class="align-left">
 										<c:forEach var="attemptEntry" items="${mapQueAttempts}">
 											<c:if test="${mainQueIndex == attemptEntry.key}"> 		
 									  		  	 		<c:set var="aIndex" scope="request" value="1"/>
 										  		  	 		<tr>
-																<td NOWRAP align=left valign=top> 
+																<td NOWRAP class="align-left" valign=top> 
 																			<b> <fmt:message key="label.yourAnswers"/>  </b>
 																</td>
 																<td align=right valign=top>
@@ -223,11 +223,11 @@
 																<c:if test="${distinctAttemptEntry.key == i}"> 	
 																	<tr>
 																		<c:set var="aIndex" scope="request" value="${aIndex +1}"/>
-				 														<td align=left valign=top colspan=2> 																					
-					 														<table align=left>
+				 														<td class="align-left" valign=top colspan=2> 																					
+					 														<table class="align-left">
 							 													<c:forEach var="singleAttemptEntry" items="${distinctAttemptEntry.value}">
 																					<tr>
-																						<td NOWRAP align=left valign=top>
+																						<td NOWRAP class="align-left" valign=top>
 									 															<c:out value="${singleAttemptEntry.value}"  escapeXml="false"/> 
 								 														</td>
 																					</tr>	
@@ -249,14 +249,14 @@
 							</c:forEach>
 		
 				  	 		<tr>
-				  	 			<td NOWRAP valign=top align=left> <b> 
+				  	 			<td NOWRAP valign=top class="align-left"> <b> 
 				  	 				<fmt:message key="label.passingMark"/>: </b> <c:out value="${passMark}"/> 
 				  	 			</td>
 				  	 		</tr>
 		
 		
 				  	 		<tr>
-				  	 			<td NOWRAP valign=top align=left> <b> 
+				  	 			<td NOWRAP valign=top class="align-left"> <b> 
 				  	 				<fmt:message key="label.studentMark"/>: </b> <c:out value="${learnerMark}"/> 
 				  	 			</td>
 				  	 		</tr>
@@ -267,14 +267,14 @@
 				<table  class="forms">
 				
 						<tr>			
-							<td valign=top align=left>
+							<td valign=top class="align-left">
 								&nbsp
 							</td>
 						</tr>
 				
 					<tr>			
-							<td valign=top align=left>
-								<table align=left>
+							<td valign=top class="align-left">
+								<table class="align-left">
 								
 										<tr>			
 											<td colspan=3 valign=top align=center>
@@ -290,15 +290,15 @@
 							  	 		<c:set var="reflectionUid" scope="request" value="${currentDto.reflectionUid}"/>
 							  	 		<c:set var="entry" scope="request" value="${currentDto.entry}"/>
 										<tr>			
-											<td valign=top align=left>
+											<td valign=top class="align-left">
 												<b> <fmt:message key="label.user"/>:</b>
 											 </td>
 										
-											<td valign=top align=left>
+											<td valign=top class="align-left">
 												 <c:out value="${userName}" escapeXml="false"/> 
 											 </td>
 
-											<td valign=top align=left>
+											<td valign=top class="align-left">
 												 <c:out value="${entry}" escapeXml="false"/> 
 											 </td>
 										</tr>	
Index: lams_tool_lamc/web/includes/layout.jsp
===================================================================
diff -u -r9a8badc30e1305b21c85727950607d2335500a61 -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/includes/layout.jsp	(.../layout.jsp)	(revision 9a8badc30e1305b21c85727950607d2335500a61)
+++ lams_tool_lamc/web/includes/layout.jsp	(.../layout.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -4,7 +4,7 @@
 <%@ include file="/common/taglibs.jsp"%>
 <%@ taglib uri="tags-tiles" prefix="tiles"%>
 
-<html>
+<lams:html>
 	<head>
 		<title><fmt:message key="activity.title" /></title>
 		<%@ include file="/common/header.jsp"%>
@@ -29,4 +29,4 @@
 			</div>
 		</div>
 	</body>
-</html>
+</lams:html>
Index: lams_tool_lamc/web/includes/learnerLayout.jsp
===================================================================
diff -u -r9a8badc30e1305b21c85727950607d2335500a61 -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/includes/learnerLayout.jsp	(.../learnerLayout.jsp)	(revision 9a8badc30e1305b21c85727950607d2335500a61)
+++ lams_tool_lamc/web/includes/learnerLayout.jsp	(.../learnerLayout.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -9,7 +9,7 @@
 <c:set var="tool">
 	<lams:WebAppURL />
 </c:set>
-<html>
+<lams:html>
 	<head>
 		<title><fmt:message key="activity.title" /></title>
 		<%@ include file="/common/learnerheader.jsp"%>
@@ -28,4 +28,4 @@
 	<body  class="stripes">
 		<tiles:insert attribute="body" />
 	</body>
-</html>
+</lams:html>
Index: lams_tool_lamc/web/includes/tablayout.jsp
===================================================================
diff -u -r9a8badc30e1305b21c85727950607d2335500a61 -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/includes/tablayout.jsp	(.../tablayout.jsp)	(revision 9a8badc30e1305b21c85727950607d2335500a61)
+++ lams_tool_lamc/web/includes/tablayout.jsp	(.../tablayout.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -4,7 +4,7 @@
 <%@ include file="/common/taglibs.jsp"%>
 <%@ taglib uri="tags-tiles" prefix="tiles"%>
 
-<html>
+<lams:html>
 	<head>
 		<title><fmt:message key="activity.title" /></title>
 		<%@ include file="/common/header.jsp"%>
@@ -28,4 +28,4 @@
 			<div id="footer"></div>
 		</div>
 	</body>
-</html>
+</lams:html>
Index: lams_tool_lamc/web/layout/default.jsp
===================================================================
diff -u -r621eef67c1f90ae4d83273b078a303d36ce383f2 -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/layout/default.jsp	(.../default.jsp)	(revision 621eef67c1f90ae4d83273b078a303d36ce383f2)
+++ lams_tool_lamc/web/layout/default.jsp	(.../default.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -3,7 +3,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
         
-<html>
+<lams:html>
 	<tiles:insert attribute="header" />
 	<body>
 		<tiles:useAttribute name="pageTitleKey" scope="request" />
@@ -17,4 +17,4 @@
 		<tiles:insert attribute="body" />
 		<tiles:insert attribute="footer" />
 	</body>
-</html>
+</lams:html>
Index: lams_tool_lamc/web/learning/AnswersContent.jsp
===================================================================
diff -u -r259312ece4305731fc5b29d76b8288bca029d248 -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 259312ece4305731fc5b29d76b8288bca029d248)
+++ lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -31,7 +31,7 @@
 	<lams:WebAppURL />
 </c:set>
 
-<html:html>
+<lams:html>
 <head class="stripes">
 	<html:base />
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
@@ -82,7 +82,7 @@
 <div id="footer"></div>
 
 </body>
-</html:html>
+</lams:html>
 
 
 
Index: lams_tool_lamc/web/learning/CombinedAnswersContent.jsp
===================================================================
diff -u -r33e4875bda0558f0a968b45630d2021f1fe4edf6 -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision 33e4875bda0558f0a968b45630d2021f1fe4edf6)
+++ lams_tool_lamc/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -92,7 +92,7 @@
 
 <html:hidden property="donePreview" />
 
-<div class="space-bottom-top" align="right">
+<div class="space-bottom-top align-right">
 	<html:submit property="continueOptionsCombined" styleClass="button">
 		<fmt:message key="button.continue" />
 	</html:submit>
Index: lams_tool_lamc/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -r529f6d327751bfbd8990d88f724da07a2b806816 -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 529f6d327751bfbd8990d88f724da07a2b806816)
+++ lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -30,7 +30,7 @@
 	<lams:WebAppURL />
 </c:set>
 
-<html:html>
+<lams:html>
 <head>
 	<html:base />
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
@@ -176,7 +176,7 @@
 					<fmt:message key="label.redo.questions" />
 				</html:submit>
 
-				<div class="space-bottom-top" align="right">
+				<div class="space-bottom-top align-right">
 					<c:if
 						test="${((mcGeneralLearnerFlowDTO.passMarkApplicable == 'true') && (mcGeneralLearnerFlowDTO.userOverPassMark == 'true'))}">
 						<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}">
@@ -197,7 +197,7 @@
 
 			<c:if test="${mcGeneralLearnerFlowDTO.retries != 'true'}">
 
-				<div class="space-bottom-top" align="right">
+				<div class="space-bottom-top align-right">
 					<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}">
 						<html:submit property="learnerFinished" styleClass="button">
 							<fmt:message key="label.finished" />
@@ -216,5 +216,5 @@
 		</html:form>
 	</div>
 </body>
-</html:html>
+</lams:html>
 
Index: lams_tool_lamc/web/learning/Notebook.jsp
===================================================================
diff -u -r896248d87ee3eb2da93ba7a9f11ca2de11eb4040 -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 896248d87ee3eb2da93ba7a9f11ca2de11eb4040)
+++ lams_tool_lamc/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -31,7 +31,7 @@
 	<lams:WebAppURL />
 </c:set>
 
-<html:html>
+<lams:html>
 <head>
 	<html:base />
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
@@ -64,9 +64,14 @@
 			</p>
 
 			<html:textarea cols="60" rows="8" property="entryText"
-				styleClass="text-area"></html:textarea>
+				styleClass="text-area">
+				<c:if test="${not empty mcGeneralLearnerFlowDTO.notebookEntry}">
+					<lams:out value="${mcGeneralLearnerFlowDTO.notebookEntry}"
+					escapeXml="true" />
+				</c:if>
+			</html:textarea>
 
-			<div align="right" class="space-bottom-top">
+			<div class="space-bottom-top align-right">
 				<html:submit property="submitReflection" styleClass="button">
 					<fmt:message key="button.endLearning" />
 				</html:submit>
@@ -79,7 +84,7 @@
 
 
 </body>
-</html:html>
+</lams:html>
 
 
 
Index: lams_tool_lamc/web/learning/RedoQuestions.jsp
===================================================================
diff -u -r14a018dc1d6fa388bc2d671dfe4f1041e991ba3b -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/learning/RedoQuestions.jsp	(.../RedoQuestions.jsp)	(revision 14a018dc1d6fa388bc2d671dfe4f1041e991ba3b)
+++ lams_tool_lamc/web/learning/RedoQuestions.jsp	(.../RedoQuestions.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -31,7 +31,7 @@
 	<lams:WebAppURL />
 </c:set>
 
-<html:html>
+<lams:html>
 <head>
 	<html:base />
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
@@ -98,7 +98,7 @@
 				  	 
 		 		<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true'}"> 					  	   
 
-					  	  	<div align="right" class="space-bottom-top">
+					  	  	<div class="space-bottom-top align-right">
 									<c:if test="${((McLearningForm.passMarkApplicable == 'true') && (McLearningForm.userOverPassMark == 'true'))}">
 										<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}"> 						  			  		
 											<html:submit property="learnerFinished"  styleClass="button">
@@ -118,7 +118,7 @@
 					
 					<c:if test="${mcGeneralLearnerFlowDTO.retries != 'true'}"> 							  
  			  	   		  
-	    	  						<div align="right" class="space-bottom-top">
+	    	  						<div class="space-bottom-top align-right">
 										<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}"> 						  			  		
 										<html:submit property="learnerFinished"  styleClass="button">
 											<fmt:message key="label.finished"/>
@@ -144,7 +144,7 @@
 	
 
 </body>
-</html:html>
+</lams:html>
 
 
 
Index: lams_tool_lamc/web/learning/ResultsSummary.jsp
===================================================================
diff -u -racc5f651c03bd0895c8b189c932ea35dea91dc7d -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/learning/ResultsSummary.jsp	(.../ResultsSummary.jsp)	(revision acc5f651c03bd0895c8b189c932ea35dea91dc7d)
+++ lams_tool_lamc/web/learning/ResultsSummary.jsp	(.../ResultsSummary.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -31,7 +31,7 @@
 	<lams:WebAppURL />
 </c:set>
 
-<html:html>
+<lams:html>
 <head>
 	<html:base />
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
@@ -114,7 +114,7 @@
 					<fmt:message key="label.redo.questions" />
 				</html:submit>
 
-				<div class="space-bottom-top" align="right">
+				<div class="space-bottom-top align-right">
 					<c:if
 						test="${((McLearningForm.passMarkApplicable == 'true') && (McLearningForm.userOverPassMark == 'true'))}">
 						<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}">
@@ -135,7 +135,7 @@
 
 			<c:if test="${mcGeneralLearnerFlowDTO.retries != 'true'}">
 
-				<div class="space-bottom-top" align="right">
+				<div class="space-bottom-top align-right">
 					<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}">
 						<html:submit property="learnerFinished" styleClass="button">
 							<fmt:message key="label.finished" />
@@ -153,7 +153,7 @@
 		</html:form>
 	</div>
 </body>
-</html:html>
+</lams:html>
 
 
 
Index: lams_tool_lamc/web/learning/RunOffline.jsp
===================================================================
diff -u -r896248d87ee3eb2da93ba7a9f11ca2de11eb4040 -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/learning/RunOffline.jsp	(.../RunOffline.jsp)	(revision 896248d87ee3eb2da93ba7a9f11ca2de11eb4040)
+++ lams_tool_lamc/web/learning/RunOffline.jsp	(.../RunOffline.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -31,7 +31,7 @@
 	<lams:WebAppURL />
 </c:set>
 
-<html:html>
+<lams:html>
 <head>
 	<html:base />
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
@@ -57,7 +57,7 @@
 			</p>
 
 
-			<div align="right" class="space-bottom-top">
+			<div class="space-bottom-top align-right">
 
 				<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}">
 					<html:submit property="learnerFinished" styleClass="button">
@@ -75,7 +75,7 @@
 	</html:form>
 	<div id="footer"></div>
 </body>
-</html:html>
+</lams:html>
 
 
 
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
diff -u -r529f6d327751bfbd8990d88f724da07a2b806816 -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision 529f6d327751bfbd8990d88f724da07a2b806816)
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -31,7 +31,7 @@
 	<lams:WebAppURL />
 </c:set>
 
-<html:html>
+<lams:html>
 <head>
 	<html:base />
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -214,25 +214,32 @@
 				</c:if>
 			</c:if>
 
-			<c:if
-				test="${mcGeneralLearnerFlowDTO.notebookEntry != null && mcGeneralLearnerFlowDTO.notebookEntry != ''}">
-
-				<h2>
-					<fmt:message key="label.notebook.entries" />
-				</h2>
+			<h2>
+				<fmt:message key="label.notebook.entries" />
+			</h2>
 	
-				<p>
-					<c:out value="${mcGeneralLearnerFlowDTO.notebookEntry}"
-						escapeXml="false" />
-				</p>
-			</c:if>			
-
+			<p>
+				<c:choose>
+					<c:when test="${not empty mcGeneralLearnerFlowDTO.notebookEntry}">
+						<lams:out value="${mcGeneralLearnerFlowDTO.notebookEntry}" escapeXml="true" />
+					</c:when>
+					<c:otherwise>
+						<em><fmt:message key="message.no.reflection.available" /></em>  
+					</c:otherwise>
+				</c:choose>
+			</p>
+			
+			<html:submit property="forwardtoReflection" styleClass="button">
+				<fmt:message key="label.edit" />
+			</html:submit>
+							
 			<html:hidden property="doneLearnerProgress" />
 
 		</html:form>
+
 	</div>
 </body>
-</html:html>
+</lams:html>
 
 
 
Index: lams_tool_lamc/web/learning/defineLater.jsp
===================================================================
diff -u -r896248d87ee3eb2da93ba7a9f11ca2de11eb4040 -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 896248d87ee3eb2da93ba7a9f11ca2de11eb4040)
+++ lams_tool_lamc/web/learning/defineLater.jsp	(.../defineLater.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -31,7 +31,7 @@
 	<lams:WebAppURL />
 </c:set>
 
-<html:html>
+<lams:html>
 <head>
 	<html:base />
 	<lams:headItems />
@@ -52,7 +52,7 @@
 	<div id="footer-learner"></div>
 </div>
 </body>
-</html:html>
+</lams:html>
 
 
 
Index: lams_tool_lamc/web/monitoring/AllSessionsSummary.jsp
===================================================================
diff -u -r8b5fd331984013fa4afe645a4753ae7562b0dc84 -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/monitoring/AllSessionsSummary.jsp	(.../AllSessionsSummary.jsp)	(revision 8b5fd331984013fa4afe645a4753ae7562b0dc84)
+++ lams_tool_lamc/web/monitoring/AllSessionsSummary.jsp	(.../AllSessionsSummary.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -35,16 +35,16 @@
 
 
 			  	 		<tr>
-							 <td NOWRAP valign=top align=left> <b> <fmt:message key="label.user"/> </b> </td>  
+							 <td NOWRAP valign=top class="align-left"> <b> <fmt:message key="label.user"/> </b> </td>  
 				  	 		<c:set var="queIndex" scope="request" value="0"/>
 							<c:forEach var="currentDto" items="${listMonitoredAnswersContainerDto}">
 							<c:set var="queIndex" scope="request" value="${queIndex +1}"/>
-								<td NOWRAP valign=top align=left> <b>  <fmt:message key="label.question.only"/> <c:out value="${queIndex}"/></b>
+								<td NOWRAP valign=top class="align-left"> <b>  <fmt:message key="label.question.only"/> <c:out value="${queIndex}"/></b>
 									 &nbsp (<fmt:message key="label.mark"/> <c:out value="${currentDto.mark}"/> )
 								</td>
 							</c:forEach>		  	
 							 
-							 <td NOWRAP valign=top align=left> <b> <fmt:message key="label.total"/>  </b> </td>  
+							 <td NOWRAP valign=top class="align-left"> <b> <fmt:message key="label.total"/>  </b> </td>  
 			  	 		</tr>						 
 
 									<c:forEach var="markData" items="${mapUserMarksDto}">						
@@ -54,17 +54,17 @@
 									<c:if test="${currentMonitoredToolSession == 'All'}"> 			
 										<c:if test="${currentUserSessionId == currentSessionId}"> 	
 											<tr>									  	 		
-							  	 				<td NOWRAP valign=top align=left> 
+							  	 				<td NOWRAP valign=top class="align-left"> 
 														<c:out value="${data.userName}"/> 
 												</td>	
 			
 												<c:forEach var="mark" items="${data.marks}">
-													<td NOWRAP valign=top align=left> 
+													<td NOWRAP valign=top class="align-left"> 
 															<c:out value="${mark}"/> 								
 													</td>
 												</c:forEach>		  										
 			
-												<td NOWRAP valign=top align=left> 
+												<td NOWRAP valign=top class="align-left"> 
 															<c:out value="${data.totalMark}"/> 																
 												</td>							
 											</tr>													
@@ -80,17 +80,17 @@
 										<c:if test="${currentMonitoredToolSession == currentUserSessionId}"> 										
 											<c:if test="${currentUserSessionId == currentSessionId}"> 									
 											<tr>			
-												<td NOWRAP valign=top align=left> 
+												<td NOWRAP valign=top class="align-left"> 
 														<c:out value="${data.userName}"/> 
 												</td>	
 			
 												<c:forEach var="mark" items="${data.marks}">
-													<td NOWRAP valign=top align=left> 
+													<td NOWRAP valign=top class="align-left"> 
 															<c:out value="${mark}"/> 								
 													</td>
 												</c:forEach>		  										
 			
-												<td NOWRAP valign=top align=left> 
+												<td NOWRAP valign=top class="align-left"> 
 															<c:out value="${data.totalMark}"/> 																
 												</td>							
 											</tr>														
Index: lams_tool_lamc/web/monitoring/IndividualSessionSummary.jsp
===================================================================
diff -u -r8b5fd331984013fa4afe645a4753ae7562b0dc84 -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/monitoring/IndividualSessionSummary.jsp	(.../IndividualSessionSummary.jsp)	(revision 8b5fd331984013fa4afe645a4753ae7562b0dc84)
+++ lams_tool_lamc/web/monitoring/IndividualSessionSummary.jsp	(.../IndividualSessionSummary.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -40,17 +40,17 @@
 							</tr>
 						
 				  	 		<tr>
-								 <td NOWRAP valign=top align=left> <b> <fmt:message key="label.user"/>  </b> </td>  
+								 <td NOWRAP valign=top class="align-left"> <b> <fmt:message key="label.user"/>  </b> </td>  
 					  	 		<c:set var="queIndex" scope="request" value="0"/>
 								<c:forEach var="currentDto" items="${listMonitoredAnswersContainerDto}">
 								<c:set var="queIndex" scope="request" value="${queIndex +1}"/>
-									<td NOWRAP valign=top align=left> <b>  <fmt:message key="label.question.only"/> <c:out value="${queIndex}"/></b>
+									<td NOWRAP valign=top class="align-left"> <b>  <fmt:message key="label.question.only"/> <c:out value="${queIndex}"/></b>
 										 &nbsp (<fmt:message key="label.mark"/> 
 										<c:out value="${currentDto.mark}"/> )
 									</td>
 								</c:forEach>		  	
 								 
-								 <td NOWRAP valign=top align=left> <b> <fmt:message key="label.total"/>  </b> </td>  
+								 <td NOWRAP valign=top class="align-left"> <b> <fmt:message key="label.total"/>  </b> </td>  
 				  	 		</tr>						 
 						</c:if>																						  	 		
 			  	 		
@@ -65,17 +65,17 @@
 									<c:if test="${currentMonitoredToolSession == 'All'}"> 			
 										<c:if test="${currentUserSessionId == currentSessionId}"> 	
 											<tr>									  	 		
-							  	 				<td NOWRAP valign=top align=left> 
+							  	 				<td NOWRAP valign=top class="align-left"> 
 														<c:out value="${data.userName}"/> 
 												</td>	
 			
 												<c:forEach var="mark" items="${data.marks}">
-													<td NOWRAP valign=top align=left> 
+													<td NOWRAP valign=top class="align-left"> 
 															<c:out value="${mark}"/> 								
 													</td>
 												</c:forEach>		  										
 			
-												<td NOWRAP valign=top align=left> 
+												<td NOWRAP valign=top class="align-left"> 
 															<c:out value="${data.totalMark}"/> 																
 												</td>							
 											</tr>													
@@ -91,17 +91,17 @@
 										<c:if test="${currentMonitoredToolSession == currentUserSessionId}"> 										
 											<c:if test="${currentUserSessionId == currentSessionId}"> 									
 											<tr>			
-												<td NOWRAP valign=top align=left> 
+												<td NOWRAP valign=top class="align-left"> 
 														<c:out value="${data.userName}"/> 
 												</td>	
 			
 												<c:forEach var="mark" items="${data.marks}">
-													<td NOWRAP valign=top align=left> 
+													<td NOWRAP valign=top class="align-left"> 
 															<c:out value="${mark}"/> 								
 													</td>
 												</c:forEach>		  										
 			
-												<td NOWRAP valign=top align=left> 
+												<td NOWRAP valign=top class="align-left"> 
 															<c:out value="${data.totalMark}"/> 																
 												</td>							
 											</tr>														
Index: lams_tool_lamc/web/monitoring/Instructions.jsp
===================================================================
diff -u -r8b5fd331984013fa4afe645a4753ae7562b0dc84 -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/monitoring/Instructions.jsp	(.../Instructions.jsp)	(revision 8b5fd331984013fa4afe645a4753ae7562b0dc84)
+++ lams_tool_lamc/web/monitoring/Instructions.jsp	(.../Instructions.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -39,7 +39,7 @@
 							<table  width="100%" align=center  border="0" cellspacing="0" cellpadding="0">
 								<tr>
 									<td>
-										<table width="70%" align="left">
+										<table width="70%" class="align-left">
 
        									<c:forEach var="attachment" items="${mcGeneralMonitoringDTO.attachmentList}">
 											<c:if test="${attachment.fileOnline == true }"> 			
@@ -94,7 +94,7 @@
 							<table  width="100%" align=center  border="0" cellspacing="0" cellpadding="0">
 								<tr>
 									<td>
-										<table width="70%" align="left">
+										<table width="70%" class="align-left">
 
        									<c:forEach var="attachment" items="${mcGeneralMonitoringDTO.attachmentList}">
 											<c:if test="${attachment.fileOnline == false}"> 			
Index: lams_tool_lamc/web/monitoring/LearnerNotebook.jsp
===================================================================
diff -u -r8b5fd331984013fa4afe645a4753ae7562b0dc84 -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/monitoring/LearnerNotebook.jsp	(.../LearnerNotebook.jsp)	(revision 8b5fd331984013fa4afe645a4753ae7562b0dc84)
+++ lams_tool_lamc/web/monitoring/LearnerNotebook.jsp	(.../LearnerNotebook.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -31,7 +31,7 @@
 	<lams:WebAppURL />
 </c:set>
 
-<html:html>
+<lams:html>
 <head>
 	<html:base />
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
@@ -84,7 +84,7 @@
 
 </div>
 </body>
-</html:html>
+</lams:html>
 
 
 
Index: lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -race8b408295af831e2715b2013d64a000aa09549 -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision ace8b408295af831e2715b2013d64a000aa09549)
+++ lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -37,7 +37,7 @@
 		pageContext.setAttribute("tabs", tabs);
 	%>
 
-	<html:html locale="true">
+	<lams:html>
 	<head>
 
 	<title> <fmt:message key="label.monitoring"/> </title>
@@ -175,4 +175,4 @@
 	</div>
 	
 </body>
-</html:html>
+</lams:html>
Index: lams_tool_lamc/web/monitoring/Reflections.jsp
===================================================================
diff -u -r8b5fd331984013fa4afe645a4753ae7562b0dc84 -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/monitoring/Reflections.jsp	(.../Reflections.jsp)	(revision 8b5fd331984013fa4afe645a4753ae7562b0dc84)
+++ lams_tool_lamc/web/monitoring/Reflections.jsp	(.../Reflections.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -24,7 +24,7 @@
 					<table class="forms">
 						
 								<tr>			
-									<td colspan=2 valign=top align=left>
+									<td colspan=2 valign=top class="align-left">
 										<b>  <fmt:message key="label.reflection"/>  </b> 
 									 </td>
 								</tr>	
@@ -36,11 +36,11 @@
 					  	 		<c:set var="sessionId" scope="request" value="${currentDto.sessionId}"/>
 					  	 		<c:set var="reflectionUid" scope="request" value="${currentDto.reflectionUid}"/>
 								<tr>			
-									<td valign=top align=left>
+									<td valign=top class="align-left">
 										 <c:out value="${userName}" escapeXml="false"/> 
 									 </td>
 	
-									<td valign=top align=left>
+									<td valign=top class="align-left">
 										<c:url value="monitoring.do" var="openNotebook">
 											<c:param name="dispatch" value="openNotebook" />
 											<c:param name="uid" value="${reflectionUid}" />
Index: lams_tool_lamc/web/monitoring/SummaryContent.jsp
===================================================================
diff -u -r8b5fd331984013fa4afe645a4753ae7562b0dc84 -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 8b5fd331984013fa4afe645a4753ae7562b0dc84)
+++ lams_tool_lamc/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -81,16 +81,16 @@
 			  	 			<td> &nbsp&nbsp&nbsp</td>
 			  	 		</tr>
 						<tr>			
-							<td NOWRAP valign=top align=left><b>  <fmt:message key="label.question.only"/> <c:out value="${queIndex}"/>:</b>
+							<td NOWRAP valign=top class="align-left"><b>  <fmt:message key="label.question.only"/> <c:out value="${queIndex}"/>:</b>
 								<c:out value="${currentDto.question}" escapeXml="false"/> &nbsp (<fmt:message key="label.mark"/> <c:out value="${currentDto.mark}"/> )
 							 </td>
 						</tr>	
 						<tr>					
-							<td NOWRAP valign=top align=left>  <b> <fmt:message key="label.mc.options.col"/>  </b> 
-								<table align=left>
+							<td NOWRAP valign=top class="align-left">  <b> <fmt:message key="label.mc.options.col"/>  </b> 
+								<table class="align-left">
 									<c:forEach var="answersData" items="${currentDto.candidateAnswersCorrect}">
 										<tr>			
-											<td NOWRAP valign=top align=left>
+											<td NOWRAP valign=top class="align-left">
 												&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
 												<c:out value="${answersData.candidateAnswer}" escapeXml="false"/> 
 												
@@ -107,7 +107,7 @@
 					</c:forEach>		  	
 
 		  	 		<tr>
-		  	 			<td NOWRAP valign=top align=left> <b> 
+		  	 			<td NOWRAP valign=top class="align-left"> <b> 
 		  	 				<fmt:message key="label.passingMark"/>: </b> <c:out value="${passMark}"/> 
 		  	 			</td>
 		  	 		</tr>
Index: lams_tool_lamc/web/monitoring/candidateAnswersAddList.jsp
===================================================================
diff -u -r2bd6155d7fad435e1238088f98650b0ec731d0f1 -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/monitoring/candidateAnswersAddList.jsp	(.../candidateAnswersAddList.jsp)	(revision 2bd6155d7fad435e1238088f98650b0ec731d0f1)
+++ lams_tool_lamc/web/monitoring/candidateAnswersAddList.jsp	(.../candidateAnswersAddList.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -45,32 +45,32 @@
 		    <c:set var="caIndex" scope="request" value="0"/>
 
 			<tr>
-					<td width="4%" align="right">
+					<td width="4%" class="align-right">
 					</td>
 		
-					<td align="left">
+					<td class="align-left">
 					</td>
 		
 					<td width="16%" align="center">
 						<fmt:message key="label.isCorrect" />
 					</td>
 		
-					<td width="12%" align="left">
+					<td width="12%" class="align-left">
 					</td>
 		
-					<td width="10%" align="left">
+					<td width="10%" class="align-left">
 					</td>
 			</tr>
 		    
 		   <c:forEach items="${listCandidateAnswersDTO}" var="currentCandidateDTO" varStatus="status">
 		   	<c:set var="caIndex" scope="request" value="${caIndex +1}"/>
 		   	
 			<tr>
-				<td width="4%" align="right">
+				<td width="4%" class="align-right">
 					<c:out value="${caIndex}" />  
 				</td>		
 			
-				<td align="left">
+				<td class="align-left">
 					<input type="text" name="ca${caIndex}"  value="${currentCandidateDTO.candidateAnswer}" size="50">
 				</td>		
 				
@@ -92,7 +92,7 @@
 						</c:forEach>
 				</td>		
 				
-				<td width="22%" align="left">
+				<td width="22%" class="align-left">
 			 		<c:if test="${caCount != 1}"> 		
 			 		
 				 		<c:if test="${caIndex == 1}"> 		
@@ -121,7 +121,7 @@
 					</c:if> 			
 				</td>
 				
-				<td width="10%" align="left">				
+				<td width="10%" class="align-left">				
 						<a title="<fmt:message key='label.tip.removeCandidate'/>" href="javascript:;" 
 						onclick="if (validateMinumumCandidateCount()) { removeAddedCandidate(${caIndex}); } ">
 			                    <img src="<c:out value="${tool}"/>images/delete.gif" border="0">
Index: lams_tool_lamc/web/monitoring/candidateAnswersList.jsp
===================================================================
diff -u -r2bd6155d7fad435e1238088f98650b0ec731d0f1 -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/monitoring/candidateAnswersList.jsp	(.../candidateAnswersList.jsp)	(revision 2bd6155d7fad435e1238088f98650b0ec731d0f1)
+++ lams_tool_lamc/web/monitoring/candidateAnswersList.jsp	(.../candidateAnswersList.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -53,20 +53,20 @@
 
 
 			<tr>
-					<td width="4%" align="right">
+					<td width="4%" class="align-right">
 					</td>
 		
-					<td align="left">
+					<td class="align-left">
 					</td>
 		
 					<td width="16%" align="center">
 						<fmt:message key="label.isCorrect" />
 					</td>
 		
-					<td width="12%" align="left">
+					<td width="12%" class="align-left">
 					</td>
 		
-					<td width="10%" align="left">
+					<td width="10%" class="align-left">
 					</td>
 			</tr>
 
@@ -75,11 +75,11 @@
 		   	<c:set var="caIndex" scope="request" value="${caIndex +1}"/>
 		   	
 			<tr>
-				<td width="4%" align="right">
+				<td width="4%" class="align-right">
 					<c:out value="${caIndex}" /> 
 				</td>		
 			
-				<td align="left">
+				<td class="align-left">
 					<input type="text" name="ca${caIndex}"  value="${currentCandidateDTO.candidateAnswer}" size="50">
 				</td>		
 				
@@ -101,7 +101,7 @@
 						</c:forEach>
 				</td>
 						
-				<td width="22%" align="left">
+				<td width="22%" class="align-left">
 			 		<c:if test="${caCount != 1}"> 		
 			 		
 				 		<c:if test="${caIndex == 1}"> 		
@@ -130,7 +130,7 @@
 					</c:if> 			
 				</td>
 				
-				<td width="10%" align="left">				
+				<td width="10%" class="align-left">				
 						<a title="<fmt:message key='label.tip.removeCandidate'/>" href="javascript:;" 
 						onclick="  if (validateMinumumCandidateCount()) { removeCandidate(${queIndex}, ${caIndex});	} ">
 			                    <img src="<c:out value="${tool}"/>images/delete.gif" border="0">
Index: lams_tool_lamc/web/monitoring/editQuestionBox.jsp
===================================================================
diff -u -r97811271c990c44fedeafc6dec2a4de9fbade0af -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/monitoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision 97811271c990c44fedeafc6dec2a4de9fbade0af)
+++ lams_tool_lamc/web/monitoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -22,7 +22,7 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
-<html>
+<lams:html>
 	<head>
 		<%@ include file="/common/learnerheader.jsp"%>
 		
@@ -276,4 +276,4 @@
 			
 		</table>
 	</body>
-</html>
\ No newline at end of file
+</lams:html>
\ No newline at end of file
Index: lams_tool_lamc/web/monitoring/itemlist.jsp
===================================================================
diff -u -rb28aee6922645ac98ad28039f3a2abea1bc3069b -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/monitoring/itemlist.jsp	(.../itemlist.jsp)	(revision b28aee6922645ac98ad28039f3a2abea1bc3069b)
+++ lams_tool_lamc/web/monitoring/itemlist.jsp	(.../itemlist.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -36,18 +36,18 @@
 	<c:set var="displayOrder" scope="request" value="${currentDTO.displayOrder}"/>	
 
 	<tr>
-		<td width="10%" align="right">
+		<td width="10%" class="align-right">
 			<strong> 	<fmt:message key="label.question" />: </strong>
 		</td>
 
-		<td width="60%" align="left">
+		<td width="60%" class="align-left">
 			<div style="overflow: auto;">						
 				<c:out value="${question}" escapeXml="false"/> 
 			</div>														
 		</td>		
 
 
-			<td width="10%" align="right">
+			<td width="10%" class="align-right">
 		 		<c:if test="${totalQuestionCount != 1}"> 		
 		 		
 			 		<c:if test="${queIndex == 1}"> 		
@@ -78,13 +78,13 @@
 		
 		
 
-		<td width="10%" align="right">
+		<td width="10%" class="align-right">
 				<a title="<fmt:message key='label.tip.editQuestion'/>" href="javascript:;" onclick="javascript:showMessage('<html:rewrite page="/monitoring.do?dispatch=newEditableQuestionBox&questionIndex=${queIndex}&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&activeModule=${mcGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${mcGeneralAuthoringDTO.defaultContentIdStr}&sln=${mcGeneralAuthoringDTO.sln}&questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&retries=${mcGeneralAuthoringDTO.retries}&reflect=${mcGeneralAuthoringDTO.reflect}&reflectionSubject=${mcGeneralAuthoringDTO.reflectionSubject}"/>');">
 	                    <img src="<c:out value="${tool}"/>images/edit.gif" border="0">
 				</a> 
 		</td>
 
-		<td width="10%" align="right">
+		<td width="10%" class="align-right">
 				<a title="<fmt:message key='label.tip.deleteQuestion'/>" href="javascript:;" onclick="removeMonitoringQuestion(${queIndex});">
 	                    <img src="<c:out value="${tool}"/>images/delete.gif" border="0">
 				</a> 				
Index: lams_tool_lamc/web/monitoring/newQuestionBox.jsp
===================================================================
diff -u -r97811271c990c44fedeafc6dec2a4de9fbade0af -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f
--- lams_tool_lamc/web/monitoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision 97811271c990c44fedeafc6dec2a4de9fbade0af)
+++ lams_tool_lamc/web/monitoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
@@ -22,7 +22,7 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
-<html>
+<lams:html>
 	<head>
 		<%@ include file="/common/learnerheader.jsp"%>
 		
@@ -273,4 +273,4 @@
 		</table>
 
 	</body>
-</html>
\ No newline at end of file
+</lams:html>
\ No newline at end of file