Index: lams_admin/web/config/editconfig.jsp
===================================================================
diff -u -racc5f651c03bd0895c8b189c932ea35dea91dc7d -r5a434572e8771eb9253a4b2f09efbf0c53b5f261
--- lams_admin/web/config/editconfig.jsp	(.../editconfig.jsp)	(revision acc5f651c03bd0895c8b189c932ea35dea91dc7d)
+++ lams_admin/web/config/editconfig.jsp	(.../editconfig.jsp)	(revision 5a434572e8771eb9253a4b2f09efbf0c53b5f261)
@@ -3,7 +3,7 @@
 
 <html:form action="/config" method="post">
 	<html:hidden property="method" value="save"/>
-	<h2 align="left">
+	<h2 class="align-left">
 		<a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a> :  
 		<fmt:message key="sysadmin.config.settings.edit" />
 	</h2>
Index: lams_admin/web/error.jsp
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r5a434572e8771eb9253a4b2f09efbf0c53b5f261
--- lams_admin/web/error.jsp	(.../error.jsp)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_admin/web/error.jsp	(.../error.jsp)	(revision 5a434572e8771eb9253a4b2f09efbf0c53b5f261)
@@ -1,10 +1,13 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
 	"http://www.w3.org/TR/html4/strict.dtd">
-<html>
+
 <%@ page language="java" isErrorPage="true" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
+
+<lams:html>
+
 <c:set var="lams">
 	<lams:LAMSURL />
 </c:set>
@@ -66,4 +69,4 @@
 
 </script>
 </body>
-</html>
+</lams:html>
Index: lams_admin/web/organisation.jsp
===================================================================
diff -u -rbaf684f0c64ff2686a9415c68c943ecf4184046d -r5a434572e8771eb9253a4b2f09efbf0c53b5f261
--- lams_admin/web/organisation.jsp	(.../organisation.jsp)	(revision baf684f0c64ff2686a9415c68c943ecf4184046d)
+++ lams_admin/web/organisation.jsp	(.../organisation.jsp)	(revision 5a434572e8771eb9253a4b2f09efbf0c53b5f261)
@@ -88,7 +88,7 @@
 	</tr>
 	</logic:equal>
 	<tr>
-		<td colspan=2 align="right">
+		<td colspan=2 class="align-right">
 			<html-el:submit><fmt:message key="admin.save"/></html-el:submit>
 			<html-el:reset><fmt:message key="admin.reset"/></html-el:reset>
 			<html-el:cancel><fmt:message key="admin.cancel"/></html-el:cancel>
Index: lams_admin/web/register.jsp
===================================================================
diff -u -racc5f651c03bd0895c8b189c932ea35dea91dc7d -r5a434572e8771eb9253a4b2f09efbf0c53b5f261
--- lams_admin/web/register.jsp	(.../register.jsp)	(revision acc5f651c03bd0895c8b189c932ea35dea91dc7d)
+++ lams_admin/web/register.jsp	(.../register.jsp)	(revision 5a434572e8771eb9253a4b2f09efbf0c53b5f261)
@@ -2,7 +2,7 @@
 <%@ include file="/taglibs.jsp"%>
 
 <form action="http://lamscommunity.org/registration" method="get">
-	<h2 align="left">
+	<h2 class="align-left">
 		<a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a> :  
 		<fmt:message key="sysadmin.register.server" />
 	</h2>
Index: lams_admin/web/remove.jsp
===================================================================
diff -u -rbaf684f0c64ff2686a9415c68c943ecf4184046d -r5a434572e8771eb9253a4b2f09efbf0c53b5f261
--- lams_admin/web/remove.jsp	(.../remove.jsp)	(revision baf684f0c64ff2686a9415c68c943ecf4184046d)
+++ lams_admin/web/remove.jsp	(.../remove.jsp)	(revision 5a434572e8771eb9253a4b2f09efbf0c53b5f261)
@@ -40,7 +40,7 @@
 		<c:param name="userId" value="${userId}" />
 		<c:param name="orgId" value="${orgId}" />
 	</c:url>
-<div style="float:right">
+<div class="float-right">
 <input type="button" value="Delete" onClick="javascript:document.location='<c:out value="${deleteaction}"/>'" />
 <input type="button" value="Cancel" onClick="javascript:document.location='<c:out value="${cancel}"/>'" />
 </div>
