Index: lams_admin/web/organisation.jsp
===================================================================
diff -u -r9272887d09b29a12412a313590f2e767c61f6405 -r6da91b1ff2dd9ac6d07f8a3b2dd3fbd8a63ecaaa
--- lams_admin/web/organisation.jsp	(.../organisation.jsp)	(revision 9272887d09b29a12412a313590f2e767c61f6405)
+++ lams_admin/web/organisation.jsp	(.../organisation.jsp)	(revision 6da91b1ff2dd9ac6d07f8a3b2dd3fbd8a63ecaaa)
@@ -10,7 +10,7 @@
 <html-el:hidden property="orgId" />
 <html-el:hidden property="parentId" />
 <html-el:hidden property="typeId" />
-<h4 align="left">
+<h2>
 	<logic:notEmpty name="OrganisationForm" property="orgId">
 		<fmt:message key="admin.edit"/>
 	</logic:notEmpty>
@@ -33,7 +33,7 @@
 		<fmt:message key="admin.course"/>
 	</logic:equal>
 	: <bean:write name="OrganisationForm" property="parentName"/>
-</h4>
+</h2>
 
 <div align="center"><html-el:errors/></div>
 <table>
Index: lams_admin/web/orglist.jsp
===================================================================
diff -u -r9272887d09b29a12412a313590f2e767c61f6405 -r6da91b1ff2dd9ac6d07f8a3b2dd3fbd8a63ecaaa
--- lams_admin/web/orglist.jsp	(.../orglist.jsp)	(revision 9272887d09b29a12412a313590f2e767c61f6405)
+++ lams_admin/web/orglist.jsp	(.../orglist.jsp)	(revision 6da91b1ff2dd9ac6d07f8a3b2dd3fbd8a63ecaaa)
@@ -7,7 +7,7 @@
 
 <form>
 <logic:equal name="OrgManageForm" property="type" value="1">
-	<h4 align="left"><fmt:message key="admin.course.manage" /> <fmt:message key="admin.in"/> <fmt:message key="admin.organisation"/>: <bean:write name="OrgManageForm" property="parentName"/></h4>
+	<h2><fmt:message key="admin.course.manage" /> <fmt:message key="admin.in"/> <fmt:message key="admin.organisation"/>: <bean:write name="OrgManageForm" property="parentName"/></h2>
 	<c:url var="editaction" value="organisation.do">
 		<c:param name="method" value="edit" />
 		<c:param name="typeId" value="2" />
@@ -26,19 +26,22 @@
 	</c:url>
 	<p align="right"><input type="button" value='<fmt:message key="admin.class.add"/>' onclick=javascript:document.location='<c:out value="${editaction}"/>' /></p>
 </logic:equal>
-<table width=100%>
+<table class=alternative-color width=100%>
 <tr>
+	<th><fmt:message key="admin.number"/></th>
 	<th><fmt:message key="admin.organisation.name"/></th>
 	<th><fmt:message key="admin.organisation.code"/></th>
 	<th><fmt:message key="admin.organisation.description"/></th>
 	<th><fmt:message key="admin.organisation.language"/></th>
 	<th><fmt:message key="admin.organisation.country"/></th>
 	<th><fmt:message key="admin.organisation.status"/></th>
-	<th></th>
 </tr>
-<logic:iterate id="orgManageBean" name="OrgManageForm" property="orgManageBeans">
+<logic:iterate id="orgManageBean" name="OrgManageForm" property="orgManageBeans" indexId="idx">
 	<tr>
 		<td>
+			<bean:write name="idx"/>
+		</td>
+		<td>
 			<bean:write name="orgManageBean" property="name" />
 		</td>
 		<td>
@@ -56,18 +59,22 @@
 		<td>
 			<fmt:message key="organisation.state.${orgManageBean.status}"/>
 		</td>
-		<td>
+	</tr>
+	<tr>
+		<td></td>
+		<td colspan="6">
 			<logic:equal name='orgManageBean' property='editable' value="true">
 				<a href="organisation.do?method=edit&orgId=<bean:write name='orgManageBean' property='organisationId' />"><fmt:message key="admin.edit"/></a>
 				&nbsp;
 				<a href="organisation.do?method=remove&orgId=<bean:write name='orgManageBean' property='organisationId' />&parentId=<bean:write name='OrgManageForm' property='parentId'/>"><fmt:message key="admin.remove"/></a>
-				<br/>
+				&nbsp;
 				<a href="usermanage.do?org=<bean:write name='orgManageBean' property='organisationId'/>" target="_blank"><fmt:message key="admin.user.manage"/></a>
+				&nbsp;
 				<logic:equal name="OrgManageForm" property="type" value="1">
-					<br/><a href="orgmanage.do?org=<bean:write name='orgManageBean' property='organisationId'/>" target="_blank"><fmt:message key="admin.class.manage"/></a>
+					<a href="orgmanage.do?org=<bean:write name='orgManageBean' property='organisationId'/>" target="_blank"><fmt:message key="admin.class.manage"/></a>
 				</logic:equal>
 			</logic:equal>
-		</td>		
+		</td>
 	</tr>
 </logic:iterate>
 </table>
Index: lams_admin/web/template.jsp
===================================================================
diff -u -r2d7dac5c42c8be102082a3fec1befac5d63e582f -r6da91b1ff2dd9ac6d07f8a3b2dd3fbd8a63ecaaa
--- lams_admin/web/template.jsp	(.../template.jsp)	(revision 2d7dac5c42c8be102082a3fec1befac5d63e582f)
+++ lams_admin/web/template.jsp	(.../template.jsp)	(revision 6da91b1ff2dd9ac6d07f8a3b2dd3fbd8a63ecaaa)
@@ -18,24 +18,11 @@
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 </head>
     
-<body bgcolor="#9DC5EC" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
-<table width="95%" height="95%" border="0" cellspacing="0" cellpadding="0" align="center">
-	<tr>
-		<td>
-	        <c:set var="pageHeader" scope="session"><tiles:getAsString name="pageHeader"/></c:set>
-			<tiles:insert attribute="header" />
-		</td>
-	</tr>
-	<tr>
-		<td width="100%" height="100%" align="center" valign="middle" bgcolor="#FFFFFF">	
+<body>
+<div id="page">
+	<div id="content">
 			<tiles:insert attribute="content" />
-		</td>
-	</tr>
-	<tr>
-		<td>		
-			<tiles:insert attribute="footer" />
-		</td>
-	</tr>		
-</table>
+	</div>
+</div>
 </body>
 </html:html>