Index: lams_admin/web/user.jsp
===================================================================
diff -u -r54ff12d78b5d617bc7767b37faea406d5675a746 -rd1d4b9a5af1887e382f087d7c8f858f0f7983bdc
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision 54ff12d78b5d617bc7767b37faea406d5675a746)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision d1d4b9a5af1887e382f087d7c8f858f0f7983bdc)
@@ -20,81 +20,80 @@
 
 <div align="center"><html-el:errors/></div>
 <table>
-  <col align="right" /><col align="left" />
 	<tr>
-		<td><fmt:message key="admin.user.login"/> *:</td>
+		<td align="right"><fmt:message key="admin.user.login"/> *:</td>
 		<td><html-el:text property="login" size="20" maxlength="20" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.password"/> *:</td>
+		<td align="right"><fmt:message key="admin.user.password"/> *:</td>
 		<td><html-el:password property="password" size="20" maxlength="50" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.password.confirm"/> *:</td>
+		<td align="right"><fmt:message key="admin.user.password.confirm"/> *:</td>
 		<td><html-el:password property="password2" size="20" maxlength="50" /></td>
 	</tr>
 	<tr>
-	<td><fmt:message key="admin.user.title"/>:</td>
+		<td align="right"><fmt:message key="admin.user.title"/>:</td>
 		<td><html-el:text property="title" size="20" maxlength="32" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.first_name"/>:</td>
+		<td align="right"><fmt:message key="admin.user.first_name"/> *:</td>
 		<td><html-el:text property="firstName" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.last_name"/>:</td>
+		<td align="right"><fmt:message key="admin.user.last_name"/> *:</td>
 		<td><html-el:text property="lastName" size="20" maxlength="128" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.address_line_1"/>:</td>
+		<td 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><html-el:text property="addressLine1" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.address_line_2"/>:</td>
+		<td 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><fmt:message key="admin.user.address_line_3"/>:</td>
+		<td 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><fmt:message key="admin.user.city"/>:</td>
+		<td align="right"><fmt:message key="admin.user.city"/>:</td>
 		<td><html-el:text property="city" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.postcode"/>:</td>
+		<td align="right"><fmt:message key="admin.user.postcode"/>:</td>
 		<td><html-el:text property="postcode" size="20" maxlength="10" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.state"/>:</td>
+		<td align="right"><fmt:message key="admin.user.state"/>:</td>
 		<td><html-el:text property="state" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.country"/>:</td>
+		<td align="right"><fmt:message key="admin.user.country"/>:</td>
 		<td><html-el:text property="country" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.day_phone"/>:</td>
+		<td align="right"><fmt:message key="admin.user.day_phone"/>:</td>
 		<td><html-el:text property="dayPhone" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.evening_phone"/>:</td>
+		<td align="right"><fmt:message key="admin.user.evening_phone"/>:</td>
 		<td><html-el:text property="eveningPhone" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.mobile_phone"/>:</td>
+		<td align="right"><fmt:message key="admin.user.mobile_phone"/>:</td>
 		<td><html-el:text property="mobilePhone" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.fax"/>:</td>
+		<td align="right"><fmt:message key="admin.user.fax"/>:</td>
 		<td><html-el:text property="fax" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.email"/>:</td>
-		<td><html-el:text property="email" size="20" maxlength="128" /></td>
-	</tr>
-	<tr>
-		<td><fmt:message key="admin.organisation.locale"/>:</td>
+		<td align="right"><fmt:message key="admin.organisation.locale"/>:</td>
 		<td>
 			<html-el:select property="localeId">
 				<c:forEach items="${locales}" var="locale">
Index: lams_central/web/editprofile.jsp
===================================================================
diff -u -rf802b987f59494223c2a3906568fbd2f82187cee -rd1d4b9a5af1887e382f087d7c8f858f0f7983bdc
--- lams_central/web/editprofile.jsp	(.../editprofile.jsp)	(revision f802b987f59494223c2a3906568fbd2f82187cee)
+++ lams_central/web/editprofile.jsp	(.../editprofile.jsp)	(revision d1d4b9a5af1887e382f087d7c8f858f0f7983bdc)
@@ -17,73 +17,72 @@
 	<p class="warning"><html:errors/></p>
 </logic:messagesPresent>
 <table>
-  <col align="right" /><col align="left" />
     <tr>
-		<td><fmt:message key="label.username"/>:</td>
+		<td align="right"><fmt:message key="label.username"/>:</td>
 		<td><bean:write name="UserForm" property="login" /></td>
 	</tr>
 	<tr>
-	<td><fmt:message key="label.title"/>:</td>
+		<td align="right"><fmt:message key="label.title"/>:</td>
 		<td><html:text property="title" size="20" maxlength="32" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="label.first_name"/>:</td>
+		<td align="right"><fmt:message key="label.first_name"/> *:</td>
 		<td><html:text property="firstName" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="label.last_name"/>:</td>
+		<td align="right"><fmt:message key="label.last_name"/> *:</td>
 		<td><html:text property="lastName" size="20" maxlength="128" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="label.address_line_1"/>:</td>