Index: lams_admin/web/serverlist.jsp
===================================================================
diff -u -rbaf684f0c64ff2686a9415c68c943ecf4184046d -r5a434572e8771eb9253a4b2f09efbf0c53b5f261
--- lams_admin/web/serverlist.jsp	(.../serverlist.jsp)	(revision baf684f0c64ff2686a9415c68c943ecf4184046d)
+++ lams_admin/web/serverlist.jsp	(.../serverlist.jsp)	(revision 5a434572e8771eb9253a4b2f09efbf0c53b5f261)
@@ -1,7 +1,7 @@
 <%@ include file="/taglibs.jsp"%>
 
 <h2><a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a> : <fmt:message key="sysadmin.maintain.external.servers" /></h2>
-<p align="right"><input type="button" value="<fmt:message key='sysadmin.server.add' />" onClick="javascript:document.location='servermaintain.do?method=edit'" /></p>
+<p class="align-right"><input type="button" value="<fmt:message key='sysadmin.server.add' />" onClick="javascript:document.location='servermaintain.do?method=edit'" /></p>
 <table class=alternative-color width=100%>
 	<tr>
 		<th><fmt:message key="sysadmin.serverid" /></th>
Index: lams_admin/web/template.jsp
===================================================================
diff -u -rc331ffb91e6b4c307a40450034fb52e0ca88c30e -r5a434572e8771eb9253a4b2f09efbf0c53b5f261
--- lams_admin/web/template.jsp	(.../template.jsp)	(revision c331ffb91e6b4c307a40450034fb52e0ca88c30e)
+++ lams_admin/web/template.jsp	(.../template.jsp)	(revision 5a434572e8771eb9253a4b2f09efbf0c53b5f261)
@@ -1,7 +1,7 @@
 <%@ include file="/taglibs.jsp"%>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
+<lams:html>
 <head>
 	<html:base/>
 	<c:set var="title" scope="session"><tiles:getAsString name="title"/></c:set>
@@ -21,4 +21,4 @@
 	</div>
 </div>
 </body>
-</html>
+</lams:html>
Index: lams_admin/web/user.jsp
===================================================================
diff -u -racc5f651c03bd0895c8b189c932ea35dea91dc7d -r5a434572e8771eb9253a4b2f09efbf0c53b5f261
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision acc5f651c03bd0895c8b189c932ea35dea91dc7d)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision 5a434572e8771eb9253a4b2f09efbf0c53b5f261)
@@ -3,7 +3,7 @@
 <html-el:form action="/usersave.do" method="post">
 <html-el:hidden property="userId" />
 <html-el:hidden property="orgId" />
-<h2 align="left">
+<h2 class="align-left">
 	<logic:notEmpty name="UserForm" property="orgId">
 		<a href="orgmanage.do?org=1"><fmt:message key="admin.course.manage" /></a>
 		<logic:notEmpty name="pOrgId">
@@ -35,79 +35,79 @@
 		<td>
 			<table>
 				<tr>
-					<td align="right"><fmt:message key="admin.user.login"/> *:</td>
+					<td class="align-right"><fmt:message key="admin.user.login"/> *:</td>
 					<td><html-el:text property="login" size="20" maxlength="20" /></td>
 				</tr>
 				<tr>
-					<td align="right"><fmt:message key="admin.user.password"/> *:</td>
+					<td class="align-right"><fmt:message key="admin.user.password"/> *:</td>
 					<td><html-el:password property="password" size="20" maxlength="50" /></td>
 				</tr>
 				<tr>
-					<td align="right"><fmt:message key="admin.user.password.confirm"/> *:</td>
+					<td class="align-right"><fmt:message key="admin.user.password.confirm"/> *:</td>
 					<td><html-el:password property="password2" size="20" maxlength="50" /></td>
 				</tr>
 				<tr>
-					<td align="right"><fmt:message key="admin.user.title"/>:</td>
+					<td class="align-right"><fmt:message key="admin.user.title"/>:</td>
 					<td><html-el:text property="title" size="20" maxlength="32" /></td>
 				</tr>
 				<tr>
-					<td align="right"><fmt:message key="admin.user.first_name"/> *:</td>
+					<td class="align-right"><fmt:message key="admin.user.first_name"/> *:</td>
 					<td><html-el:text property="firstName" size="20" maxlength="64" /></td>
 				</tr>
 				<tr>
-					<td align="right"><fmt:message key="admin.user.last_name"/> *:</td>
+					<td class="align-right"><fmt:message key="admin.user.last_name"/> *:</td>
 					<td><html-el:text property="lastName" size="20" maxlength="128" /></td>
 				</tr>
 				<tr>
-					<td align="right"><fmt:message key="admin.user.email"/> *:</td>
+					<td class="align-right"><fmt:message key="admin.user.email"/> *:</td>
 					<td><html-el:text property="email" size="20" maxlength="128" /></td>
 				</tr>
 				<tr>
