Index: lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra393ce2c8a103a61062dbb5f5c7f9ae7c29a21da -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a393ce2c8a103a61062dbb5f5c7f9ae7c29a21da)
+++ lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -81,13 +81,13 @@
         	window.close();
 		}
     }  				
-</script>				
-<p id="saveCancelButtons" class="align-right">
-	<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button">
-		<fmt:message key="${saveButtonLabelKey}" /> 
-	</html:link>
-	<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="button">
-		<fmt:message key="${cancelButtonLabelKey}" />
-	</html:link>
+</script>	
+<p id="saveCancelButtons" >
+		<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="button right-buttons space-left">
+			<fmt:message key="${cancelButtonLabelKey}" />
+		</html:link>
+		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button right-buttons space-left">
+			<fmt:message key="${saveButtonLabelKey}" /> 
+		</html:link>
 </p>
 <!-- end tab content -->
\ No newline at end of file
Index: lams_tool_lamc/web/authoring/BasicContent.jsp
===================================================================
diff -u -r97811271c990c44fedeafc6dec2a4de9fbade0af -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 97811271c990c44fedeafc6dec2a4de9fbade0af)
+++ lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -129,7 +129,7 @@
 </p>
 
 <c:if test="${mcGeneralAuthoringDTO.activeModule != 'authoring'}">
-	<p align="right">
+	<p class="align-right">
 		<a href="javascript:submitMethod('submitAllContent')" class="button">
 			<fmt:message key="label.save" /> </a>
 	</p>
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
diff -u -r1fb5000c6fb50942b314afd54674e4126ec9abc9 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision 1fb5000c6fb50942b314afd54674e4126ec9abc9)
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -213,25 +213,26 @@
 
 				</c:if>
 			</c:if>
-
-			<h2>
-				<fmt:message key="label.notebook.entries" />
-			</h2>
-	
-			<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>
+			<c:if test="${mcGeneralLearnerFlowDTO.reflection}">
+				<h2>
+					<fmt:message key="label.notebook.entries" />
+				</h2>
+		
+				<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>
+			</c:if>
 							
 			<html:hidden property="doneLearnerProgress" />
 
Index: lams_tool_lamc/web/monitoring/editQuestionBox.jsp
===================================================================
diff -u -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_lamc/web/monitoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
+++ lams_tool_lamc/web/monitoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -206,7 +206,7 @@
 				
 				<tr>
 					<td>
-						<html:submit onclick="javascript:submitMethod('newCandidateBox');" style="float:right;width:150px"  styleClass="button-add-item">
+						<html:submit onclick="javascript:submitMethod('newCandidateBox');" style="width:150px"  styleClass="button-add-item float-right">
 			            	<fmt:message key="label.add.candidates" />
 						</html:submit>	 				 		  											
 					</td>
Index: lams_tool_lamc/web/monitoring/newQuestionBox.jsp
===================================================================
diff -u -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_lamc/web/monitoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
+++ lams_tool_lamc/web/monitoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -200,7 +200,7 @@
 				
 				<tr>
 					<td>
-						<html:submit onclick="javascript:submitMethod('newAddedCandidateBox');" style="float:right;width:150px"  styleClass="button-add-item">
+						<html:submit onclick="javascript:submitMethod('newAddedCandidateBox');" style="width:150px"  styleClass="button-add-item float-right">
 			            	<fmt:message key="label.add.candidates" />
 						</html:submit>	 				 		  											
 					</td>
Index: lams_tool_laqa/web/Template.jsp
===================================================================
diff -u -rb73ea10c36c8939d404f95b6e39cbcb4efbd64ba -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/Template.jsp	(.../Template.jsp)	(revision b73ea10c36c8939d404f95b6e39cbcb4efbd64ba)
+++ lams_tool_laqa/web/Template.jsp	(.../Template.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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 class="stripes" 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_laqa/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra393ce2c8a103a61062dbb5f5c7f9ae7c29a21da -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a393ce2c8a103a61062dbb5f5c7f9ae7c29a21da)
+++ lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -81,13 +81,13 @@
         	window.close();
 		}
     }  				
-</script>				
-<p id="saveCancelButtons" class="align-right">
-	<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button">
-		<fmt:message key="${saveButtonLabelKey}" /> 
-	</html:link>
-	<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="button">
-		<fmt:message key="${cancelButtonLabelKey}" />
-	</html:link>
+</script>	
+<p id="saveCancelButtons" >
+		<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="button right-buttons space-left">
+			<fmt:message key="${cancelButtonLabelKey}" />
+		</html:link>
+		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button right-buttons space-left">
+			<fmt:message key="${saveButtonLabelKey}" /> 
+		</html:link>
 </p>
 <!-- end tab content -->
\ No newline at end of file
Index: lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp
===================================================================
diff -u -r1046868d6997114f3b043778a68b371e03182faf -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision 1046868d6997114f3b043778a68b371e03182faf)
+++ lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -40,7 +40,7 @@
 		pageContext.setAttribute("tabsBasic", tabsBasic);
 	%>
 
-<html:html locale="true">		
+<lams:html>		
 	<head>
 	<title><fmt:message key="activity.title" /></title>
 
@@ -181,7 +181,7 @@
 
 
 </body>
-</html:html>
+</lams:html>
 
 
 
Index: lams_tool_laqa/web/authoring/BasicContent.jsp
===================================================================
diff -u -r1046868d6997114f3b043778a68b371e03182faf -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 1046868d6997114f3b043778a68b371e03182faf)
+++ lams_tool_laqa/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -131,7 +131,7 @@
 </p>
 
 <c:if test="${qaGeneralAuthoringDTO.activeModule != 'authoring'}">
-	<p align="right">
+	<p class="align-right">
 		<a href="javascript:submitMethod('submitAllContent')" class="button">
 			<fmt:message key="label.save" /> </a>
 	</p>
Index: lams_tool_laqa/web/authoring/BasicContentViewOnly.jsp
===================================================================
diff -u -r9ad7805407672e72dfc83fb0ba49ccafb0d43d6f -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/authoring/BasicContentViewOnly.jsp	(.../BasicContentViewOnly.jsp)	(revision 9ad7805407672e72dfc83fb0ba49ccafb0d43d6f)
+++ lams_tool_laqa/web/authoring/BasicContentViewOnly.jsp	(.../BasicContentViewOnly.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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_laqa/web/authoring/editQuestionBox.jsp
===================================================================
diff -u -r341f1fdf784407fc8301d4829145dff7224acd4a -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/authoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision 341f1fdf784407fc8301d4829145dff7224acd4a)
+++ lams_tool_laqa/web/authoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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" />
@@ -80,4 +80,4 @@
 		</html:form>
 
 	</body>
-</html>
+</lams:html>
Index: lams_tool_laqa/web/authoring/itemlist.jsp
===================================================================
diff -u -rc57ff53dca1350c876aed0ab150fbe0411b2d44f -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision c57ff53dca1350c876aed0ab150fbe0411b2d44f)
+++ lams_tool_laqa/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -44,15 +44,15 @@
 				value="${currentDTO.displayOrder}" />
 
 			<tr>
-				<td width="10%" align="right" class="field-name">
+				<td width="10%" class="field-name align-right">
 					<fmt:message key="label.question" />
 				</td>
 
-				<td width="60%" align="left">
+				<td width="60%" class="align-left">
 					<c:out value="${question}" escapeXml="false" />
 				</td>
 
-				<td width="12%" align="right">
+				<td width="12%" class="align-right">
 					<c:if test="${totalQuestionCount != 1}">
 
 						<c:if test="${queIndex == 1}">
@@ -85,14 +85,14 @@
 					</c:if>
 				</td>
 
-				<td width="10%" align="right">
+				<td width="10%" class="align-right">
 
 					<img src="<c:out value="${tool}"/>images/edit.gif" border="0"
 						title="<fmt:message key='label.tip.editQuestion'/>"
 						onclick="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newEditableQuestionBox&questionIndex=${queIndex}&contentFolderID=${qaGeneralAuthoringDTO.contentFolderID}&httpSessionID=${qaGeneralAuthoringDTO.httpSessionID}&toolContentID=${qaGeneralAuthoringDTO.toolContentID}&activeModule=${qaGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${qaGeneralAuthoringDTO.defaultContentIdStr}&synchInMonitor=${qaGeneralAuthoringDTO.synchInMonitor}&usernameVisible=${qaGeneralAuthoringDTO.usernameVisible}&lockWhenFinished=${qaGeneralAuthoringDTO.lockWhenFinished}&questionsSequenced=${qaGeneralAuthoringDTO.questionsSequenced}"/>');">
 				</td>
 
-				<td width="10%" align="right">
+				<td width="10%" class="align-right">
 					<img src="<c:out value="${tool}"/>images/delete.gif" border="0"
 						title="<fmt:message key='label.tip.deleteQuestion'/>"
 						onclick="removeQuestion(${queIndex});">
