Index: lams_central/web/editprofile.jsp
===================================================================
diff -u -r9b4827929f23cfae29c1bc1f17b04d1980697e04 -re6da30ccffaf4fa9ef768a374711746e2aa3b452
--- lams_central/web/editprofile.jsp	(.../editprofile.jsp)	(revision 9b4827929f23cfae29c1bc1f17b04d1980697e04)
+++ lams_central/web/editprofile.jsp	(.../editprofile.jsp)	(revision e6da30ccffaf4fa9ef768a374711746e2aa3b452)
@@ -22,9 +22,7 @@
 <div class="shading-bg">
 
 <table>
-	<tr>
-		<td></td>
-	</tr>
+	
     <tr>
 		<td class="align-right"><fmt:message key="label.username"/>:</td>
 		<td><bean:write name="UserForm" property="login" /></td>
@@ -102,13 +100,16 @@
 		</td>
 	</tr>
 	</table>
+			</div>
+			
+			
 			<div class="space-top" align="center">
 			<html:submit styleClass="button"><fmt:message key="button.save"/></html:submit>
 			<html:reset styleClass="button"><fmt:message key="button.reset"/></html:reset>
 			<html:cancel styleClass="button"><fmt:message key="button.cancel"/></html:cancel>
 			</div>
 
 
-</div>
 
+
 </html:form>
\ No newline at end of file
Index: lams_central/web/passwordChangeContent.jsp
===================================================================
diff -u -r12d5865bbe5303c3a733fe29f99a9c8cebc3160a -re6da30ccffaf4fa9ef768a374711746e2aa3b452
--- lams_central/web/passwordChangeContent.jsp	(.../passwordChangeContent.jsp)	(revision 12d5865bbe5303c3a733fe29f99a9c8cebc3160a)
+++ lams_central/web/passwordChangeContent.jsp	(.../passwordChangeContent.jsp)	(revision e6da30ccffaf4fa9ef768a374711746e2aa3b452)
@@ -6,17 +6,27 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 
 <html:form action="/passwordChanged" method="post">
-<table width="100%" height="177" border="0" cellpadding="5" cellspacing="0" bgcolor="#FFFFFF">
-	<tr> 
-		<td valign="top">
-			<H2><fmt:message key="title.password.change.screen"/></H2>
+
+
+<div style="clear:both"></div>
+
+
+<h2 class="small-space-top"><fmt:message key="title.password.change.screen"/></h2>
+
+	
+			
+<div class="shading-bg">
+
+
 			<logic:messagesPresent message="true"> 
 				<p class="warning">
 				<html:messages message="true" id="errMsg" >
-					<bean:write name="errMsg"/><BR>
+					<bean:write name="errMsg"/><br>
 				</html:messages>
 				</p>
 			</logic:messagesPresent>
+			
+		
 			<table class="body">
 				<tr>
 					<td class="align-right">
@@ -52,14 +62,14 @@
 					</td>
 				</tr>
 				<tr>
-					<td colspan="2" class="align-right">
-						<html:submit><fmt:message key="button.save"/></html:submit> &nbsp; 	
-						<html:cancel><fmt:message key="button.cancel"/></html:cancel>
+					<td>&nbsp;</td>
+				
+					<td>
+						<html:submit styleClass="button"><fmt:message key="button.save"/></html:submit>  	
+						<html:cancel  styleClass="button"><fmt:message key="button.cancel"/></html:cancel>
 					</td>
 				</tr>
 			</table>
-		</td>
-	</tr>
-</table>
+
 </html:form>
 			