-					<td align="right"><fmt:message key="admin.user.address_line_1"/>:</td>
+					<td class="align-right"><fmt:message key="admin.user.address_line_1"/>:</td>
 					<td><html-el:text property="addressLine1" size="20" maxlength="64" /></td>
 				</tr>
 				<tr>
-					<td align="right"><fmt:message key="admin.user.address_line_2"/>:</td>
+					<td class="align-right"><fmt:message key="admin.user.address_line_2"/>:</td>
 					<td><html-el:text property="addressLine2" size="20" maxlength="64" /></td>
 				</tr>
 				<tr>
-					<td align="right"><fmt:message key="admin.user.address_line_3"/>:</td>
+					<td class="align-right"><fmt:message key="admin.user.address_line_3"/>:</td>
 					<td><html-el:text property="addressLine3" size="20" maxlength="64" /></td>
 				</tr>
 				<tr>
-					<td align="right"><fmt:message key="admin.user.city"/>:</td>
+					<td class="align-right"><fmt:message key="admin.user.city"/>:</td>
 					<td><html-el:text property="city" size="20" maxlength="64" /></td>
 				</tr>
 				<tr>
-					<td align="right"><fmt:message key="admin.user.postcode"/>:</td>
+					<td class="align-right"><fmt:message key="admin.user.postcode"/>:</td>
 					<td><html-el:text property="postcode" size="20" maxlength="10" /></td>
 				</tr>
 				<tr>
-					<td align="right"><fmt:message key="admin.user.state"/>:</td>
+					<td class="align-right"><fmt:message key="admin.user.state"/>:</td>
 					<td><html-el:text property="state" size="20" maxlength="64" /></td>
 				</tr>
 				<tr>
-					<td align="right"><fmt:message key="admin.user.country"/>:</td>
+					<td class="align-right"><fmt:message key="admin.user.country"/>:</td>
 					<td><html-el:text property="country" size="20" maxlength="64" /></td>
 				</tr>
 				<tr>
-					<td align="right"><fmt:message key="admin.user.day_phone"/>:</td>
+					<td class="align-right"><fmt:message key="admin.user.day_phone"/>:</td>
 					<td><html-el:text property="dayPhone" size="20" maxlength="64" /></td>
 				</tr>
 				<tr>
-					<td align="right"><fmt:message key="admin.user.evening_phone"/>:</td>
+					<td class="align-right"><fmt:message key="admin.user.evening_phone"/>:</td>
 					<td><html-el:text property="eveningPhone" size="20" maxlength="64" /></td>
 				</tr>
 				<tr>
-					<td align="right"><fmt:message key="admin.user.mobile_phone"/>:</td>
+					<td class="align-right"><fmt:message key="admin.user.mobile_phone"/>:</td>
 					<td><html-el:text property="mobilePhone" size="20" maxlength="64" /></td>
 				</tr>
 				<tr>
-					<td align="right"><fmt:message key="admin.user.fax"/>:</td>
+					<td class="align-right"><fmt:message key="admin.user.fax"/>:</td>
 					<td><html-el:text property="fax" size="20" maxlength="64" /></td>
 				</tr>
 				<tr>
-					<td align="right"><fmt:message key="admin.organisation.locale"/>:</td>
+					<td class="align-right"><fmt:message key="admin.organisation.locale"/>:</td>
 					<td>
 						<html-el:select property="localeId">
 							<c:forEach items="${locales}" var="locale">
@@ -119,7 +119,7 @@
 					</td>
 				</tr>
 				<tr>
-					<td colspan=2 align="right">
+					<td colspan=2 class="align-right">
 						<html-el:submit><fmt:message key="admin.save"/></html-el:submit>
 						<html-el:reset><fmt:message key="admin.reset"/></html-el:reset>
 						<html-el:cancel><fmt:message key="admin.cancel"/></html-el:cancel>
Index: lams_admin/web/userlist.jsp
===================================================================
diff -u -racc5f651c03bd0895c8b189c932ea35dea91dc7d -r5a434572e8771eb9253a4b2f09efbf0c53b5f261
--- lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision acc5f651c03bd0895c8b189c932ea35dea91dc7d)
+++ lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 5a434572e8771eb9253a4b2f09efbf0c53b5f261)
@@ -1,7 +1,7 @@
 <%@ include file="/taglibs.jsp"%>
 
 <form>
-<h2 align="left">
+<h2 class="align-left">
 	<a href="orgmanage.do?org=1"><fmt:message key="admin.course.manage" /></a>
 	<logic:equal name="orgType" value="1">
 		: <fmt:message key="admin.global.roles.manage" />