Index: lams_tool_laqa/web/authoring/itemlistViewOnly.jsp
===================================================================
diff -u -rcbd20e68556829e26401eb8f1955a706823afd04 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/authoring/itemlistViewOnly.jsp	(.../itemlistViewOnly.jsp)	(revision cbd20e68556829e26401eb8f1955a706823afd04)
+++ lams_tool_laqa/web/authoring/itemlistViewOnly.jsp	(.../itemlistViewOnly.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -37,23 +37,23 @@
 	<c:set var="displayOrder" scope="request" value="${currentDTO.displayOrder}"/>	
 
 	<tr>
-		<td width="10%" align="right" class="field-name">
+		<td width="10%" class="field-name align-right">
 			<fmt:message key="label.question" />:
 		</td>
 
-		<td width="60%" align="left">
+		<td width="60%" class="align-left">
 			<c:out value="${question}" escapeXml="false"/> 
 		</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>
 </c:forEach>
Index: lams_tool_laqa/web/authoring/newQuestionBox.jsp
===================================================================
diff -u -r341f1fdf784407fc8301d4829145dff7224acd4a -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision 341f1fdf784407fc8301d4829145dff7224acd4a)
+++ lams_tool_laqa/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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" />
@@ -76,4 +76,4 @@
 			</div>
 		</html:form>
 	</body>
-</html>
+</lams:html>
Index: lams_tool_laqa/web/export/exportportfolio.jsp
===================================================================
diff -u -rd7582fc2b696eb7ef9b0d340c2d532a70c29a611 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision d7582fc2b696eb7ef9b0d340c2d532a70c29a611)
+++ lams_tool_laqa/web/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -23,10 +23,11 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 
-	<html:html locale="true">
+	<lams:html>
 	<head>
-	<title> <fmt:message key="label.exportPortfolio"/> </title>
-	<lams:css localLinkPath="../"/>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<title> <fmt:message key="label.exportPortfolio"/> </title>
+		<lams:css localLinkPath="../"/>
 	</head>
 	<body class="stripes">
 
@@ -64,7 +65,7 @@
 			  	 			<td> &nbsp&nbsp&nbsp</td>
 			  	 		</tr>
 						<tr>			
-							<td NOWRAP valign=top align=left><b>  <fmt:message key="label.question"/> : </b> 
+							<td NOWRAP valign=top class="align-left"><b>  <fmt:message key="label.question"/> : </b> 
 								<c:out value="${currentDto.question}" escapeXml="false"/>
 							 </td>
 						</tr>	
@@ -97,14 +98,14 @@
 					</c:forEach>		  	
 
 						<tr>			
-							<td valign=top align=left>
+							<td valign=top class="align-left">
 								&nbsp
 							</td>
 						</tr>
 
 					
 						<tr>			
-							<td valign=top align=left>
+							<td valign=top class="align-left">
 								<table align=center>
 								
 										<tr>			
@@ -121,15 +122,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>	
@@ -152,7 +153,7 @@
 		</html:form>
 
 	</body>
-</html:html>
+</lams:html>
 
 
 
Index: lams_tool_laqa/web/includes/layout.jsp
===================================================================
diff -u -r9a8badc30e1305b21c85727950607d2335500a61 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/includes/layout.jsp	(.../layout.jsp)	(revision 9a8badc30e1305b21c85727950607d2335500a61)
+++ lams_tool_laqa/web/includes/layout.jsp	(.../layout.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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_laqa/web/includes/learnerLayout.jsp
===================================================================
diff -u -r9a8badc30e1305b21c85727950607d2335500a61 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/includes/learnerLayout.jsp	(.../learnerLayout.jsp)	(revision 9a8badc30e1305b21c85727950607d2335500a61)
+++ lams_tool_laqa/web/includes/learnerLayout.jsp	(.../learnerLayout.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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/header.jsp"%>
@@ -28,4 +28,4 @@
 	<body class="stripes">
 			<tiles:insert attribute="body" />
 	</body>
-</html>
+</lams:html>
Index: lams_tool_laqa/web/includes/tablayout.jsp
===================================================================
diff -u -r9a8badc30e1305b21c85727950607d2335500a61 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/includes/tablayout.jsp	(.../tablayout.jsp)	(revision 9a8badc30e1305b21c85727950607d2335500a61)
+++ lams_tool_laqa/web/includes/tablayout.jsp	(.../tablayout.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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/tabbedheader.jsp"%>
@@ -28,4 +28,4 @@
 			<div id="footer"></div>
 		</div>
 	</body>
-</html>
+</lams:html>
Index: lams_tool_laqa/web/layout/default.jsp
===================================================================
diff -u -r039a8dc7a77810d5b05c3cd88844ff1f9f01bdef -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/layout/default.jsp	(.../default.jsp)	(revision 039a8dc7a77810d5b05c3cd88844ff1f9f01bdef)
+++ lams_tool_laqa/web/layout/default.jsp	(.../default.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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 class="stripes">
 		<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_laqa/web/learning/AnswersContent.jsp
===================================================================
diff -u -rc8d9a37238c372484cad6929494a634523a52816 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision c8d9a37238c372484cad6929494a634523a52816)
+++ lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -31,7 +31,7 @@
 	<lams:WebAppURL />
 </c:set>
 
-<html:html>
+<lams:html>
 <head>
 	<html:base />
 
@@ -132,7 +132,7 @@
 	<div id="footer"></div>
 
 </body>
-</html:html>
+</lams:html>
 
 
 
Index: lams_tool_laqa/web/learning/CombinedAnswersContent.jsp
===================================================================
diff -u -r896248d87ee3eb2da93ba7a9f11ca2de11eb4040 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision 896248d87ee3eb2da93ba7a9f11ca2de11eb4040)
+++ lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -63,7 +63,7 @@
 
 </c:forEach>
  
- 	<div align="right" class="space-bottom-top">
+ 	<div class="space-bottom-top align-right">
 	
 		<html:button property="btnCombined"
 			onclick="javascript:submitMethod('submitAnswersContent');"
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -r1046868d6997114f3b043778a68b371e03182faf -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 1046868d6997114f3b043778a68b371e03182faf)
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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">
@@ -173,7 +173,7 @@
 	<div id="footer"></div>
 
 </body>
-</html:html>
+</lams:html>
 
 
 
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
diff -u -r64c99cc085211cff0d1ec2cb58892bf9c0cd8bc3 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 64c99cc085211cff0d1ec2cb58892bf9c0cd8bc3)
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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">
@@ -352,7 +352,7 @@
 	</div>
 	<div id="footer"></div>
 </body>
-</html:html>
+</lams:html>
 
 
 
Index: lams_tool_laqa/web/learning/Notebook.jsp
===================================================================
diff -u -r896248d87ee3eb2da93ba7a9f11ca2de11eb4040 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 896248d87ee3eb2da93ba7a9f11ca2de11eb4040)
+++ lams_tool_laqa/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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">
@@ -78,7 +78,7 @@
 			<html:textarea cols="60" rows="8" property="entryText"
 				styleClass="text-area"></html:textarea>
 
-			<div align="right" class="space-bottom-top">
+			<div class="space-bottom-top align-right">
 				<html:button property="submitReflection"
 					onclick="javascript:submitMethod('submitReflection');"
 					styleClass="button">
@@ -91,7 +91,7 @@
 	<div id="footer"></div>
 
 </body>
-</html:html>
+</lams:html>
 
 
 
Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
===================================================================
diff -u -r64c99cc085211cff0d1ec2cb58892bf9c0cd8bc3 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 64c99cc085211cff0d1ec2cb58892bf9c0cd8bc3)
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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">
@@ -327,7 +327,7 @@
 							</html:button>
 						</c:if>						
 
-						<div class="space-bottom-top" align="right">
+						<div class="space-bottom-top align-right">
 								<html:button property="endLearning"
 									onclick="javascript:submitMethod('endLearning');"
 									styleClass="button">
@@ -349,7 +349,7 @@
 						</c:if>						
 
 
-						<div class="space-bottom-top" align="right">
+						<div class="space-bottom-top align-right" >
 								<html:button property="endLearning"
 									onclick="javascript:submitMethod('endLearning');"
 									styleClass="button">
@@ -365,7 +365,7 @@
 	</div>
 	<div id="footer"></div>
 </body>
-</html:html>
+</lams:html>
 
 
 
