Index: lams_admin/web/organisation.jsp
===================================================================
diff -u -rd25b338aba71bb27bc7b78731f4e88a7c4109447 -rbe0aa08da2cfa23545d9555e3b7c79b404f55229
--- lams_admin/web/organisation.jsp	(.../organisation.jsp)	(revision d25b338aba71bb27bc7b78731f4e88a7c4109447)
+++ lams_admin/web/organisation.jsp	(.../organisation.jsp)	(revision be0aa08da2cfa23545d9555e3b7c79b404f55229)
@@ -1,7 +1,11 @@
-<html:form action="/admin/organisation" method="post">
-<html:hidden property="organisationId" />
-<html:hidden name="parentOrganisation" property="organisationId" />
-<html:hidden name="organisationType" property="organisationTypeId">
+<%@ page contentType="text/html; charset=utf-8" language="java" %>
+
+<%@ taglib uri="tags-html" prefix="html" %>
+
+<html:form action="orgsave.do" method="post">
+<html:hidden property="orgId" />
+<html:hidden property="parentId" />
+<html:hidden property="typeId" />
 <table>
 	<tr>
 		<td>Name:</td>
@@ -34,7 +38,7 @@
 	<tr>
 		<td>State</td>
 		<td>
-			<html:select name="organisationState" property="organisationStateId">
+			<html:select property="stateId">
 				<html:option key="organisation.state.active" value="1" />
 				<html:option key="organisation.state.hidden" value="2" />
 				<html:option key="organisation.state.archived" value="3" />
Index: lams_admin/web/orglist.jsp
===================================================================
diff -u -r63fe6fbe11cc88bbcb8c3e87d4cb14025ef0ec96 -rbe0aa08da2cfa23545d9555e3b7c79b404f55229
--- lams_admin/web/orglist.jsp	(.../orglist.jsp)	(revision 63fe6fbe11cc88bbcb8c3e87d4cb14025ef0ec96)
+++ lams_admin/web/orglist.jsp	(.../orglist.jsp)	(revision be0aa08da2cfa23545d9555e3b7c79b404f55229)
@@ -7,23 +7,23 @@
 
 <form>
 <logic:equal name="OrgManageForm" property="type" value="1">
-	<h4><fmt:message key="admin.course.manage" /></h4>
-	<p>Parent Organisation:<bean:write name="OrgManageForm" property="parentName"/></p>
-	<p align="right"><input type="button" value='<fmt:message key="admin.course.add"/>' onclick=javascript:document.location='/organisation.do?method=add&parent=<bean:write name="OrgManageForm" property="parentId"/>' /></p>
+	<h4 align="left"><fmt:message key="admin.course.manage" /></h4>
+	<p align="left">Parent Organisation:<bean:write name="OrgManageForm" property="parentName"/></p>
+	<p align="right"><input type="button" value='<fmt:message key="admin.course.add"/>' onclick=javascript:document.location='organisation.do?method=edit&parentId=<bean:write name="OrgManageForm" property="parentId"/>' /></p>
 </logic:equal>
 <logic:equal name="OrgManageForm" property="type" value="2">
-	<h4><fmt:message key="admin.class.manage" /></h4>
-	<p>Parent Organisation:<bean:write name="parentOrganisaton" property="name"/></p>
-	<p align="right"><input type="button" value='<fmt:message key="admin.class.add"/>' onclick=javascript:document.location='/organisation.do?method=add&parent=<bean:write name="OrgManageForm" property="parentId"/>'/></p>
+	<h4 align="left"><fmt:message key="admin.class.manage" /></h4>
+	<p align="left">Parent Organisation:<bean:write name="OrgManageForm" property="parentName"/></p>
+	<p align="right"><input type="button" value='<fmt:message key="admin.class.add"/>' onclick=javascript:document.location='organisation.do?method=edit&parentId=<bean:write name="OrgManageForm" property="parentId"/>'/></p>
 </logic:equal>
 <table width=100%>
 <tr>
-	<th>Name</th>
-	<th>Code</th>
-	<th>Description</th>
-	<th>Language</th>
-	<th>Country</th>
-	<th>Status</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">
@@ -44,17 +44,18 @@
 			<bean:write name='orgManageBean' property='localeCountry'/>
 		</td>
 		<td>
-			<bean:write name='orgManageBean' property='status'/>
+			<!--bean:write name='orgManageBean' property='status'/-->
+			<fmt:message key="organisation.status.${orgManageBean.status}"/>
 		</td>
 		<td>
 			<logic:equal name='orgManageBean' property='editable' value="true">
-				<a href="/organisation.do?method=edit&org=<bean:write name='orgManageBean' property='organisationId' />"><fmt:message key="admin.edit"/></a>
+				<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&org=<bean:write name='orgManageBean' property='organisationId' />"><fmt:message key="admin.remove"/></a>
+				<a href="/organisation.do?method=remove&orgId=<bean:write name='orgManageBean' property='organisationId' />"><fmt:message key="admin.remove"/></a>
 				<br/>
-				<a href="/usermanage.do?org=<bean:write name='orgManageBean' property='organisationId'/>"><fmt:message key="admin.user.manage"/></a>
+				<a href="/usermanage.do?org=<bean:write name='orgManageBean' property='organisationId'/>" target="_blank"><fmt:message key="admin.user.manage"/></a>
 				<logic:equal name="OrgManageForm" property="type" value="1">
-					<br/><a href="orgmanage.do?org=<bean:write name='orgManageBean' property='organisationId'/>"><fmt:message key="admin.class.manage"/></a>
+					<br/><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>		
Index: lams_admin/web/sysadmin.jsp
===================================================================
diff -u -r63fe6fbe11cc88bbcb8c3e87d4cb14025ef0ec96 -rbe0aa08da2cfa23545d9555e3b7c79b404f55229
--- lams_admin/web/sysadmin.jsp	(.../sysadmin.jsp)	(revision 63fe6fbe11cc88bbcb8c3e87d4cb14025ef0ec96)
+++ lams_admin/web/sysadmin.jsp	(.../sysadmin.jsp)	(revision be0aa08da2cfa23545d9555e3b7c79b404f55229)
@@ -3,7 +3,7 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<H1>System Administration</H1>
+<H1><fmt:message key="sysadmin.headline"/></H1>
 
 <UL>
 <LI><A HREF="cache.do"><fmt:message key="cache.title"/></A></LI>
Index: lams_admin/web/template.jsp
===================================================================
diff -u -r63fe6fbe11cc88bbcb8c3e87d4cb14025ef0ec96 -rbe0aa08da2cfa23545d9555e3b7c79b404f55229
--- lams_admin/web/template.jsp	(.../template.jsp)	(revision 63fe6fbe11cc88bbcb8c3e87d4cb14025ef0ec96)
+++ lams_admin/web/template.jsp	(.../template.jsp)	(revision be0aa08da2cfa23545d9555e3b7c79b404f55229)
@@ -23,7 +23,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td width="100%" height="100%" align="left" valign="middle" bgcolor="#FFFFFF">	
+		<td width="100%" height="100%" align="center" valign="middle" bgcolor="#FFFFFF">	
 			<tiles:insert attribute="content" />
 		</td>
 	</tr>