+		<td align="right"><fmt:message key="label.email"/> *:</td>
+		<td><html:text property="email" size="20" maxlength="128" /></td>
+	</tr>
+	<tr>
+		<td align="right"><fmt:message key="label.address_line_1"/>:</td>
 		<td><html:text property="addressLine1" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="label.address_line_2"/>:</td>
+		<td align="right"><fmt:message key="label.address_line_2"/>:</td>
 		<td><html:text property="addressLine2" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="label.address_line_3"/>:</td>
+		<td align="right"><fmt:message key="label.address_line_3"/>:</td>
 		<td><html:text property="addressLine3" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="label.city"/>:</td>
+		<td align="right"><fmt:message key="label.city"/>:</td>
 		<td><html:text property="city" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="label.state"/>:</td>
+		<td align="right"><fmt:message key="label.state"/>:</td>
 		<td><html:text property="state" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="label.postcode"/>:</td>
+		<td align="right"><fmt:message key="label.postcode"/>:</td>
 		<td><html:text property="postcode" size="20" maxlength="10" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="label.country"/>:</td>
+		<td align="right"><fmt:message key="label.country"/>:</td>
 		<td><html:text property="country" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="label.day_phone"/>:</td>
+		<td align="right"><fmt:message key="label.day_phone"/>:</td>
 		<td><html:text property="dayPhone" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="label.evening_phone"/>:</td>
+		<td align="right"><fmt:message key="label.evening_phone"/>:</td>
 		<td><html:text property="eveningPhone" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="label.mobile_phone"/>:</td>
+		<td align="right"><fmt:message key="label.mobile_phone"/>:</td>
 		<td><html:text property="mobilePhone" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="label.fax"/>:</td>
+		<td align="right"><fmt:message key="label.fax"/>:</td>
 		<td><html:text property="fax" size="20" maxlength="64" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="label.email"/>:</td>
-		<td><html:text property="email" size="20" maxlength="128" /></td>
-	</tr>
-	<tr>
-		<td><fmt:message key="label.language"/>:</td>
+		<td align="right"><fmt:message key="label.language"/>:</td>
 		<td>
 			<html:select property="localeId">
 				<c:forEach items="${locales}" var="locale">
Index: lams_central/web/portrait.jsp
===================================================================
diff -u -rf802b987f59494223c2a3906568fbd2f82187cee -rd1d4b9a5af1887e382f087d7c8f858f0f7983bdc
--- lams_central/web/portrait.jsp	(.../portrait.jsp)	(revision f802b987f59494223c2a3906568fbd2f82187cee)
+++ lams_central/web/portrait.jsp	(.../portrait.jsp)	(revision d1d4b9a5af1887e382f087d7c8f858f0f7983bdc)
@@ -14,7 +14,7 @@
 			</logic:messagesPresent>
 			<table>
 				<tr>
-					<td><fmt:message key="label.portrait.current" />:</td>
+					<td align="right"><fmt:message key="label.portrait.current" />:</td>
 					<td>
 						<logic:notEqual name="PortraitActionForm" property="portraitUuid" value="0">
 							<img src="/lams/download/?uuid=<bean:write name="PortraitActionForm" property="portraitUuid" />&preferDownload=false" />
@@ -25,7 +25,7 @@
 					</td>
 				</tr>
 				<tr>
-					<td><fmt:message key="label.portrait.upload" />:</td>
+					<td align="right"><fmt:message key="label.portrait.upload" />:</td>
 					<td><html:file property="file" /></td>
 				</tr>
 				<tr>
Index: lams_central/web/profile.jsp
===================================================================
diff -u -r1ad682fe8e52e5b75b81b12f06f3f6bff161ece7 -rd1d4b9a5af1887e382f087d7c8f858f0f7983bdc
--- lams_central/web/profile.jsp	(.../profile.jsp)	(revision 1ad682fe8e52e5b75b81b12f06f3f6bff161ece7)
+++ lams_central/web/profile.jsp	(.../profile.jsp)	(revision d1d4b9a5af1887e382f087d7c8f858f0f7983bdc)
@@ -69,21 +69,20 @@
 <h2><fmt:message key="index.myprofile" /></h2>
 
 <table border="0">
-	<col align="left" /><col align="left" />
 	<tr>
-		<td><fmt:message key="label.name" />: 
+		<td align="right"><fmt:message key="label.name" />: 
 		</td>
 		<td><bean:write name="fullName" />
 		</td>
 	</tr>
 	<tr>
-		<td><fmt:message key="label.email" />: 
+		<td align="right"><fmt:message key="label.email" />: 
 		</td>
 		<td><bean:write name="email" />
 		</td>
 	</tr>
 	<tr>
-		<td><fmt:message key="label.portrait.current" />:
+		<td align="right"><fmt:message key="label.portrait.current" />:
 		</td>
 		<td><logic:notEqual name="portraitUuid" value="0">
 				<img src="/lams/download/?uuid=<bean:write name="portraitUuid" />&preferDownload=false" />