Index: lams_tool_laqa/web/learning/RunOffline.jsp
===================================================================
diff -u -r896248d87ee3eb2da93ba7a9f11ca2de11eb4040 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/learning/RunOffline.jsp	(.../RunOffline.jsp)	(revision 896248d87ee3eb2da93ba7a9f11ca2de11eb4040)
+++ lams_tool_laqa/web/learning/RunOffline.jsp	(.../RunOffline.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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">
@@ -68,7 +68,7 @@
 				<fmt:message key="label.learning.forceOfflineMessage" />
 			</p>
 
-			<div align="right" class="space-bottom-top">
+			<div class="space-bottom-top align-right">
 
 				<c:if test="${generalLearnerFlowDTO.reflection != 'true'}">
 					<html:button property="endLearning"
@@ -91,7 +91,7 @@
 	</html:form>
 	<div id="footer"></div>
 </body>
-</html:html>
+</lams:html>
 
 
 
Index: lams_tool_laqa/web/learning/defineLater.jsp
===================================================================
diff -u -r896248d87ee3eb2da93ba7a9f11ca2de11eb4040 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 896248d87ee3eb2da93ba7a9f11ca2de11eb4040)
+++ lams_tool_laqa/web/learning/defineLater.jsp	(.../defineLater.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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">
@@ -49,7 +49,7 @@
 
 
 </body>
-</html:html>
+</lams:html>
 
 
 
Index: lams_tool_laqa/web/monitoring/AllSessionsSummary.jsp
===================================================================
diff -u -rd7582fc2b696eb7ef9b0d340c2d532a70c29a611 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/monitoring/AllSessionsSummary.jsp	(.../AllSessionsSummary.jsp)	(revision d7582fc2b696eb7ef9b0d340c2d532a70c29a611)
+++ lams_tool_laqa/web/monitoring/AllSessionsSummary.jsp	(.../AllSessionsSummary.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -37,7 +37,7 @@
 
 			  	 		
 						<tr>			
-							<td valign=top align=left><b>  <fmt:message key="label.question"/> : </b> 
+							<td valign=top class="align-left"><b>  <fmt:message key="label.question"/> : </b> 
 								<c:out value="${currentDto.question}" escapeXml="false"/>
 							 </td>
 						</tr>	
@@ -61,14 +61,14 @@
 																 <td  valign=top>  <c:out value="${userData.userName}"/>   </td>  
 																 <td  valign=top>   <lams:Date value="${userData.attemptTime}"/> </td>														 
 																 
-																  <td align=right valign=top width="150"> 
+																  <td class="align-right" valign=top width="150"> 
 																	<b> <fmt:message key="label.edit"/> </b>
 																	<a title="<fmt:message key='label.tooltip.edit'/>" href="javascript:;" onclick="javascript:submitEditGroupResponse('<c:out value="${sessionId}"/>','<c:out value="${userData.uid}"/>','editGroupResponse');">
 								                                                <img src="<c:out value="${tool}"/>images/edit.gif" border="0">
 																	</a> 
 																  </td>
 	
-			   													 <td align=right valign=top> 				 
+			   													 <td class="align-right" valign=top> 				 
 																	<c:if test="${userData.visible == 'true' }"> 			
 													                            <html:submit property="hideResponse" 
 													                                         styleClass="linkbutton" 
@@ -108,7 +108,7 @@
 																		 <td valign=top>  <c:out value="${userData.userName}"/>   </td>  
 																		 <td valign=top>   <lams:Date value="${userData.attemptTime}"/> </td>														 
 															
-																		  <td align=right valign=top width="150">  
+																		  <td class="align-right" valign=top width="150">  
 																		  	<b> <fmt:message key="label.save"/> </b>
 		
 																			<a title="<fmt:message key='label.tooltip.tick'/>" href="javascript:;" onclick="javascript:submitEditGroupResponse('<c:out value="${sessionId}"/>','<c:out value="${userData.uid}"/>','updateGroupResponse');">
@@ -117,7 +117,7 @@
 																		  </td>	  	 																	
 															
 		
-					   													 <td align=right valign=top> 				 
+					   													 <td class="align-right" valign=top> 				 
 																			<c:if test="${userData.visible == 'true' }"> 			
 															                            <html:submit property="hideResponse" 
 															                                         styleClass="linkbutton" 
@@ -154,14 +154,14 @@
 																	 <td valign=top>  <c:out value="${userData.userName}"/>   </td>  
 																	 <td valign=top>   <lams:Date value="${userData.attemptTime}"/> </td>														 
 	
-																	  <td align=right valign=top width="150"> 
+																	  <td class="align-right" valign=top width="150"> 
 																		 <b> <fmt:message key="label.edit"/> </b>
 																		<a title="<fmt:message key='label.tooltip.edit'/>" href="javascript:;" onclick="javascript:submitEditGroupResponse('<c:out value="${sessionId}"/>','<c:out value="${userData.uid}"/>','editGroupResponse');">
 									                                                <img src="<c:out value="${tool}"/>images/edit.gif" border="0">
 																		</a> 
 																	  </td>	  	 
 	
-				   													 <td align=right valign=top> 				 
+				   													 <td class="align-right" valign=top> 				 
 																		<c:if test="${userData.visible == 'true' }"> 			
 														                            <html:submit property="hideResponse" 
 														                                         styleClass="linkbutton" 
Index: lams_tool_laqa/web/monitoring/IndividualSessionSummary.jsp
===================================================================
diff -u -rd7582fc2b696eb7ef9b0d340c2d532a70c29a611 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/monitoring/IndividualSessionSummary.jsp	(.../IndividualSessionSummary.jsp)	(revision d7582fc2b696eb7ef9b0d340c2d532a70c29a611)
+++ lams_tool_laqa/web/monitoring/IndividualSessionSummary.jsp	(.../IndividualSessionSummary.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -31,7 +31,7 @@
 			  	 		
 			  	 		
 						<tr>			
-							<td valign=top align=left><b>  <fmt:message key="label.question"/> : </b> 
+							<td valign=top class="align-left"><b>  <fmt:message key="label.question"/> : </b> 
 								<c:out value="${currentDto.question}" escapeXml="false"/>
 							 </td>
 						</tr>	
@@ -51,14 +51,14 @@
 															 <td  valign=top>  <c:out value="${userData.userName}"/>   </td>  
 															 <td  valign=top>   <lams:Date value="${userData.attemptTime}"/> </td>														 
 															 
-															  <td align=right valign=top width="150"> 
+															  <td class="align-right" valign=top width="150"> 
 																<b> <fmt:message key="label.edit"/> </b>
 																<a title="<fmt:message key='label.tooltip.edit'/>" href="javascript:;" onclick="javascript:submitEditResponse('<c:out value="${userData.uid}"/>','editResponse');">
 							                                                <img src="<c:out value="${tool}"/>images/edit.gif" border="0">
 																</a> 
 															  </td>
 
-		   													 <td align=right valign=top> 				 
+		   													 <td class="align-right" valign=top> 				 
 																<c:if test="${userData.visible == 'true' }"> 			
 												                            <html:submit property="hideResponse" 
 												                                         styleClass="linkbutton" 
@@ -95,7 +95,7 @@
 																 <td valign=top>  <c:out value="${userData.userName}"/>   </td>  
 																 <td valign=top>   <lams:Date value="${userData.attemptTime}"/> </td>														 
 													
-																  <td align=right valign=top width="150">  
+																  <td class="align-right" valign=top width="150">  
 																  	<b> <fmt:message key="label.save"/> </b>
 
 																	<a title="<fmt:message key='label.tooltip.tick'/>" href="javascript:;" onclick="javascript:submitEditResponse('<c:out value="${userData.uid}"/>','updateResponse');">
@@ -104,7 +104,7 @@
 																  </td>	  	 																	
 													
 
-			   													 <td align=right valign=top> 				 
+			   													 <td class="align-right" valign=top> 				 
 																	<c:if test="${userData.visible == 'true' }"> 			
 													                            <html:submit property="hideResponse" 
 													                                         styleClass="linkbutton" 
@@ -141,14 +141,14 @@
 																 <td valign=top>  <c:out value="${userData.userName}"/>   </td>  
 																 <td valign=top>   <lams:Date value="${userData.attemptTime}"/> </td>														 
 
-																  <td align=right valign=top width="150"> 
+																  <td class="align-right" valign=top width="150"> 
 																	 <b> <fmt:message key="label.edit"/> </b>
 																	<a title="<fmt:message key='label.tooltip.edit'/>" href="javascript:;" onclick="javascript:submitEditResponse('<c:out value="${userData.uid}"/>','editResponse');">
 								                                                <img src="<c:out value="${tool}"/>images/edit.gif" border="0">
 																	</a> 
 																  </td>	  	 
 
-			   													 <td align=right valign=top> 				 
+			   													 <td class="align-right" valign=top> 				 
 																	<c:if test="${userData.visible == 'true' }"> 			
 													                            <html:submit property="hideResponse" 
 													                                         styleClass="linkbutton" 
Index: lams_tool_laqa/web/monitoring/Instructions.jsp
===================================================================
diff -u -rd7582fc2b696eb7ef9b0d340c2d532a70c29a611 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/monitoring/Instructions.jsp	(.../Instructions.jsp)	(revision d7582fc2b696eb7ef9b0d340c2d532a70c29a611)
+++ lams_tool_laqa/web/monitoring/Instructions.jsp	(.../Instructions.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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="${qaGeneralMonitoringDTO.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="${qaGeneralMonitoringDTO.attachmentList}">
 											<c:if test="${attachment.fileOnline == false}"> 			
Index: lams_tool_laqa/web/monitoring/LearnerNotebook.jsp
===================================================================
diff -u -rd7582fc2b696eb7ef9b0d340c2d532a70c29a611 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/monitoring/LearnerNotebook.jsp	(.../LearnerNotebook.jsp)	(revision d7582fc2b696eb7ef9b0d340c2d532a70c29a611)
+++ lams_tool_laqa/web/monitoring/LearnerNotebook.jsp	(.../LearnerNotebook.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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">
@@ -81,7 +81,7 @@
 
 
 </body>
-</html:html>
+</lams:html>
 
 
 
Index: lams_tool_laqa/web/monitoring/LearnerRep.jsp
===================================================================
diff -u -rd7582fc2b696eb7ef9b0d340c2d532a70c29a611 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/monitoring/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision d7582fc2b696eb7ef9b0d340c2d532a70c29a611)
+++ lams_tool_laqa/web/monitoring/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -23,7 +23,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 
-<html:html locale="true">
+<lams:html>
 <head>
 	<title> <fmt:message key="activity.title"/> </title>
 
@@ -90,8 +90,8 @@
 			<jsp:include page="/monitoring/SummaryContent.jsp" />
 
 				<c:if test="${ requestLearningReportViewOnly == 'true'}"> 			
-			       	<table class="forms" align=right> 	  
-							<tr> <td align=right> 
+			       	<table class="forms align-right"> 	  
+							<tr> <td class="align-right"> 
 								 <fmt:message key="label.learning.forceFinish"/> &nbsp&nbsp
 
 								<html:submit onclick="javascript:submitMethod('endLearning');" styleClass="button">
@@ -103,8 +103,8 @@
 				</c:if> 			
 
 				<c:if test="${ requestLearningReportViewOnly != 'true'}"> 			
-			       	<table class="forms" align=right> 	  
-							<tr> <td align=right> 
+			       	<table class="forms align-right" > 	  
+							<tr> <td class="align-right"> 
 								<html:submit onclick="javascript:submitMethod('endLearning');" styleClass="button">
 									<fmt:message key="button.endLearning"/>
 								</html:submit>	 				 		  					
@@ -137,7 +137,7 @@
 </c:if> 				    
 
 </body>
-</html:html>
+</lams:html>
 
 
 
Index: lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -race8b408295af831e2715b2013d64a000aa09549 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision ace8b408295af831e2715b2013d64a000aa09549)
+++ lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -36,7 +36,7 @@
 		
 	%>
 
-	<html:html locale="true">
+	<lams:html>
 	<head>
 	<title><fmt:message key="activity.title" /></title>
 
@@ -172,4 +172,4 @@
 	</div>
 	
 </body>
-</html:html>
+</lams:html>
Index: lams_tool_laqa/web/monitoring/Reflections.jsp
===================================================================
diff -u -rd7582fc2b696eb7ef9b0d340c2d532a70c29a611 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/monitoring/Reflections.jsp	(.../Reflections.jsp)	(revision d7582fc2b696eb7ef9b0d340c2d532a70c29a611)
+++ lams_tool_laqa/web/monitoring/Reflections.jsp	(.../Reflections.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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_laqa/web/monitoring/editQuestionBox.jsp
===================================================================
diff -u -r6f9a82945ad22a613ebdf36b17d6b1294d81eac0 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/monitoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision 6f9a82945ad22a613ebdf36b17d6b1294d81eac0)
+++ lams_tool_laqa/web/monitoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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"%>
 		
@@ -114,4 +114,4 @@
 		</table>
 
 	</body>
-</html>
\ No newline at end of file
+</lams:html>
\ No newline at end of file
Index: lams_tool_laqa/web/monitoring/itemlist.jsp
===================================================================
diff -u -r47ed08dc3daff962ae3af84bef5d38bb531eeabb -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/monitoring/itemlist.jsp	(.../itemlist.jsp)	(revision 47ed08dc3daff962ae3af84bef5d38bb531eeabb)
+++ lams_tool_laqa/web/monitoring/itemlist.jsp	(.../itemlist.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -36,16 +36,16 @@
 	<c:set var="displayOrder" scope="request" value="${currentDTO.displayOrder}"/>	
 
 	<tr>
-		<td width="10%" align="right" class="field-name">
+		<td width="10%" class="field-name align-right">
 			<fmt:message key="label.question" />:
 		</td>
 
-		<td width="60%" align="left">
+		<td width="60%" class="align-left">
 			<c:out value="${question}" escapeXml="false"/> 
 		</td>		
 
 
-			<td width="10%" align="right">
+			<td width="10%" class="align-right">
 		 		<c:if test="${totalQuestionCount != 1}"> 		
 		 		
 			 		<c:if test="${queIndex == 1}"> 		
@@ -76,13 +76,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=${qaGeneralAuthoringDTO.contentFolderID}&httpSessionID=${qaGeneralAuthoringDTO.httpSessionID}&toolContentID=${qaGeneralAuthoringDTO.toolContentID}&activeModule=${qaGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${qaGeneralAuthoringDTO.defaultContentIdStr}&synchInMonitor=${qaGeneralAuthoringDTO.synchInMonitor}&usernameVisible=${qaGeneralAuthoringDTO.usernameVisible}&lockWhenFinished=${qaGeneralAuthoringDTO.lockWhenFinished}&questionsSequenced=${qaGeneralAuthoringDTO.questionsSequenced}"/>');">
 	                    <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_laqa/web/monitoring/newQuestionBox.jsp
===================================================================
diff -u -r6f9a82945ad22a613ebdf36b17d6b1294d81eac0 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_laqa/web/monitoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision 6f9a82945ad22a613ebdf36b17d6b1294d81eac0)
+++ lams_tool_laqa/web/monitoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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"%>
 		
@@ -110,4 +110,4 @@
 		</table>
 
 	</body>
-</html>
\ No newline at end of file
+</lams:html>
\ No newline at end of file
Index: lams_tool_vote/web/Template.jsp
===================================================================
diff -u -rb73ea10c36c8939d404f95b6e39cbcb4efbd64ba -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/Template.jsp	(.../Template.jsp)	(revision b73ea10c36c8939d404f95b6e39cbcb4efbd64ba)
+++ lams_tool_vote/web/Template.jsp	(.../Template.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -34,7 +34,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 class="stripes" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
       <table width="900" border="0" cellspacing="0" cellpadding="0" align="center"> 
@@ -50,4 +50,4 @@
 	        <!-- end of footer -->
       </table>
     </body>
-</html:html>
+</lams:html>
Index: lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra393ce2c8a103a61062dbb5f5c7f9ae7c29a21da -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a393ce2c8a103a61062dbb5f5c7f9ae7c29a21da)
+++ lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -81,13 +81,13 @@
         	window.close();
 		}
     }  				
-</script>				
-<p id="saveCancelButtons" class="align-right">
-	<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button">
-		<fmt:message key="${saveButtonLabelKey}" /> 
-	</html:link>
-	<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="button">
-		<fmt:message key="${cancelButtonLabelKey}" />
-	</html:link>
+</script>	
+<p id="saveCancelButtons" >
+		<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="button right-buttons space-left">
+			<fmt:message key="${cancelButtonLabelKey}" />
+		</html:link>
+		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button right-buttons space-left">
+			<fmt:message key="${saveButtonLabelKey}" /> 
+		</html:link>
 </p>
 <!-- end tab content -->
\ No newline at end of file
Index: lams_tool_vote/web/authoring/AuthoringMaincontent.jsp
===================================================================
diff -u -race8b408295af831e2715b2013d64a000aa09549 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/authoring/AuthoringMaincontent.jsp	(.../AuthoringMaincontent.jsp)	(revision ace8b408295af831e2715b2013d64a000aa09549)
+++ lams_tool_vote/web/authoring/AuthoringMaincontent.jsp	(.../AuthoringMaincontent.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -40,7 +40,7 @@
 		pageContext.setAttribute("tabsBasic", tabsBasic);
 	%>
 
-	<html:html locale="true">
+	<lams:html>
 	<head>
 	<title> <fmt:message key="activity.title"/>  </title>
 
@@ -187,4 +187,4 @@
 
 
 </body>
-</html:html>
+</lams:html>
Index: lams_tool_vote/web/authoring/BasicContent.jsp
===================================================================
diff -u -ra1f83079a0fedc3d6982fde779286d0246847339 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision a1f83079a0fedc3d6982fde779286d0246847339)
+++ lams_tool_vote/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -139,7 +139,7 @@
 </p>
 
 <c:if test="${voteGeneralAuthoringDTO.activeModule != 'authoring'}">
-	<p align="right">
+	<p class="align-right">
 		<a href="javascript:submitMethod('submitAllContent')" class="button">
 			<fmt:message key="label.save" /> </a>
 	</p>
Index: lams_tool_vote/web/authoring/BasicContentViewOnly.jsp
===================================================================
diff -u -r9ad7805407672e72dfc83fb0ba49ccafb0d43d6f -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/authoring/BasicContentViewOnly.jsp	(.../BasicContentViewOnly.jsp)	(revision 9ad7805407672e72dfc83fb0ba49ccafb0d43d6f)
+++ lams_tool_vote/web/authoring/BasicContentViewOnly.jsp	(.../BasicContentViewOnly.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -52,7 +52,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_vote/web/authoring/editNominationBox.jsp
===================================================================
diff -u -r341f1fdf784407fc8301d4829145dff7224acd4a -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/authoring/editNominationBox.jsp	(.../editNominationBox.jsp)	(revision 341f1fdf784407fc8301d4829145dff7224acd4a)
+++ lams_tool_vote/web/authoring/editNominationBox.jsp	(.../editNominationBox.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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" />
@@ -67,4 +67,4 @@
 
 
 	</body>
-</html>
+</lams:html>
Index: lams_tool_vote/web/authoring/itemlist.jsp
===================================================================
diff -u -r40cc7f787a9c3d0a6a6561788fd5fae375938507 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 40cc7f787a9c3d0a6a6561788fd5fae375938507)
+++ lams_tool_vote/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -42,7 +42,7 @@
 				value="${currentDTO.displayOrder}" />
 
 			<tr>
-				<td width="10%" align="right" class="field-name">
+				<td width="10%" class="field-name align-right">
 					<fmt:message key="label.nomination" />
 				</td>
 
@@ -52,7 +52,7 @@
 
 
 
-				<td width="10%" align="right">
+				<td width="10%" class="align-right">
 					<c:if test="${totalNominationCount != 1}">
 
 						<c:if test="${queIndex == 1}">
@@ -84,13 +84,13 @@
 					</c:if>
 				</td>
 
-				<td width="10%" align="right">
+				<td width="10%" class="align-right">
 					<img src="<c:out value="${tool}"/>images/edit.gif" border="0"
 						title="<fmt:message key='label.tip.editNomination'/>"
 						onclick="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newEditableNominationBox&questionIndex=${queIndex}&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&activeModule=${voteGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${voteGeneralAuthoringDTO.defaultContentIdStr}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}&reflectionSubject=${voteGeneralAuthoringDTO.reflectionSubject}"/>');">
 				</td>
 
-				<td width="10%" align="right">
+				<td width="10%" class="align-right">
 					<img src="<c:out value="${tool}"/>images/delete.gif" border="0"
 						title="<fmt:message key='label.tip.deleteNomination'/>"
 						onclick="removeNomination(${queIndex});">
Index: lams_tool_vote/web/authoring/itemlistViewOnly.jsp
===================================================================
diff -u -r3011a0fefecbd998ae5fa8af69eb0b037e1970e6 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/authoring/itemlistViewOnly.jsp	(.../itemlistViewOnly.jsp)	(revision 3011a0fefecbd998ae5fa8af69eb0b037e1970e6)
+++ lams_tool_vote/web/authoring/itemlistViewOnly.jsp	(.../itemlistViewOnly.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -37,7 +37,7 @@
 	<c:set var="displayOrder" scope="request" value="${currentDTO.displayOrder}"/>	
 
 	<tr>
-		<td width="10%" align="right" class="field-name">
+		<td width="10%" class="field-name align-right">
 			<fmt:message key="label.nomination" />:
 		</td>
 
@@ -46,14 +46,14 @@
 		</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>
 </c:forEach>
Index: lams_tool_vote/web/authoring/newNominationBox.jsp
===================================================================
diff -u -r341f1fdf784407fc8301d4829145dff7224acd4a -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/authoring/newNominationBox.jsp	(.../newNominationBox.jsp)	(revision 341f1fdf784407fc8301d4829145dff7224acd4a)
+++ lams_tool_vote/web/authoring/newNominationBox.jsp	(.../newNominationBox.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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" />
@@ -61,4 +61,4 @@
 
 		</html:form>
 	</body>
-</html>
+</lams:html>
Index: lams_tool_vote/web/export/ExportContent.jsp
===================================================================
diff -u -r05f0776f9ed9f80ad24452e9d1718e8a24ed8e62 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/export/ExportContent.jsp	(.../ExportContent.jsp)	(revision 05f0776f9ed9f80ad24452e9d1718e8a24ed8e62)
+++ lams_tool_vote/web/export/ExportContent.jsp	(.../ExportContent.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -27,7 +27,7 @@
  				
 			<table  class="forms">
 						<tr>
-							<td NOWRAP valign=top align=left>
+							<td NOWRAP valign=top class="align-left">
 								<table>
 
 									<c:if test="${(exportPortfolioDto.portfolioExportMode == 'learner')}">
@@ -43,11 +43,11 @@
 										<c:forEach var="currentNomination" items="${exportPortfolioDto.mapStandardNominationsHTMLedContent}">
 								  	 		<c:set var="currentNominationKey" scope="request" value="${currentNomination.key}"/>
 								  	 		 <tr>
-					  	 						<td NOWRAP valign=top align=left>
+					  	 						<td NOWRAP valign=top class="align-left">
 													<c:out value="${currentNomination.value}" escapeXml="false"/>
 												 </td>
 				
-												<td NOWRAP valign=top align=left>				  	 		
+												<td NOWRAP valign=top class="align-left">				  	 		
 										  	 		<c:forEach var="currentUserCount" items="${exportPortfolioDto.mapStandardUserCount}">
 											  	 		<c:set var="currentUserKey" scope="request" value="${currentUserCount.key}"/>
 										  				<c:if test="${currentNominationKey == currentUserKey}"> 				
@@ -68,25 +68,25 @@
 										
 										<tr>
 									 		<td NOWRAP colspan=2>
-								 			<table align=left>
+								 			<table class="align-left">
 														<tr>
 													 		<th NOWRAP colspan=2>  <fmt:message key="label.openVotes"/>  </th>
 														</tr>
 			
 														<tr> 
-															 <td NOWRAP valign=top align=left> <b>   <fmt:message key="label.vote"/>  </b> </td>  														 
-									  						 <td NOWRAP valign=top align=left> <b>   <fmt:message key="label.attemptTime"/> </b></td>
+															 <td NOWRAP valign=top class="align-left"> <b>   <fmt:message key="label.vote"/>  </b> </td>  														 
+									  						 <td NOWRAP valign=top class="align-left"> <b>   <fmt:message key="label.attemptTime"/> </b></td>
 											  			</tr>				 
 													
 								 			
 													<c:forEach var="currentDto" items="${exportPortfolioDto.listUserEntries}">
 								  							<c:forEach var="questionAttemptData" items="${currentDto.questionAttempts}">
 													  	 		<c:set var="userData" scope="request" value="${questionAttemptData.value}"/>
 																<tr> 
-																		<td NOWRAP valign=top align=left> 
+																		<td NOWRAP valign=top class="align-left"> 
 																				<c:out value="${currentDto.question}" escapeXml="false"/> 
 																		</td>
-																		 <td NOWRAP valign=top align=left>   
+																		 <td NOWRAP valign=top class="align-left">   
 																			<lams:Date value="${userData.attemptTime}"/> 
 																		 </td>
 																</tr>		
@@ -112,11 +112,11 @@
 										<c:forEach var="currentNomination" items="${exportPortfolioDto.mapStandardNominationsHTMLedContent}">
 								  	 		<c:set var="currentNominationKey" scope="request" value="${currentNomination.key}"/>
 								  	 		 <tr>
-					  	 						<td NOWRAP valign=top align=left>
+					  	 						<td NOWRAP valign=top class="align-left">
 													<c:out value="${currentNomination.value}" escapeXml="false"/>
 												 </td>
 				
-												<td NOWRAP valign=top align=left>				  	 		
+												<td NOWRAP valign=top class="align-left">				  	 		
 										  	 		<c:forEach var="currentUserCount" items="${exportPortfolioDto.mapStandardUserCount}">
 											  	 		<c:set var="currentUserKey" scope="request" value="${currentUserCount.key}"/>
 										  				<c:if test="${currentNominationKey == currentUserKey}"> 				
@@ -137,15 +137,15 @@
 										
 								<tr>
 							 		<td NOWRAP colspan=2>
-						 			<table align=left>
+						 			<table class="align-left">
 												<tr>
 											 		<th NOWRAP colspan=3>  <fmt:message key="label.openVotes"/>  </th>
 												</tr>
 	
 												<tr> 
-													 <td NOWRAP valign=top align=left> <b>   <fmt:message key="label.vote"/>  </b> </td>  														 
-													 <td NOWRAP valign=top align=left> <b>   <fmt:message key="label.user"/>  </b> </td>  
-							  						 <td NOWRAP valign=top align=left> <b>   <fmt:message key="label.attemptTime"/> </b></td>
+													 <td NOWRAP valign=top class="align-left"> <b>   <fmt:message key="label.vote"/>  </b> </td>  														 
+													 <td NOWRAP valign=top class="align-left"> <b>   <fmt:message key="label.user"/>  </b> </td>  
+							  						 <td NOWRAP valign=top class="align-left"> <b>   <fmt:message key="label.attemptTime"/> </b></td>
 									  			</tr>				 
 											
 						 			
@@ -154,15 +154,15 @@
 											  	 		<c:set var="userData" scope="request" value="${questionAttemptData.value}"/>
 		  	 									  	 		<c:set var="currentUid" scope="request" value="${userData.uid}"/>
 														<tr> 
-																<td NOWRAP valign=top align=left> 
+																<td NOWRAP valign=top class="align-left"> 
 																	<c:out value="${currentDto.question}" escapeXml="false"/> 
 																	<c:if test="${userData.visible != 'true' }"> 			
 												                                 <i><fmt:message key="label.hidden"/> </i> 
 																	</c:if> 								
 																</td>
 																 
-																 <td NOWRAP valign=top align=left>    <c:out value="${userData.userName}"/>   </td>  
-																 <td NOWRAP valign=top align=left>    <lams:Date value="${userData.attemptTime}"/>  </td>																 
+																 <td NOWRAP valign=top class="align-left">    <c:out value="${userData.userName}"/>   </td>  
+																 <td NOWRAP valign=top class="align-left">    <lams:Date value="${userData.attemptTime}"/>  </td>																 
 																 
 														</tr>		
 													</c:forEach>		  	
@@ -180,13 +180,13 @@
 
 
 						 <tr> 
-					       <td NOWRAP valign=top align=left >
+					       <td NOWRAP valign=top class="align-left" >
 					        <IMG SRC="pie.png" ALT="Pie Chart"/>
 					       </td>
 					      </tr>
 					
 					      <tr> 
-					       <td NOWRAP valign=top align=left >
+					       <td NOWRAP valign=top class="align-left" >
 					        <IMG SRC="bar.png" ALT="Bar Chart"/>
 					       </td>
 					      </tr>						
@@ -208,8 +208,8 @@
 
 
 							<tr>
-								<td NOWRAP valign=top align=left>
-					 			<table align=left>
+								<td NOWRAP valign=top class="align-left">
+					 			<table class="align-left">
 					 			
 									<c:if test="${(exportPortfolioDto.portfolioExportMode == 'learner')}">
 										<tr>
@@ -232,7 +232,7 @@
 						  	 			<td> &nbsp&nbsp</td>
 						  	 		</tr>
 									<tr>			
-										<td NOWRAP valign=top align=left><b>  <fmt:message key="label.nomination"/>: </b>
+										<td NOWRAP valign=top class="align-left"><b>  <fmt:message key="label.nomination"/>: </b>
 											<c:out value="${currentDto.question}" escapeXml="false"/>
 										 </td>
 									</tr>	
@@ -269,7 +269,7 @@
 						  	 			<td> &nbsp&nbsp</td>
 						  	 		</tr>
 									<tr>			
-										<td NOWRAP valign=top align=left><b>  <fmt:message key="label.nomination"/>: </b>
+										<td NOWRAP valign=top class="align-left"><b>  <fmt:message key="label.nomination"/>: </b>
 											<c:out value="${currentDto.question}" escapeXml="false"/>
 										 </td>
 									</tr>	
@@ -305,14 +305,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>
@@ -328,15 +328,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_vote/web/export/exportportfolio.jsp
===================================================================
diff -u -r94eb7bada81814941189436f343e9cf395e348f4 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 94eb7bada81814941189436f343e9cf395e348f4)
+++ lams_tool_vote/web/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -24,7 +24,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 
-	<html:html locale="true">
+	<lams:html>
 	<head>
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<title> <fmt:message key="label.export"/> </title>
@@ -68,7 +68,7 @@
 	
 		</html:form>
 </body>
-</html:html>
+</lams:html>
 
 
 
Index: lams_tool_vote/web/includes/layout.jsp
===================================================================
diff -u -r9a8badc30e1305b21c85727950607d2335500a61 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/includes/layout.jsp	(.../layout.jsp)	(revision 9a8badc30e1305b21c85727950607d2335500a61)
+++ lams_tool_vote/web/includes/layout.jsp	(.../layout.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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_vote/web/includes/learnerLayout.jsp
===================================================================
diff -u -r9a8badc30e1305b21c85727950607d2335500a61 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/includes/learnerLayout.jsp	(.../learnerLayout.jsp)	(revision 9a8badc30e1305b21c85727950607d2335500a61)
+++ lams_tool_vote/web/includes/learnerLayout.jsp	(.../learnerLayout.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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/header.jsp"%>
@@ -31,4 +31,4 @@
 		</div>
 		<div id="footer"></div>
 </body>
-</html>
+</lams:html>
Index: lams_tool_vote/web/includes/tablayout.jsp
===================================================================
diff -u -r9a8badc30e1305b21c85727950607d2335500a61 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/includes/tablayout.jsp	(.../tablayout.jsp)	(revision 9a8badc30e1305b21c85727950607d2335500a61)
+++ lams_tool_vote/web/includes/tablayout.jsp	(.../tablayout.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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/tabbedheader.jsp"%>
@@ -28,4 +28,4 @@
 			<div id="footer"></div>
 		</div>
 	</body>
-</html>
+</lams:html>
Index: lams_tool_vote/web/layout/default.jsp
===================================================================
diff -u -r9a8badc30e1305b21c85727950607d2335500a61 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/layout/default.jsp	(.../default.jsp)	(revision 9a8badc30e1305b21c85727950607d2335500a61)
+++ lams_tool_vote/web/layout/default.jsp	(.../default.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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 class="stripes">
 		<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_vote/web/learning/AllNominations.jsp
===================================================================
diff -u -r96c1c8dd84ea09aae381a617c58166f220277537 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision 96c1c8dd84ea09aae381a617c58166f220277537)
+++ lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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">
@@ -158,7 +158,7 @@
 			</table>
 
 			<div>
-				<div style="float:right">
+				<div class="float-right">
 
 					<c:set scope="request" var="viewURL">
 						<html:rewrite page="/chartGenerator?type=pie" />
@@ -245,7 +245,7 @@
 	<div id="footer"></div>
 
 </body>
-</html:html>
+</lams:html>
 
 
 
Index: lams_tool_vote/web/learning/AnswersContent.jsp
===================================================================
diff -u -rf68139b4cb3d21cc94f4bd31567bf0dffc367e96 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision f68139b4cb3d21cc94f4bd31567bf0dffc367e96)
+++ lams_tool_vote/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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">
@@ -184,4 +184,4 @@
 	<div id="footer"></div>
 
 </body>
-</html:html>
+</lams:html>
Index: lams_tool_vote/web/learning/ExitLearning.jsp
===================================================================
diff -u -rdd716853c1f9f203d058014938ce31957b7173c3 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/learning/ExitLearning.jsp	(.../ExitLearning.jsp)	(revision dd716853c1f9f203d058014938ce31957b7173c3)
+++ lams_tool_vote/web/learning/ExitLearning.jsp	(.../ExitLearning.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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">
@@ -157,7 +157,7 @@
 			</table>
 
 			<div>
-				<div style="float:right">
+				<div class="float-right">
 
 					<c:set scope="request" var="viewURL">
 						<html:rewrite page="/chartGenerator?type=pie" />
@@ -207,7 +207,7 @@
 
 
 
-			<div align="right" class="space-bottom-top">
+			<div class="space-bottom-top align-right">
 				<html:submit property="learnerFinished" styleClass="button"
 					onclick="submitMethod('learnerFinished');">
 					<fmt:message key="label.finished" />
@@ -220,4 +220,4 @@
 
 	<div id="footer"></div>
 </body>
-</html:html>
+</lams:html>
Index: lams_tool_vote/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -rf68139b4cb3d21cc94f4bd31567bf0dffc367e96 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision f68139b4cb3d21cc94f4bd31567bf0dffc367e96)
+++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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">
@@ -106,4 +106,4 @@
 	</div>
 	<div id="footer"></div>
 </body>
-</html:html>
+</lams:html>
Index: lams_tool_vote/web/learning/LearnerRep.jsp
===================================================================
diff -u -r05f0776f9ed9f80ad24452e9d1718e8a24ed8e62 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 05f0776f9ed9f80ad24452e9d1718e8a24ed8e62)
+++ lams_tool_vote/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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">
@@ -78,16 +78,16 @@
 
 				<table>
 					<tr>
-						<td NOWRAP valign=top align=left>
-			 			<table align=left>
+						<td NOWRAP valign=top class="align-left">
+			 			<table class="align-left">
 			 			
 						<c:forEach var="currentDto" items="${voteGeneralLearnerFlowDTO.listMonitoredAnswersContainerDto}">
 				  	 		<c:set var="currentQuestionId" scope="request" value="${currentDto.questionUid}"/>
 				  	 		<tr>
 				  	 			<td> &nbsp</td>
 				  	 		</tr>
 							<tr>			
-								<td NOWRAP valign=top align=left><b>  <fmt:message key="label.nomination"/>: </b>
+								<td NOWRAP valign=top class="align-left"><b>  <fmt:message key="label.nomination"/>: </b>
 									<c:out value="${currentDto.question}" escapeXml="false"/>
 								 </td>
 							</tr>	
@@ -135,7 +135,7 @@
 				  	 			<td> &nbsp&nbsp</td>
 				  	 		</tr>
 							<tr>			
-								<td NOWRAP valign=top align=left><b>  <fmt:message key="label.nomination"/>: </b>
+								<td NOWRAP valign=top class="align-left"><b>  <fmt:message key="label.nomination"/>: </b>
 									<c:out value="${currentDto.question}" escapeXml="false"/>
 								 </td>
 							</tr>	
@@ -172,7 +172,7 @@
 	<div id="footer"></div>
 
 </body>
-</html:html>
+</lams:html>
 
 
 
Index: lams_tool_vote/web/learning/Notebook.jsp
===================================================================
diff -u -r896248d87ee3eb2da93ba7a9f11ca2de11eb4040 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 896248d87ee3eb2da93ba7a9f11ca2de11eb4040)
+++ lams_tool_vote/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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">
@@ -71,7 +71,7 @@
 			<html:textarea cols="60" rows="8" property="entryText"
 				styleClass="text-area"></html:textarea>
 
-			<div align="right" class="space-bottom-top">
+			<div class="space-bottom-top align-right">
 				<html:submit property="submitReflection"
 					onclick="javascript:submitMethod('submitReflection');"
 					styleClass="button">
@@ -82,7 +82,7 @@
 		</div>
 	</html:form>
 </body>
-</html:html>
+</lams:html>
 
 
 
Index: lams_tool_vote/web/learning/RevisitedAllNominations.jsp
===================================================================
diff -u -r96c1c8dd84ea09aae381a617c58166f220277537 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/learning/RevisitedAllNominations.jsp	(.../RevisitedAllNominations.jsp)	(revision 96c1c8dd84ea09aae381a617c58166f220277537)
+++ lams_tool_vote/web/learning/RevisitedAllNominations.jsp	(.../RevisitedAllNominations.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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">
@@ -158,7 +158,7 @@
 			</table>
 
 			<div>
-				<div style="float:right">
+				<div class="float-right">
 
 					<c:set scope="request" var="viewURL">
 						<html:rewrite page="/chartGenerator?type=pie" />
@@ -223,4 +223,4 @@
 
 	<div id="footer"></div>
 </body>
-</html:html>
+</lams:html>
Index: lams_tool_vote/web/learning/RunOffline.jsp
===================================================================
diff -u -r896248d87ee3eb2da93ba7a9f11ca2de11eb4040 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/learning/RunOffline.jsp	(.../RunOffline.jsp)	(revision 896248d87ee3eb2da93ba7a9f11ca2de11eb4040)
+++ lams_tool_vote/web/learning/RunOffline.jsp	(.../RunOffline.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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">
@@ -63,7 +63,7 @@
 				<fmt:message key="label.learning.forceOfflineMessage" />
 			</p>
 
-			<div align="right" class="space-bottom-top">
+			<div class="space-bottom-top align-right">
 
 				<c:if test="${voteGeneralLearnerFlowDTO.reflection != 'true'}">
 					<html:submit property="learnerFinished"
@@ -87,7 +87,7 @@
 	</html:form>
 
 </body>
-</html:html>
+</lams:html>
 
 
 
Index: lams_tool_vote/web/learning/defineLater.jsp
===================================================================
diff -u -r896248d87ee3eb2da93ba7a9f11ca2de11eb4040 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 896248d87ee3eb2da93ba7a9f11ca2de11eb4040)
+++ lams_tool_vote/web/learning/defineLater.jsp	(.../defineLater.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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">
@@ -49,7 +49,7 @@
 	</div>
 	<div id="footer"></div>
 </body>
-</html:html>
+</lams:html>
 
 
 
Index: lams_tool_vote/web/monitoring/AllSessionsSummary.jsp
===================================================================
diff -u -r05f0776f9ed9f80ad24452e9d1718e8a24ed8e62 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/monitoring/AllSessionsSummary.jsp	(.../AllSessionsSummary.jsp)	(revision 05f0776f9ed9f80ad24452e9d1718e8a24ed8e62)
+++ lams_tool_vote/web/monitoring/AllSessionsSummary.jsp	(.../AllSessionsSummary.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -129,7 +129,7 @@
 								<tr> <td NOWRAP colspan=2> 									
 						  	 		<c:set var="currentSessionId" scope="request" value="${currentDto.sessionId}"/>
 						  	 		
- 							 			<table align=left>
+ 							 			<table class="align-left">
 						  					<tr>
 										 		<td NOWRAP> <b>  <fmt:message key="label.total.students"/> </b> </td>
 										 		<td>  <c:out value="${currentDto.sessionUserCount}"/> </td>
@@ -160,12 +160,12 @@
 
 
 											<tr>
-												<td NOWRAP colspan=2 valign=top align=left>
+												<td NOWRAP colspan=2 valign=top class="align-left">
 												<table align=center>
 													<c:if test="${statsTabActive != 'true'}"> 							
 														<tr> 
 															<td> </td>
-															<td NOWRAP valign=top align=left >
+															<td NOWRAP valign=top class="align-left" >
 																<c:set scope="request" var="viewURL">
 																	<html:rewrite page="/chartGenerator?type=pie&currentSessionId=${currentSessionId}"/>
 																</c:set>
@@ -176,7 +176,7 @@
 														</tr>
 														<tr> 
 															<td> </td>
-															<td NOWRAP valign=top align=left >
+															<td NOWRAP valign=top class="align-left" >
 																<c:set scope="request" var="viewURL">
 																	<html:rewrite page="/chartGenerator?type=bar&currentSessionId=${currentSessionId}"/>
 																</c:set>
@@ -195,13 +195,13 @@
 												<c:forEach var="currentNomination" items="${currentDto.mapStandardNominationsHTMLedContent}">
 										  	 		<c:set var="currentNominationKey" scope="request" value="${currentNomination.key}"/>
 										  	 		 <tr>
-							  	 						<td NOWRAP valign=top align=left>
+							  	 						<td NOWRAP valign=top class="align-left">
 															<c:out value="${currentNomination.value}" escapeXml="false"/>
 														 </td>
 						
 
 
-														<td NOWRAP valign=top align=left>				  	 		
+														<td NOWRAP valign=top class="align-left">				  	 		
 												  	 		<c:forEach var="currentUserCount" items="${currentDto.mapStandardUserCount}">
 													  	 		<c:set var="currentUserKey" scope="request" value="${currentUserCount.key}"/>
 												  				<c:if test="${currentNominationKey == currentUserKey}"> 				
@@ -275,17 +275,17 @@
 							
 								<tr>
 							 		<td NOWRAP colspan=2>
-						 			<table align=left>
+						 			<table class="align-left">
 												<tr>
 											 		<th NOWRAP colspan=3>  <fmt:message key="label.openVotes"/>  </th>
 												</tr>
 	
 												<tr> 
-													 <td NOWRAP valign=top align=left> <b>  <fmt:message key="label.vote"/>  </b> </td>  														 
-													 <td NOWRAP valign=top align=left> <b>   <fmt:message key="label.user"/>  </b> </td>  
-							  						 <td NOWRAP valign=top align=left> <b>   <fmt:message key="label.attemptTime"/> </b></td>
+													 <td NOWRAP valign=top class="align-left"> <b>  <fmt:message key="label.vote"/>  </b> </td>  														 
+													 <td NOWRAP valign=top class="align-left"> <b>   <fmt:message key="label.user"/>  </b> </td>  
+							  						 <td NOWRAP valign=top class="align-left"> <b>   <fmt:message key="label.attemptTime"/> </b></td>
 							 						 <c:if test="${statsTabActive != 'true'}"> 															  						 
-								  						 <td NOWRAP valign=top align=left> <b>   <fmt:message key="label.visible"/>  </b></td>								  						 
+								  						 <td NOWRAP valign=top class="align-left"> <b>   <fmt:message key="label.visible"/>  </b></td>								  						 
 													 </c:if> 																					  						 
 									  			</tr>				 
 											
@@ -295,18 +295,18 @@
 											  	 		<c:set var="userData" scope="request" value="${questionAttemptData.value}"/>
 		  	 									  	 		<c:set var="currentUid" scope="request" value="${userData.uid}"/>
 														<tr> 
-																<td NOWRAP valign=top align=left> 
+																<td NOWRAP valign=top class="align-left"> 
 																	<c:out value="${dtoEntry.question}" escapeXml="false"/> 
 																	<c:if test="${userData.visible != 'true' }"> 			
 												                                 <i><fmt:message key="label.hidden"/> </i> 
 																	</c:if> 								
 																</td>
 																 
-																 <td NOWRAP valign=top align=left>    <c:out value="${userData.userName}"/>   </td>  
-																 <td NOWRAP valign=top align=left>    <lams:Date value="${userData.attemptTime}"/>  </td>
+																 <td NOWRAP valign=top class="align-left">    <c:out value="${userData.userName}"/>   </td>  
+																 <td NOWRAP valign=top class="align-left">    <lams:Date value="${userData.attemptTime}"/>  </td>
 																 
 										 						<c:if test="${statsTabActive != 'true'}"> 							
-																	 <td NOWRAP valign=top align=left>
+																	 <td NOWRAP valign=top class="align-left">
 												 						<c:if test="${userData.visible == 'true' }"> 			
 													                                <html:submit property="hideOpenVote" 
 													                                             styleClass="linkbutton" 
Index: lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp
===================================================================
diff -u -r05f0776f9ed9f80ad24452e9d1718e8a24ed8e62 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp	(.../IndividualSessionSummary.jsp)	(revision 05f0776f9ed9f80ad24452e9d1718e8a24ed8e62)
+++ lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp	(.../IndividualSessionSummary.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -153,13 +153,13 @@
 						
 						
 						<tr>
-							<td NOWRAP valign=top align=left>
+							<td NOWRAP valign=top class="align-left">
 							<table align=center>
 						
 							<c:if test="${statsTabActive != 'true'}"> 							
 								<tr> 
 									<td> </td>
-									<td NOWRAP valign=top align=left >
+									<td NOWRAP valign=top class="align-left" >
 										<c:set scope="request" var="viewURL">
 											<html:rewrite page="/chartGenerator?type=pie"/>
 										</c:set>
@@ -170,7 +170,7 @@
 								</tr>
 								<tr> 
 									<td> </td>
-									<td NOWRAP valign=top align=left >
+									<td NOWRAP valign=top class="align-left" >
 										<c:set scope="request" var="viewURL">
 											<html:rewrite page="/chartGenerator?type=bar"/>
 										</c:set>
@@ -189,13 +189,13 @@
 									<c:forEach var="currentNomination" items="${voteGeneralMonitoringDTO.mapStandardNominationsHTMLedContent}">
 							  	 		<c:set var="currentNominationKey" scope="request" value="${currentNomination.key}"/>
 							  	 		 <tr>
-				  	 						<td NOWRAP valign=top align=left>
+				  	 						<td NOWRAP valign=top class="align-left">
 												<c:out value="${currentNomination.value}" escapeXml="false"/>
 											 </td>
 			
 			
 			
-											<td NOWRAP valign=top align=left>				  	 		
+											<td NOWRAP valign=top class="align-left">				  	 		
 									  	 		<c:forEach var="currentUserCount" items="${voteGeneralMonitoringDTO.mapStandardUserCount}">
 										  	 		<c:set var="currentUserKey" scope="request" value="${currentUserCount.key}"/>
 									  				<c:if test="${currentNominationKey == currentUserKey}"> 				
@@ -265,17 +265,17 @@
 			  				
 								<tr>
 							 		<td NOWRAP colspan=2>
-						 			<table align=left>
+						 			<table class="align-left">
 												<tr>
 											 		<th NOWRAP colspan=3>  <fmt:message key="label.openVotes"/>  </th>
 												</tr>
 	
 												<tr> 
-													 <td NOWRAP valign=top align=left> <b>   <fmt:message key="label.vote"/>  </b> </td>  														 
-													 <td NOWRAP valign=top align=left> <b>   <fmt:message key="label.user"/>  </b> </td>  
-							  						 <td NOWRAP valign=top align=left> <b>   <fmt:message key="label.attemptTime"/> </b></td>
+													 <td NOWRAP valign=top class="align-left"> <b>   <fmt:message key="label.vote"/>  </b> </td>  														 
+													 <td NOWRAP valign=top class="align-left"> <b>   <fmt:message key="label.user"/>  </b> </td>  
+							  						 <td NOWRAP valign=top class="align-left"> <b>   <fmt:message key="label.attemptTime"/> </b></td>
 							 						 <c:if test="${statsTabActive != 'true'}"> 															  						 
-								  						 <td NOWRAP valign=top align=left> <b>   <fmt:message key="label.visible"/>  </b></td>								  						 
+								  						 <td NOWRAP valign=top class="align-left"> <b>   <fmt:message key="label.visible"/>  </b></td>								  						 
 													 </c:if> 																					  						 
 									  			</tr>				 
 											
@@ -285,19 +285,19 @@
 											  	 		<c:set var="userData" scope="request" value="${questionAttemptData.value}"/>
 		  	 									  	 		<c:set var="currentUid" scope="request" value="${userData.uid}"/>
 														<tr> 
-																<td NOWRAP valign=top align=left> 
+																<td NOWRAP valign=top class="align-left"> 
 																	<c:out value="${currentDto.question}" escapeXml="false"/> 
 																	<c:if test="${userData.visible != 'true' }"> 			
 												                                 <i><fmt:message key="label.hidden"/> </i> 
 																	</c:if> 								
 																</td>
 																 
-																 <td NOWRAP valign=top align=left>    <c:out value="${userData.userName}"/>   </td>  
-																 <td NOWRAP valign=top align=left>    <lams:Date value="${userData.attemptTime}"/>  </td>																 
+																 <td NOWRAP valign=top class="align-left">    <c:out value="${userData.userName}"/>   </td>  
+																 <td NOWRAP valign=top class="align-left">    <lams:Date value="${userData.attemptTime}"/>  </td>																 
 																 
 																 
 										 						<c:if test="${statsTabActive != 'true'}"> 							
-																	 <td NOWRAP valign=top align=left>
+																	 <td NOWRAP valign=top class="align-left">
 												 						<c:if test="${userData.visible == 'true' }"> 			
 													                                <html:submit property="hideOpenVote" 
 													                                             styleClass="linkbutton" 
Index: lams_tool_vote/web/monitoring/Instructions.jsp
===================================================================
diff -u -r05f0776f9ed9f80ad24452e9d1718e8a24ed8e62 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/monitoring/Instructions.jsp	(.../Instructions.jsp)	(revision 05f0776f9ed9f80ad24452e9d1718e8a24ed8e62)
+++ lams_tool_vote/web/monitoring/Instructions.jsp	(.../Instructions.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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="${voteGeneralMonitoringDTO.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="${voteGeneralMonitoringDTO.attachmentList}">
 											<c:if test="${attachment.fileOnline == false}"> 			
Index: lams_tool_vote/web/monitoring/LearnerNotebook.jsp
===================================================================
diff -u -r05f0776f9ed9f80ad24452e9d1718e8a24ed8e62 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/monitoring/LearnerNotebook.jsp	(.../LearnerNotebook.jsp)	(revision 05f0776f9ed9f80ad24452e9d1718e8a24ed8e62)
+++ lams_tool_vote/web/monitoring/LearnerNotebook.jsp	(.../LearnerNotebook.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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">
@@ -82,12 +82,11 @@
 
 
 </body>
-</html:html>
+</lams:html>
 
 
 
 
 
 
 
-
Index: lams_tool_vote/web/monitoring/LearnerRep.jsp
===================================================================
diff -u -r9a8badc30e1305b21c85727950607d2335500a61 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/monitoring/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 9a8badc30e1305b21c85727950607d2335500a61)
+++ lams_tool_vote/web/monitoring/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -24,7 +24,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 
-	<html:html locale="true">
+	<lams:html>
 	<head>
 	<title> <fmt:message key="label.learning.report"/> </title>
 	
@@ -68,16 +68,16 @@
 
 				<table>
 					<tr>
-						<td NOWRAP valign=top align=left>
-			 			<table align=left>
+						<td NOWRAP valign=top class="align-left">
+			 			<table class="align-left">
 			 			
 						<c:forEach var="currentDto" items="${sessionScope.listMonitoredAnswersContainerDto}">
 				  	 		<c:set var="currentQuestionId" scope="request" value="${currentDto.questionUid}"/>
 				  	 		<tr>
 				  	 			<td> &nbsp&nbsp</td>
 				  	 		</tr>
 							<tr>			
-								<td NOWRAP valign=top align=left><b>  <fmt:message key="label.nomination"/>: </b>
+								<td NOWRAP valign=top class="align-left"><b>  <fmt:message key="label.nomination"/>: </b>
 									<c:out value="${currentDto.question}" escapeXml="false"/>
 								 </td>
 							</tr>	
@@ -119,7 +119,7 @@
 				  	 			<td> &nbsp&nbsp</td>
 				  	 		</tr>
 							<tr>			
-								<td NOWRAP valign=top align=left><b>  <fmt:message key="label.nomination"/>: </b>
+								<td NOWRAP valign=top class="align-left"><b>  <fmt:message key="label.nomination"/>: </b>
 									<c:out value="${currentDto.question}" escapeXml="false"/>
 								 </td>
 							</tr>	
@@ -152,7 +152,7 @@
 	
 	<div id="footer"></div>
 </body>
-</html:html>
+</lams:html>
 
 
 
Index: lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -race8b408295af831e2715b2013d64a000aa09549 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision ace8b408295af831e2715b2013d64a000aa09549)
+++ lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -37,7 +37,7 @@
 		pageContext.setAttribute("tabs", tabs);
 	%>
 
-	<html:html locale="true">
+	<lams:html>
 	<head>
 
 	<title> <fmt:message key="label.monitoring"/> </title>
@@ -177,4 +177,4 @@
 	</div>
 	
 </body>
-</html:html>
+</lams:html>
Index: lams_tool_vote/web/monitoring/Reflections.jsp
===================================================================
diff -u -r05f0776f9ed9f80ad24452e9d1718e8a24ed8e62 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/monitoring/Reflections.jsp	(.../Reflections.jsp)	(revision 05f0776f9ed9f80ad24452e9d1718e8a24ed8e62)
+++ lams_tool_vote/web/monitoring/Reflections.jsp	(.../Reflections.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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_vote/web/monitoring/VoteNominationViewer.jsp
===================================================================
diff -u -r04b73cb110382ae0e9c044c1447c5a440de6d614 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/monitoring/VoteNominationViewer.jsp	(.../VoteNominationViewer.jsp)	(revision 04b73cb110382ae0e9c044c1447c5a440de6d614)
+++ lams_tool_vote/web/monitoring/VoteNominationViewer.jsp	(.../VoteNominationViewer.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -25,7 +25,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 
-	<html:html locale="true">
+	<lams:html>
 	<head>
 	<title> <fmt:message key="label.learnersVoted"/> </title>
 
@@ -55,4 +55,4 @@
 </div>
 <div id="footer"></div>
 </body>
-</html:html>
+</lams:html>
Index: lams_tool_vote/web/monitoring/editNominationBox.jsp
===================================================================
diff -u -rbf72d54557f8ed3438c6858d5d64d9f1b10491d5 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/monitoring/editNominationBox.jsp	(.../editNominationBox.jsp)	(revision bf72d54557f8ed3438c6858d5d64d9f1b10491d5)
+++ lams_tool_vote/web/monitoring/editNominationBox.jsp	(.../editNominationBox.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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"%>
 		
@@ -109,4 +109,4 @@
 		
 		<div id="footer"></div>
 	</body>
-</html>
+</lams:html>
Index: lams_tool_vote/web/monitoring/itemlist.jsp
===================================================================
diff -u -ra1f83079a0fedc3d6982fde779286d0246847339 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/monitoring/itemlist.jsp	(.../itemlist.jsp)	(revision a1f83079a0fedc3d6982fde779286d0246847339)
+++ lams_tool_vote/web/monitoring/itemlist.jsp	(.../itemlist.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -36,16 +36,16 @@
 	<c:set var="displayOrder" scope="request" value="${currentDTO.displayOrder}"/>	
 
 	<tr>
-		<td width="10%" align="right" class="field-name">
+		<td width="10%" class="field-name align-right">
 			<fmt:message key="label.nomination" />:
 		</td>
 
-		<td width="60%" align="left">
+		<td width="60%" class="align-left">
 			<c:out value="${question}" escapeXml="false"/> 
 		</td>		
 
 
-			<td width="10%" align="right">
+			<td width="10%" class="align-right">
 		 		<c:if test="${totalNominationCount != 1}"> 		
 		 		
 			 		<c:if test="${queIndex == 1}"> 		
@@ -76,13 +76,13 @@
 		
 		
 
-		<td width="10%" align="right">
+		<td width="10%" class="align-right">
 				<a title="<fmt:message key='label.tip.editNomination'/>" href="javascript:;" onclick="javascript:showMessage('<html:rewrite page="/monitoring.do?dispatch=newEditableNominationBox&questionIndex=${queIndex}&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&activeModule=${voteGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${voteGeneralAuthoringDTO.defaultContentIdStr}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}&reflectionSubject=${voteGeneralAuthoringDTO.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.deleteNomination'/>" href="javascript:;" onclick="removeMonitoringNomination(${queIndex});">
 	                    <img src="<c:out value="${tool}"/>images/delete.gif" border="0">
 				</a> 				
Index: lams_tool_vote/web/monitoring/newNominationBox.jsp
===================================================================
diff -u -rbf72d54557f8ed3438c6858d5d64d9f1b10491d5 -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de
--- lams_tool_vote/web/monitoring/newNominationBox.jsp	(.../newNominationBox.jsp)	(revision bf72d54557f8ed3438c6858d5d64d9f1b10491d5)
+++ lams_tool_vote/web/monitoring/newNominationBox.jsp	(.../newNominationBox.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
@@ -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"%>
 		
@@ -107,4 +107,4 @@
 	
 	<div id="footer"></div>
 	</body>
-</html>
+</lams:html>