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>