\ No newline at end of file
Index: lams_central/web/portrait.jsp
===================================================================
diff -u -r12d5865bbe5303c3a733fe29f99a9c8cebc3160a -re6da30ccffaf4fa9ef768a374711746e2aa3b452
--- lams_central/web/portrait.jsp	(.../portrait.jsp)	(revision 12d5865bbe5303c3a733fe29f99a9c8cebc3160a)
+++ lams_central/web/portrait.jsp	(.../portrait.jsp)	(revision e6da30ccffaf4fa9ef768a374711746e2aa3b452)
@@ -1,42 +1,58 @@
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-logic" prefix="logic"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
-<html:form action="/saveportrait.do" method="post" enctype="multipart/form-data">
-<html:hidden name="PortraitActionForm" property="portraitUuid" />
-<table width="100%" height="177" border="0" cellpadding="5" cellspacing="0" bgcolor="#FFFFFF">
-	<tr> 
-		<td valign="top">
-			<H2><fmt:message key="title.portrait.change.screen"/></H2>
-			<logic:messagesPresent> 
-				<p class="warning"><html:errors /></p>
-			</logic:messagesPresent>
-			<table>
-				<tr>
-					<td class="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" />
-						</logic:notEqual>
-						<logic:equal name="PortraitActionForm" property="portraitUuid" value="0">
-							<i><fmt:message key="msg.portrait.none" /></i>
-						</logic:equal>
-					</td>
-				</tr>
-				<tr>
-					<td class="align-right"><fmt:message key="label.portrait.upload" />:</td>
-					<td><html:file property="file" /></td>
-				</tr>
-				<tr>
-					<td colspan="2" class="align-right">
-						<html:submit><fmt:message key="button.save"/></html:submit> &nbsp; 	
-						<html:cancel><fmt:message key="button.cancel"/></html:cancel>
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-<p><small><fmt:message key="msg.portrait.resized" /></small></p>
-</html:form>
\ No newline at end of file
+<html:form action="/saveportrait.do" method="post"
+	enctype="multipart/form-data">
+	<html:hidden name="PortraitActionForm" property="portraitUuid" />
+
+
+	<div style="clear:both"></div>
+
+	<h2 class="small-space-top"><fmt:message
+		key="title.portrait.change.screen" /></h2>
+
+	<div class="shading-bg"><logic:messagesPresent>
+		<p class="warning"><html:errors /></p>
+	</logic:messagesPresent>
+
+	<table>
+		<tr>
+			<td class="align-right" valign="top"><fmt:message
+				key="label.portrait.current" />:</td>
+			<td><logic:notEqual name="PortraitActionForm"
+				property="portraitUuid" value="0">
+				<img class="img-border"
+					src="/lams/download/?uuid=<bean:write name="PortraitActionForm" property="portraitUuid" />&preferDownload=false" />
+			</logic:notEqual> <logic:equal name="PortraitActionForm" property="portraitUuid"
+				value="0">
+				<c:set var="lams">
+					<lams:LAMSURL />
+				</c:set>
+				<em><fmt:message key="msg.portrait.none" /></em>
+				
+			</logic:equal></td>
+		</tr>
+		<tr>
+			<td class="align-right"><fmt:message key="label.portrait.upload" />:</td>
+			<td><html:file property="file" /></td>
+		</tr>
+		<tr>
+		<td>&nbsp;</td>
+			<td>
+			<html:submit styleClass="button"><fmt:message key="button.save" />	
+			</html:submit>  
+			<html:cancel styleClass="button"><fmt:message key="button.cancel" />
+			</html:cancel>
+			
+			</td>
+		</tr>
+	</table>
+
+	</div>
+
+	<p> <fmt:message key="msg.portrait.resized" />  </p>
+</html:form>
Index: lams_central/web/profile.jsp
===================================================================
diff -u -r9b4827929f23cfae29c1bc1f17b04d1980697e04 -re6da30ccffaf4fa9ef768a374711746e2aa3b452
--- lams_central/web/profile.jsp	(.../profile.jsp)	(revision 9b4827929f23cfae29c1bc1f17b04d1980697e04)
+++ lams_central/web/profile.jsp	(.../profile.jsp)	(revision e6da30ccffaf4fa9ef768a374711746e2aa3b452)
@@ -47,11 +47,11 @@
 
 			<li class="no-list-type"><a
 				href="index.do?state=active&tab=password"><fmt:message
-				key="title.password.change.screen" /> </a></li>
+				key="title.password.change.screen" /></a></li>
 
 			<li class="no-list-type"><a
 				href="index.do?state=active&tab=portrait"><fmt:message
-				key="title.portrait.change.screen" /> </a></li>
+				key="title.portrait.change.screen" /></a></li>
 		</ul>
 
 		</td>
@@ -65,15 +65,12 @@
 		<td class="align-right" valign="top"><span class="field-name"><fmt:message
 			key="label.portrait.current" />:</span></td>
 		<td valign="top"><logic:notEqual name="portraitUuid" value="0">
-			<img
+			<img class="img-border"
 				src="/lams/download/?uuid=<bean:write name="portraitUuid" />&preferDownload=false" />
 		</logic:notEqual> <logic:equal name="portraitUuid" value="0">
 			<c:set var="lams">
 				<lams:LAMSURL />
 			</c:set>
-
-
-
 				<em><fmt:message key="msg.portrait.none" /></em>
 			<div class="small-space-top">
 			<img src="${lams}/images/default_user.gif" alt="User Portrait"