Index: lams_admin/web/orglist.jsp
===================================================================
diff -u -r7ab9e2377fd1ff4c3c5554bd1f6dffe3384f6f9a -r6f173e62e8c96eac7da3535c7a4deff4c6be28d3
--- lams_admin/web/orglist.jsp	(.../orglist.jsp)	(revision 7ab9e2377fd1ff4c3c5554bd1f6dffe3384f6f9a)
+++ lams_admin/web/orglist.jsp	(.../orglist.jsp)	(revision 6f173e62e8c96eac7da3535c7a4deff4c6be28d3)
@@ -12,6 +12,21 @@
 	//-->
 </script>
 
+<style>
+table.infoDisplay {
+	margin-left:5px; padding-top:10px; width:100%;
+}
+p {
+	margin-left:5px;
+}
+.floatRight {
+	float:right;
+}
+.indentPad {
+	margin-left:5px; padding-top:10px;
+}
+</style>
+
 <logic:equal name="OrgManageForm" property="type" value="1">
 	<h4>
 		<a href="orgmanage.do?org=<bean:write name="OrgManageForm" property="parentId"/>"><fmt:message key="admin.course.manage" /></a>
@@ -20,14 +35,14 @@
 	
 	<form>
 	
-	<div style="float:right;">
+	<div class="floatRight">
 		<input class="button" type="button" value='Find Users' onclick=javascript:document.location='usersearch.do' />
 		<logic:equal name="manageGlobalRoles" value="true">
 			<input class="button" type="button" value='<fmt:message key="admin.global.roles.manage" />' onclick=javascript:document.location='usermanage.do?org=<c:out value="${OrgManageForm.parentId}"/>' />
 		</logic:equal>
 	</div>
-	<p style="margin-left:5px; padding-top:10px;"><c:out value="${numUsers}"/></p>
-	<div style="float:right;">
+	<p style="padding-top:10px;"><c:out value="${numUsers}"/></p>
+	<div class="floatRight">
 		<logic:equal name="createGroup" value="true">
 			<c:url var="editaction" value="organisation.do">
 				<c:param name="method" value="create" />
@@ -38,7 +53,7 @@
 		</logic:equal>
 	</div>
 	</form>
-	<html:form style="margin-left:5px; padding-top:10px;" action="orgmanage.do" method="post">
+	<html:form styleClass="indentPad" action="orgmanage.do" method="post">
 		<input type="hidden" name="org" value="<bean:write name="OrgManageForm" property="parentId"/>" />
 		<fmt:message key="label.show"/> <html:select property="stateId" onchange="document.OrgManageForm.submit();">
 			<html:option value="1"><fmt:message key="organisation.state.ACTIVE"/></html:option>
@@ -55,7 +70,7 @@
 	</h4>
 	<h1><bean:write name="OrgManageForm" property="parentName"/></h1>
 	
-	<table cellspacing="7" style="margin-left:5px; padding-top:10px; width:100%">
+	<table cellspacing="7" class="infoDisplay">
 		<tr>
 			<td align="right"><fmt:message key="admin.organisation.name"/>:</td>
 			<td><c:out value="${org.name}" /></td>
@@ -84,18 +99,18 @@
 	
 	<form>
 	
-	<p style="margin-left:5px;">
+	<p>
 	<logic:equal name="editGroup" value="true">
 		<input class="button" type="button" value='<fmt:message key="admin.edit" /> <bean:write name="OrgManageForm" property="parentName"/>' onclick=javascript:document.location='organisation.do?method=edit&orgId=<c:out value="${OrgManageForm.parentId}"/>' />
 	</logic:equal>
 	</p>
 	
-	<div style="float:right;">
+	<div class="floatRight">
 		<input class="button" type="button" value='<fmt:message key="admin.user.manage" />' onclick=javascript:document.location='usermanage.do?org=<c:out value="${OrgManageForm.parentId}"/>' />
 	</div>
-	<p style="margin-left:5px; padding-top:10px;"><c:out value="${numUsers}"/></p>
+	<p style="padding-top:10px;"><c:out value="${numUsers}"/></p>
 	
-	<div style="float:right;">
+	<div class="floatRight">
 		<c:url var="createSubgroupLink" value="organisation.do">
 			<c:param name="method" value="create" />
 			<c:param name="typeId" value="3" />
