Index: lams_admin/web/organisation.jsp
===================================================================
diff -u -rd32ad084559609b1bf57bfe096a7e8634bf0f265 -r7ab9e2377fd1ff4c3c5554bd1f6dffe3384f6f9a
--- lams_admin/web/organisation.jsp	(.../organisation.jsp)	(revision d32ad084559609b1bf57bfe096a7e8634bf0f265)
+++ lams_admin/web/organisation.jsp	(.../organisation.jsp)	(revision 7ab9e2377fd1ff4c3c5554bd1f6dffe3384f6f9a)
@@ -4,33 +4,32 @@
 <html-el:hidden property="orgId" />
 <html-el:hidden property="parentId" />
 <html-el:hidden property="typeId" />
-<h2>
+<h4>
 	<a href="orgmanage.do?org=1"><fmt:message key="admin.course.manage" /></a>
 	
 	<logic:equal name="OrganisationForm" property="typeId" value="3">
-		: <a href="orgmanage.do?org=<bean:write name="OrganisationForm" property="parentId"  />"><bean:write name="OrganisationForm" property="parentName"/></a>
+		: <a href="orgmanage.do?org=<bean:write name="OrganisationForm" property="parentId" />"><bean:write name="OrganisationForm" property="parentName"/></a>
 	</logic:equal>
 	
 	<logic:notEmpty name="OrganisationForm" property="orgId">
-		: <a href="
-			<logic:equal name="OrganisationForm" property="typeId" value="2">org</logic:equal>
-			<logic:equal name="OrganisationForm" property="typeId" value="3">user</logic:equal>manage.do?org=<bean:write name="OrganisationForm" property="orgId" />">
-				<bean:write name="OrganisationForm" property="name"/>
-			</a>
-		: <fmt:message key="admin.edit"/>
+		: <a href="orgmanage.do?org=<bean:write name="OrganisationForm" property="orgId" />"><bean:write name="OrganisationForm" property="name"/></a>
 	</logic:notEmpty>
+</h4>
+
+<h1>
+	<logic:notEmpty name="OrganisationForm" property="orgId">
+		<fmt:message key="admin.edit"/> <bean:write name="OrganisationForm" property="name"/>
+	</logic:notEmpty>
 	<logic:empty name="OrganisationForm" property="orgId">
 		<logic:equal name="OrganisationForm" property="typeId" value="2">
-			: <fmt:message key="admin.course.add"/>
+			<fmt:message key="admin.course.add"/>
 		</logic:equal>
 		<logic:equal name="OrganisationForm" property="typeId" value="3">
-			: <fmt:message key="admin.class.add"/>
+			<fmt:message key="admin.class.add"/>
 		</logic:equal>
 	</logic:empty>
-</h2>
+</h1>
 
-<p>&nbsp;</p>
-
 <div align="center"><html-el:errors/></div>
 <table>
 	<tr>