@@ -20,7 +20,7 @@
 
 <p>&nbsp;</p>
 
-<p align="right">
+<p class="align-right">
 	<logic:equal name="UserManageForm" property="courseAdminCanAddNewUsers" value="true">
 		<input type="button" value='<fmt:message key="admin.user.create"/>' onclick=javascript:document.location='user.do?method=edit&orgId=<bean:write name="UserManageForm" property="orgId"/>' />
 	</logic:equal>
Index: lams_admin/web/userorg.jsp
===================================================================
diff -u -racc5f651c03bd0895c8b189c932ea35dea91dc7d -r5a434572e8771eb9253a4b2f09efbf0c53b5f261
--- lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision acc5f651c03bd0895c8b189c932ea35dea91dc7d)
+++ lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision 5a434572e8771eb9253a4b2f09efbf0c53b5f261)
@@ -10,7 +10,7 @@
 
 <html-el:form action="/userorgsave.do" method="post">
 <html-el:hidden property="orgId" />
-<h2 align="left">
+<h2 class="align-left">
 	<a href="orgmanage.do?org=1"><fmt:message key="admin.course.manage" /></a>
     <logic:notEmpty name="pOrgId">
         : <a href="orgmanage.do?org=<bean:write name="pOrgId" />"><bean:write name="pOrgName"/></a>
@@ -58,7 +58,7 @@
 </logic:iterate>
 
 <tr>
-	<td colspan=5 align="right">
+	<td colspan=5 class="align-right">
 		<html-el:submit><fmt:message key="admin.save"/></html-el:submit>
 		<html-el:reset><fmt:message key="admin.reset"/></html-el:reset>
 		<html-el:cancel><fmt:message key="admin.cancel"/></html-el:cancel>
Index: lams_admin/web/userorgrole.jsp
===================================================================
diff -u -racc5f651c03bd0895c8b189c932ea35dea91dc7d -r5a434572e8771eb9253a4b2f09efbf0c53b5f261
--- lams_admin/web/userorgrole.jsp	(.../userorgrole.jsp)	(revision acc5f651c03bd0895c8b189c932ea35dea91dc7d)
+++ lams_admin/web/userorgrole.jsp	(.../userorgrole.jsp)	(revision 5a434572e8771eb9253a4b2f09efbf0c53b5f261)
@@ -54,7 +54,7 @@
 </logic:iterate>
 <tr>
 	<td></td>
-	<td colspan=<c:out value="${numroles}" /> align="right">
+	<td colspan=<c:out value="${numroles}" /> class="align-right">
 		<html-el:submit><fmt:message key="admin.save"/></html-el:submit>
 		<html-el:reset><fmt:message key="admin.reset"/></html-el:reset>
 		<html-el:cancel><fmt:message key="admin.cancel"/></html-el:cancel>
Index: lams_admin/web/userrole.jsp
===================================================================
diff -u -r594eae7c7c4a3fe379d52eafd68f65ebb554fbc7 -r5a434572e8771eb9253a4b2f09efbf0c53b5f261
--- lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision 594eae7c7c4a3fe379d52eafd68f65ebb554fbc7)
+++ lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision 5a434572e8771eb9253a4b2f09efbf0c53b5f261)
@@ -44,7 +44,7 @@
 	    </td>
 	</tr>
 	<tr>
-		<td colspan=2 align="right">
+		<td colspan=2 class="align-right">
 			<html-el:submit><fmt:message key="admin.save"/></html-el:submit>
 			<html-el:reset><fmt:message key="admin.reset"/></html-el:reset>
 			<html-el:cancel><fmt:message key="admin.cancel"/></html-el:cancel>
Index: lams_admin/web/usersearchlist.jsp
===================================================================
diff -u -racc5f651c03bd0895c8b189c932ea35dea91dc7d -r5a434572e8771eb9253a4b2f09efbf0c53b5f261
--- lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision acc5f651c03bd0895c8b189c932ea35dea91dc7d)
+++ lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision 5a434572e8771eb9253a4b2f09efbf0c53b5f261)
@@ -59,7 +59,7 @@
 </logic:notEmpty>
 
 <tr>
-	<td colspan=5 align="right">
+	<td colspan=5 class="align-right">
 		<html:checkbox property="showAll"><fmt:message key="label.show.all.users"/></html:checkbox>&nbsp;
 		<html-el:submit><fmt:message key="admin.search"/></html-el:submit>
 		<input type="button" value='<fmt:message key="admin.reset"/>' onclick="resetFields();" />