@@ -104,7 +119,7 @@
 		<input class="button" type="button" value='<fmt:message key="admin.class.add"/>' onclick=javascript:document.location='<c:out value="${createSubgroupLink}"/>' />
 	</div>
 	</form>
-	<html:form style="margin-left:5px; padding-top:10px;" action="orgmanage.do" method="post">
+	<html:form styleClass="indentPad" action="orgmanage.do" method="post">
 		<input type="hidden" name="org" value="<bean:write name="OrgManageForm" property="parentId"/>" />
 		<fmt:message key="label.show"/> <html:select property="stateId" onchange="document.OrgManageForm.submit();">
 			<html:option value="1"><fmt:message key="organisation.state.ACTIVE"/></html:option>
@@ -122,7 +137,7 @@
 	</h4>
 	<h1><bean:write name="OrgManageForm" property="parentName"/></h1>
 	
-	<table cellspacing="7" style="margin-left:5px; padding-top:10px; width:100%">
+	<table cellspacing="7" class="infoDisplay">
 		<tr>
 			<td align="right"><fmt:message key="admin.organisation.name"/>:</td>
 			<td><c:out value="${org.name}" /></td>
@@ -151,16 +166,16 @@
 	
 	<form>
 	
-	<p style="margin-left:5px;">
+	<p>
 	<logic:equal name="editGroup" value="true">
 		<input class="button" type="button" value='<fmt:message key="admin.edit" /> <bean:write name="OrgManageForm" property="parentName"/>' onclick=javascript:document.location='organisation.do?method=edit&orgId=<c:out value="${OrgManageForm.parentId}"/>' />
 	</logic:equal>
 	</p>
 	
-	<div style="float:right;">
+	<div class="floatRight">
 		<input class="button" type="button" value='<fmt:message key="admin.user.manage" />' onclick=javascript:document.location='usermanage.do?org=<c:out value="${OrgManageForm.parentId}"/>' />
 	</div>
-	<p style="margin-left:5px; padding-top:10px;"><c:out value="${numUsers}"/></p>
+	<p style="padding-top:10px;"><c:out value="${numUsers}"/></p>
 	
 	</form>
 </logic:equal>
Index: lams_admin/web/userlist.jsp
===================================================================
diff -u -r7ab9e2377fd1ff4c3c5554bd1f6dffe3384f6f9a -r6f173e62e8c96eac7da3535c7a4deff4c6be28d3
--- lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 7ab9e2377fd1ff4c3c5554bd1f6dffe3384f6f9a)
+++ lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 6f173e62e8c96eac7da3535c7a4deff4c6be28d3)
@@ -11,6 +11,17 @@
 	//-->
 </script>
 
+<style>
+table.infoDisplay {
+	margin-left:5px; padding-top:10px; width:60%;
+}
+p {
+	margin-left:5px;
+}
+.floatRight {
+	float:right;
+}
+</style>
 
 <h4>
 	<a href="orgmanage.do?org=1"><fmt:message key="admin.course.manage" /></a>
@@ -33,7 +44,7 @@
 </h1>
 
 <logic:notEqual name="orgType" value="1">
-<table cellspacing="7" style="margin-left:5px; padding-top:10px; width:60%">
+<table cellspacing="7" class="infoDisplay">
 	<tr>
 		<td align="right"><fmt:message key="label.learners"/>:</td>
 		<td><c:out value="${LEARNER}"/></td>
@@ -56,7 +67,7 @@
 </logic:notEqual>
 	
 <logic:equal name="orgType" value="1">
-<table cellspacing="7" style="margin-left:5px; padding-top:10px; width:60%">
+<table cellspacing="7" class="infoDisplay">
 	<tr>
 		<td align="right"><fmt:message key="label.sysadmins"/>:</td>
 		<td><c:out value="${SYSADMIN}"/></td>
@@ -74,16 +85,16 @@
 
 <form>
 	
-<p style="margin-left:5px;">
+<p>
 	<input class="button" type="button" value='<fmt:message key="admin.user.add"/>' onclick=javascript:document.location='userorg.do?orgId=<bean:write name="UserManageForm" property="orgId"/>' />
 </p>
 
-<div style="float:right;">
+<div class="floatRight">
 	<logic:equal name="UserManageForm" property="courseAdminCanAddNewUsers" value="true">
 		<input class="button" 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>
 </div>
-<p style="margin-left:5px; padding-top:10px;">
+<p style="padding-top:10px;">
 	<c:out value="${numUsers}"/>
 </p>