Index: lams_admin/conf/language/ApplicationResources.properties
===================================================================
diff -u -r25a7afaedbf5e9c2aa629a5dbde8856c149376e5 -ra7b0a98ccdef7a9308b07052506a7d3d8ecfa307
--- lams_admin/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 25a7afaedbf5e9c2aa629a5dbde8856c149376e5)
+++ lams_admin/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a7b0a98ccdef7a9308b07052506a7d3d8ecfa307)
@@ -101,6 +101,7 @@
 admin.user.delete = Delete User
 admin.user.actions = Actions
 admin.user.import = Import Users
+admin.list.disabled.users = List Disabled Users
 label.excel.spreadsheet = Excel Spreadsheet
 label.spreadsheet = spreadsheet
 label.download.template = Download the template
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelSaveAction.java
===================================================================
diff -u -r0892350e28ca67031ad97e624f167dccd6272871 -ra7b0a98ccdef7a9308b07052506a7d3d8ecfa307
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelSaveAction.java	(.../ImportExcelSaveAction.java)	(revision 0892350e28ca67031ad97e624f167dccd6272871)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelSaveAction.java	(.../ImportExcelSaveAction.java)	(revision a7b0a98ccdef7a9308b07052506a7d3d8ecfa307)
@@ -49,7 +49,7 @@
  * 				validate="false"
  * 
  * @struts:action-forward name="importresult" path=".importresult"
- * @struts:action-forward name="usersearch" path=".usersearchlist"
+ * @struts:action-forward name="sysadmin" path=".sysadmin"
  */
 public class ImportExcelSaveAction extends Action {
 	
@@ -60,7 +60,7 @@
 		
 		if (isCancelled(request)) {
 			//return mapping.getInputForward();
-			return mapping.findForward("usersearch");
+			return mapping.findForward("sysadmin");
 		}
 		
 		ImportExcelForm importExcelForm = (ImportExcelForm)form;
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java
===================================================================
diff -u -r622101803252450b96cc9882a17ae20de4f6e431 -ra7b0a98ccdef7a9308b07052506a7d3d8ecfa307
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java	(.../OrgSaveAction.java)	(revision 622101803252450b96cc9882a17ae20de4f6e431)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java	(.../OrgSaveAction.java)	(revision a7b0a98ccdef7a9308b07052506a7d3d8ecfa307)
@@ -72,10 +72,9 @@
  *                scope="request"
  *                validate="false"
  *
- * @struts:action-forward name="organisation"
- *                        path=".organisation"                
- * @struts:action-forward name="orglist"
- *                        path="/orgmanage.do"
+ * @struts:action-forward name="organisation" path=".organisation"                
+ * @struts:action-forward name="orglist" path="/orgmanage.do"
+ * @struts:action-forward name="userlist" path="/usermanage.do"
  */
 
 public class OrgSaveAction extends Action {
@@ -91,19 +90,26 @@
 		
 		service = AdminServiceProxy.getService(getServlet().getServletContext());
 		DynaActionForm orgForm = (DynaActionForm)form;
-
+		Integer orgId = (Integer)orgForm.get("orgId");
+		Organisation org;
+		
 		if(isCancelled(request)){
-			request.setAttribute("org",orgForm.get("parentId"));
+			if(orgId!=0) {
+				request.setAttribute("org",orgId);
+				org = (Organisation)service.findById(Organisation.class,orgId);
+				if(org.getOrganisationType().getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE))
+					return mapping.findForward("userlist");
+			} else {
+				request.setAttribute("org",orgForm.get("parentId"));
+			}
 			return mapping.findForward("orglist");
 		}
+		
 		ActionMessages errors = new ActionMessages();
 		if((orgForm.get("name")==null)||(((String)orgForm.getString("name").trim()).length()==0)){
 			errors.add("name",new ActionMessage("error.name.required"));
 		}
 		if(errors.isEmpty()){
-			Integer orgId = (Integer)orgForm.get("orgId");
-			Organisation org;
-
 			HttpSession ss = SessionManager.getSession();
 			UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 			SupportedLocale locale = (SupportedLocale)service.findById(SupportedLocale.class,(Byte)orgForm.get("localeId"));
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java
===================================================================
diff -u -rc926a867e461f43093a9b13a1d3a76c9385cc5d0 -ra7b0a98ccdef7a9308b07052506a7d3d8ecfa307
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java	(.../OrganisationAction.java)	(revision c926a867e461f43093a9b13a1d3a76c9385cc5d0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java	(.../OrganisationAction.java)	(revision a7b0a98ccdef7a9308b07052506a7d3d8ecfa307)
@@ -89,6 +89,13 @@
 			request.setAttribute("errorName", "OrganisationAction");
 			request.setAttribute("errorMessage", messageService.getMessage("error.authorisation"));
 			return mapping.findForward("error");
+		} else {
+			// creating new organisation
+			Integer parentId = WebUtil.readIntParam(request,"parentId",true);
+			if (parentId!=null) {
+				Organisation parentOrg = (Organisation)service.findById(Organisation.class,parentId);
+				orgForm.set("parentName", parentOrg.getName());
+			}
 		}
 		request.getSession().setAttribute("locales",locales);
 		request.getSession().setAttribute("status",status);
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java
===================================================================
diff -u -r622101803252450b96cc9882a17ae20de4f6e431 -ra7b0a98ccdef7a9308b07052506a7d3d8ecfa307
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	(.../UserAction.java)	(revision 622101803252450b96cc9882a17ae20de4f6e431)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	(.../UserAction.java)	(revision a7b0a98ccdef7a9308b07052506a7d3d8ecfa307)
@@ -131,6 +131,17 @@
 			}
 		}
 		userForm.set("orgId", (org==null ? null : org.getOrganisationId()));
+		
+		// for breadcrumb links
+		if (org!=null) {
+			request.setAttribute("orgName",org.getName());
+			Organisation parentOrg = org.getParentOrganisation();
+			if (parentOrg!=null && !parentOrg.equals(service.getRootOrganisation())) {
+				request.setAttribute("pOrgId", parentOrg.getOrganisationId());
+				request.setAttribute("parentName", parentOrg.getName());
+			}
+		}
+		
 		request.setAttribute("locales",locales);
 
 		return mapping.findForward("user");
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgAction.java
===================================================================
diff -u -r622101803252450b96cc9882a17ae20de4f6e431 -ra7b0a98ccdef7a9308b07052506a7d3d8ecfa307
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgAction.java	(.../UserOrgAction.java)	(revision 622101803252450b96cc9882a17ae20de4f6e431)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgAction.java	(.../UserOrgAction.java)	(revision a7b0a98ccdef7a9308b07052506a7d3d8ecfa307)
@@ -94,7 +94,7 @@
 		String orgName = organisation.getName();
 		log.debug("orgName: "+orgName);
 		Organisation parentOrg = organisation.getParentOrganisation();
-		if(parentOrg!=null){
+		if(parentOrg!=null && !parentOrg.equals(service.getRootOrganisation())){
 			request.setAttribute("pOrgId",parentOrg.getOrganisationId());
 			request.setAttribute("pOrgName",parentOrg.getName());
 		}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleAction.java
===================================================================
diff -u -r622101803252450b96cc9882a17ae20de4f6e431 -ra7b0a98ccdef7a9308b07052506a7d3d8ecfa307
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleAction.java	(.../UserOrgRoleAction.java)	(revision 622101803252450b96cc9882a17ae20de4f6e431)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleAction.java	(.../UserOrgRoleAction.java)	(revision a7b0a98ccdef7a9308b07052506a7d3d8ecfa307)
@@ -84,6 +84,15 @@
 		Organisation organisation = (Organisation)service.findById(Organisation.class, (Integer)request.getAttribute("orgId"));
 		userOrgRoleForm.setOrgId(organisation.getOrganisationId());
 		
+		// display breadcrumb links
+		request.setAttribute("orgName", organisation.getName());
+		Organisation parentOrg = organisation.getParentOrganisation();
+		if(parentOrg!=null && !parentOrg.equals(service.getRootOrganisation())){
+			request.setAttribute("pOrgId",parentOrg.getOrganisationId());
+			request.setAttribute("pOrgName",parentOrg.getName());
+		}
+		request.setAttribute("orgType",organisation.getOrganisationType().getOrganisationTypeId());
+		
 		// populate form with users
 		ArrayList userOrgs = (ArrayList)request.getAttribute("newUserOrganisations");
 		for(int i=0; i<userOrgs.size(); i++){
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserRolesAction.java
===================================================================
diff -u -r622101803252450b96cc9882a17ae20de4f6e431 -ra7b0a98ccdef7a9308b07052506a7d3d8ecfa307
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserRolesAction.java	(.../UserRolesAction.java)	(revision 622101803252450b96cc9882a17ae20de4f6e431)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserRolesAction.java	(.../UserRolesAction.java)	(revision a7b0a98ccdef7a9308b07052506a7d3d8ecfa307)
@@ -122,10 +122,16 @@
 		
 		userRolesForm.set("userId",userId);
 		userRolesForm.set("orgId", org.getOrganisationId());
+		// screen display vars
 		request.setAttribute("rolelist",filterRoles(rolelist,isSysadmin,orgType));
 		request.setAttribute("login", user.getLogin());
 		request.setAttribute("fullName", user.getFullName());
 		request.setAttribute("orgName", org.getName());
+		Organisation parentOrg = org.getParentOrganisation();
+		if (parentOrg!=null && !parentOrg.equals(service.getRootOrganisation())) {
+			request.setAttribute("pOrgId", parentOrg.getOrganisationId());
+			request.setAttribute("parentName", parentOrg.getName());
+		}
 		
 		String[] roles = null;
 		UserOrganisation uo = service.getUserOrganisation(userId, orgId);
Index: lams_admin/web/disabledusers.jsp
===================================================================
diff -u -ra2e0d660d0c50a18dd23de83d3f14ae98e2695c9 -ra7b0a98ccdef7a9308b07052506a7d3d8ecfa307
--- lams_admin/web/disabledusers.jsp	(.../disabledusers.jsp)	(revision a2e0d660d0c50a18dd23de83d3f14ae98e2695c9)
+++ lams_admin/web/disabledusers.jsp	(.../disabledusers.jsp)	(revision a7b0a98ccdef7a9308b07052506a7d3d8ecfa307)
@@ -6,7 +6,9 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 
 <form>
-<h2>Disabled Users</h2>
+<h2>
+	<a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a>
+	: <fmt:message key="admin.list.disabled.users"/></h2>
 <p>&nbsp;</p>
 <table class="alternative-color" width=100%>
 <tr>
Index: lams_admin/web/import/importexcel.jsp
===================================================================
diff -u -r0892350e28ca67031ad97e624f167dccd6272871 -ra7b0a98ccdef7a9308b07052506a7d3d8ecfa307
--- lams_admin/web/import/importexcel.jsp	(.../importexcel.jsp)	(revision 0892350e28ca67031ad97e624f167dccd6272871)
+++ lams_admin/web/import/importexcel.jsp	(.../importexcel.jsp)	(revision a7b0a98ccdef7a9308b07052506a7d3d8ecfa307)
@@ -6,10 +6,14 @@
 <%@ taglib uri="tags-logic" prefix="logic" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 
-<h2><fmt:message key="admin.user.import" /></h2>
+<h2>
+	<a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a>
+	: <fmt:message key="admin.user.import" />
+</h2>
 
-<html:form action="/importexcelsave.do" method="post" enctype="multipart/form-data">
+<p>&nbsp;</p>
 
+<html:form action="/importexcelsave.do" method="post" enctype="multipart/form-data">
 <html:hidden property="orgId" />
 
 <table>
Index: lams_admin/web/import/importresult.jsp
===================================================================
diff -u -r0892350e28ca67031ad97e624f167dccd6272871 -ra7b0a98ccdef7a9308b07052506a7d3d8ecfa307
--- lams_admin/web/import/importresult.jsp	(.../importresult.jsp)	(revision 0892350e28ca67031ad97e624f167dccd6272871)
+++ lams_admin/web/import/importresult.jsp	(.../importresult.jsp)	(revision a7b0a98ccdef7a9308b07052506a7d3d8ecfa307)
@@ -6,8 +6,13 @@
 <%@ taglib uri="tags-logic" prefix="logic" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 
-<h2><fmt:message key="admin.user.import" /></h2>
+<h2>
+	<a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a>
+	: <fmt:message key="admin.user.import" />
+</h2>
 
+<p>&nbsp;</p>
+
 <p>
 <c:out value="${successful}" /><br />
 <logic:iterate name="results" id="messages" indexId="index">
@@ -20,6 +25,8 @@
 </logic:iterate>
 </p>
 
+<p>&nbsp;</p>
+
 <p>
 	<input type="submit" class="button" value="Ok"
 		onclick="javascript:document.location='usersearch.do';" />
Index: lams_admin/web/organisation.jsp
===================================================================
diff -u -raad0d5042c0ee03387450256ed79217ddf9bd73e -ra7b0a98ccdef7a9308b07052506a7d3d8ecfa307
--- lams_admin/web/organisation.jsp	(.../organisation.jsp)	(revision aad0d5042c0ee03387450256ed79217ddf9bd73e)
+++ lams_admin/web/organisation.jsp	(.../organisation.jsp)	(revision a7b0a98ccdef7a9308b07052506a7d3d8ecfa307)
@@ -11,30 +11,32 @@
 <html-el:hidden property="parentId" />
 <html-el:hidden property="typeId" />
 <h2>
+	<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>
+	</logic:equal>
+	
 	<logic:notEmpty name="OrganisationForm" property="orgId">
-		<fmt:message key="admin.edit"/>
+		: <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"/>
 	</logic:notEmpty>
 	<logic:empty name="OrganisationForm" property="orgId">
-		<fmt:message key="admin.create"/>
+		<logic:equal name="OrganisationForm" property="typeId" value="2">
+			: <fmt:message key="admin.course.add"/>
+		</logic:equal>
+		<logic:equal name="OrganisationForm" property="typeId" value="3">
+			: <fmt:message key="admin.class.add"/>
+		</logic:equal>
 	</logic:empty>
-	&nbsp;
-	<logic:equal name="OrganisationForm" property="typeId" value="2">
-		<fmt:message key="admin.course"/>
-	</logic:equal>
-	<logic:equal name="OrganisationForm" property="typeId" value="3">
-		<fmt:message key="admin.class"/>
-	</logic:equal>
-	&nbsp;
-	<fmt:message key="admin.in"/>&nbsp;
-	<logic:equal name="OrganisationForm" property="typeId" value="2">
-		<fmt:message key="admin.organisation"/>
-	</logic:equal>
-	<logic:equal name="OrganisationForm" property="typeId" value="3">
-		<fmt:message key="admin.course"/>
-	</logic:equal>
-	: <bean:write name="OrganisationForm" property="parentName"/>
 </h2>
 
+<p>&nbsp;</p>
+
 <div align="center"><html-el:errors/></div>
 <table>
 	<tr>
Index: lams_admin/web/orglist.jsp
===================================================================
diff -u -r970051cfc82b903b4bb236a80e6e720efba93889 -ra7b0a98ccdef7a9308b07052506a7d3d8ecfa307
--- lams_admin/web/orglist.jsp	(.../orglist.jsp)	(revision 970051cfc82b903b4bb236a80e6e720efba93889)
+++ lams_admin/web/orglist.jsp	(.../orglist.jsp)	(revision a7b0a98ccdef7a9308b07052506a7d3d8ecfa307)
@@ -7,7 +7,10 @@
 
 <form>
 <logic:equal name="OrgManageForm" property="type" value="1">
-	<h2><fmt:message key="admin.course.manage" /> <fmt:message key="admin.in"/> <fmt:message key="admin.organisation"/>: <bean:write name="OrgManageForm" property="parentName"/></h2>
+	<h2>
+		<a href="orgmanage.do?org=<bean:write name="OrgManageForm" property="parentId"/>"><fmt:message key="admin.course.manage" /></a>
+	</h2>
+	<p>&nbsp;</p>
 	<logic:equal name="isSysadmin" value="true">
 		<c:url var="editaction" value="organisation.do">
 			<c:param name="method" value="edit" />
@@ -18,13 +21,22 @@
 	</logic:equal>
 </logic:equal>
 <logic:equal name="OrgManageForm" property="type" value="2">
-	<h2><fmt:message key="admin.class.manage" /> <fmt:message key="admin.in"/> <fmt:message key="admin.course"/>:<bean:write name="OrgManageForm" property="parentName"/></h2>
+	<h2>
+		<a href="orgmanage.do?org=1"><fmt:message key="admin.course.manage" /></a>
+		: <a href="orgmanage.do?org=<bean:write name="OrgManageForm" property="parentId"/>"><bean:write name="OrgManageForm" property="parentName"/></a>
+		: <fmt:message key="admin.class.manage" />
+	</h2>
+	<p>&nbsp;</p>
 	<c:url var="editaction" value="organisation.do">
 		<c:param name="method" value="edit" />
 		<c:param name="typeId" value="3" />
 		<c:param name="parentId" value="${OrgManageForm.parentId}" />
 	</c:url>
-	<p align="right"><input type="button" value='<fmt:message key="admin.class.add"/>' onclick=javascript:document.location='<c:out value="${editaction}"/>' /></p>
+	<p align="right">
+		<input type="button" value='<fmt:message key="admin.class.add"/>' onclick=javascript:document.location='<c:out value="${editaction}"/>' />
+		<input type="button" value='<fmt:message key="admin.user.manage" />' onclick=javascript:document.location='usermanage.do?org=<c:out value="${OrgManageForm.parentId}"/>' />
+		<input 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}"/>' />
+	</p>
 </logic:equal>
 <table class=alternative-color width=100%>
 <tr>
@@ -37,7 +49,12 @@
 <logic:iterate id="orgManageBean" name="OrgManageForm" property="orgManageBeans" indexId="idx">
 	<tr>
 		<td>
-			<bean:write name="orgManageBean" property="name" />
+			<logic:equal name="OrgManageForm" property="type" value="1">
+				<a href="orgmanage.do?org=<bean:write name='orgManageBean' property='organisationId'/>"><bean:write name="orgManageBean" property="name" /></a>
+			</logic:equal>
+			<logic:equal name="OrgManageForm" property="type" value="2">
+				<a href="usermanage.do?org=<bean:write name='orgManageBean' property='organisationId'/>"><bean:write name="orgManageBean" property="name" /></a>
+			</logic:equal>
 		</td>
 		<td>
 			<bean:write name="orgManageBean" property="code" />
@@ -52,19 +69,6 @@
 			<fmt:message key="organisation.state.${orgManageBean.status}"/>
 		</td>
 	</tr>
-	<tr>
-		<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;
-				<logic:equal name="OrgManageForm" property="type" value="1">
-					<a href="orgmanage.do?org=<bean:write name='orgManageBean' property='organisationId'/>" target="_blank"><fmt:message key="admin.class.manage"/></a>
-					&nbsp;
-				</logic:equal>
-			</logic:equal>
-			<a href="usermanage.do?org=<bean:write name='orgManageBean' property='organisationId'/>" target="_blank"><fmt:message key="admin.user.manage"/></a>
-		</td>
-	</tr>
 </logic:iterate>
 </table>
 </form>
\ No newline at end of file
Index: lams_admin/web/sysadmin.jsp
===================================================================
diff -u -r29551b741b1aec1a353848c10813385d7d72c3c8 -ra7b0a98ccdef7a9308b07052506a7d3d8ecfa307
--- lams_admin/web/sysadmin.jsp	(.../sysadmin.jsp)	(revision 29551b741b1aec1a353848c10813385d7d72c3c8)
+++ lams_admin/web/sysadmin.jsp	(.../sysadmin.jsp)	(revision a7b0a98ccdef7a9308b07052506a7d3d8ecfa307)
@@ -5,15 +5,21 @@
 
 <h1 class=no-tabs-below><fmt:message key="sysadmin.headline"/></h1>
 <br />
-<p><a href="cache.do"><fmt:message key="cache.title"/></a></p>
+<p><a href="<lams:LAMSURL/>admin/cache.do"><fmt:message key="cache.title"/></a></p>
 
-<p><a href="<lams:LAMSURL/>admin/loginmaintain.do"><fmt:message key="sysadmin.maintain.loginpage"/></a></p>
+<p><fmt:message key="sysadmin.batch.temp.file.delete"/></p>
 
-<p><a href="<lams:LAMSURL/>admin/serverlist.do"><fmt:message key="sysadmin.maintain.external.servers"/></a></p>
-
 <p><a href="<lams:LAMSURL/>admin/config.do"><fmt:message key="sysadmin.config.settings.edit"/></a></p>
 
-<p><fmt:message key="sysadmin.batch.temp.file.delete"/></p>
+<p><a href="<lams:LAMSURL/>admin/usersearch.do"><fmt:message key="admin.user.find"/></a></p>
 
+<p><a href="<lams:LAMSURL/>admin/importexcel.do"><fmt:message key="admin.user.import"/></a></p>
+
+<p><a href="<lams:LAMSURL/>admin/disabledmanage.do"><fmt:message key="admin.list.disabled.users"/></a></p>
+
+<p><a href="<lams:LAMSURL/>admin/loginmaintain.do"><fmt:message key="sysadmin.maintain.loginpage"/></a></p>
+
+<p><a href="<lams:LAMSURL/>admin/serverlist.do"><fmt:message key="sysadmin.maintain.external.servers"/></a></p>
+
 <p><a href="<lams:LAMSURL/>admin/register.do"><fmt:message key="sysadmin.register.server"/></a><p>
 
Index: lams_admin/web/template.jsp
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -ra7b0a98ccdef7a9308b07052506a7d3d8ecfa307
--- lams_admin/web/template.jsp	(.../template.jsp)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_admin/web/template.jsp	(.../template.jsp)	(revision a7b0a98ccdef7a9308b07052506a7d3d8ecfa307)
@@ -14,7 +14,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta http-equiv="pragma" content="no-cache">
 	<meta http-equiv="cache-control" content="no-cache">
-	<lams:css  style="core"/>
+	<lams:css style="learner"/>
 	<script language="JavaScript" type="text/JavaScript" src="<lams:LAMSURL/>/includes/javascript/changeStyle.js"></script>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 </head>
Index: lams_admin/web/user.jsp
===================================================================
diff -u -rd1d4b9a5af1887e382f087d7c8f858f0f7983bdc -ra7b0a98ccdef7a9308b07052506a7d3d8ecfa307
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision d1d4b9a5af1887e382f087d7c8f858f0f7983bdc)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision a7b0a98ccdef7a9308b07052506a7d3d8ecfa307)
@@ -10,14 +10,30 @@
 <html-el:hidden property="userId" />
 <html-el:hidden property="orgId" />
 <h2 align="left">
+	<logic:notEmpty name="UserForm" property="orgId">
+		<a href="orgmanage.do?org=1"><fmt:message key="admin.course.manage" /></a>
+		<logic:notEmpty name="pOrgId">
+			: <a href="orgmanage.do?org=<c:out value="${pOrgId}" />"><c:out value="${parentName}" /></a>
+			: <a href="usermanage.do?org=<bean:write name="UserForm" property="orgId" />"><c:out value="${orgName}" /></a>
+		</logic:notEmpty>
+		<logic:empty name="pOrgId">
+			: <a href="orgmanage.do?org=<bean:write name="UserForm" property="orgId" />"><c:out value="${orgName}" /></a>
+		</logic:empty>
+	</logic:notEmpty>
+	<logic:empty name="UserForm" property="orgId">
+		<a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a>
+		: <a href="usersearch.do"><fmt:message key="admin.user.find" /></a>
+	</logic:empty>
 	<logic:notEmpty name="UserForm" property="userId">
-		<fmt:message key="admin.user.edit"/>
+		: <fmt:message key="admin.user.edit"/>
 	</logic:notEmpty>
 	<logic:empty name="UserForm" property="userId">
-		<fmt:message key="admin.user.create"/>
+		: <fmt:message key="admin.user.create"/>
 	</logic:empty>
 </h2>
 
+<p>&nbsp;</p>
+
 <div align="center"><html-el:errors/></div>
 <table>
 	<tr>
Index: lams_admin/web/userlist.jsp
===================================================================
diff -u -r1ae8efc0a44c969acdf3311f34085998edbf9152 -ra7b0a98ccdef7a9308b07052506a7d3d8ecfa307
--- lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 1ae8efc0a44c969acdf3311f34085998edbf9152)
+++ lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision a7b0a98ccdef7a9308b07052506a7d3d8ecfa307)
@@ -8,20 +8,30 @@
 
 <form>
 <h2 align="left">
-  <logic:notEmpty name="pOrgId">
-    <a href="orgmanage.do?org=<bean:write name="pOrgId" />"><bean:write name="pOrgName"/></a> ::
-  </logic:notEmpty>
-  <a href="<logic:equal name="orgType" value="3">user</logic:equal><logic:notEqual name="orgType" value="3">org</logic:notEqual>manage.do?org=<bean:write name="UserManageForm" property="orgId" />">
-    <bean:write name="UserManageForm" property="orgName"/></a> ::
-  <fmt:message key="admin.user.manage" />
+	<a href="orgmanage.do?org=1"><fmt:message key="admin.course.manage" /></a>
+	<logic:equal name="orgType" value="1">
+		: <fmt:message key="admin.user.manage" />
+	</logic:equal>
+	<logic:equal name="orgType" value="2">
+		: <a href="orgmanage.do?org=<bean:write name="UserManageForm" property="orgId" />"><bean:write name="UserManageForm" property="orgName"/></a>
+	</logic:equal>
+	<logic:equal name="orgType" value="3">
+		: <a href="orgmanage.do?org=<bean:write name="pOrgId" />"><bean:write name="pOrgName"/></a>
+		: <a href="usermanage.do?org=<bean:write name="UserManageForm" property="orgId" />"><bean:write name="UserManageForm" property="orgName"/></a>
+	</logic:equal>
+	: <fmt:message key="admin.user.manage" />
 </h2>
+
+<p>&nbsp;</p>
+
 <p align="right">
 	<logic:equal name="UserManageForm" property="courseAdminCanAddNewUsers" value="true">
 		<input 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>
 	<logic:notEqual name="UserManageForm" property="orgId" value="1">
 		<input type="button" value='<fmt:message key="admin.user.add"/>' onclick=javascript:document.location='userorg.do?orgId=<bean:write name="UserManageForm" property="orgId"/>' />
 	</logic:notEqual>
+	<input type="button" value='<fmt:message key="admin.edit" /> <bean:write name="UserManageForm" property="orgName"/>' onclick=javascript:document.location='organisation.do?method=edit&orgId=<c:out value="${UserManageForm.orgId}"/>' />
 </p>
 <table class="alternative-color" width=100%>
 <tr>
Index: lams_admin/web/userorg.jsp
===================================================================
diff -u -rfa49d0c5906a337c78fd1220a98d1cb757c4e19d -ra7b0a98ccdef7a9308b07052506a7d3d8ecfa307
--- lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision fa49d0c5906a337c78fd1220a98d1cb757c4e19d)
+++ lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision a7b0a98ccdef7a9308b07052506a7d3d8ecfa307)
@@ -17,14 +17,17 @@
 <html-el:form action="/userorgsave.do" method="post">
 <html-el:hidden property="orgId" />
 <h2 align="left">
+	<a href="orgmanage.do?org=1"><fmt:message key="admin.course.manage" /></a>
     <logic:notEmpty name="pOrgId">
-        <a href="orgmanage.do?org=<bean:write name="pOrgId" />"><bean:write name="pOrgName"/></a> ::
+        : <a href="orgmanage.do?org=<bean:write name="pOrgId" />"><bean:write name="pOrgName"/></a>
     </logic:notEmpty>
-    <a href="<logic:equal name="orgType" value="3">user</logic:equal><logic:notEqual name="orgType" value="3">org</logic:notEqual>manage.do?org=<bean:write name="UserOrgForm" property="orgId" />">
-      <bean:write name="UserOrgForm" property="orgName"/></a> ::
-    <fmt:message key="admin.user.add"/>
+    : <a href="<logic:equal name="orgType" value="3">user</logic:equal><logic:notEqual name="orgType" value="3">org</logic:notEqual>manage.do?org=<bean:write name="UserOrgForm" property="orgId" />">
+		<bean:write name="UserOrgForm" property="orgName"/></a>
+    : <fmt:message key="admin.user.add"/>
 </h2>
 
+<p>&nbsp;</p>
+
 <div align="center"><html-el:errors/></div>
 <table class="alternative-color" width=100%>
 <tr>
Index: lams_admin/web/userorgrole.jsp
===================================================================
diff -u -r1ae8efc0a44c969acdf3311f34085998edbf9152 -ra7b0a98ccdef7a9308b07052506a7d3d8ecfa307
--- lams_admin/web/userorgrole.jsp	(.../userorgrole.jsp)	(revision 1ae8efc0a44c969acdf3311f34085998edbf9152)
+++ lams_admin/web/userorgrole.jsp	(.../userorgrole.jsp)	(revision a7b0a98ccdef7a9308b07052506a7d3d8ecfa307)
@@ -3,19 +3,27 @@
 <%@ taglib uri="tags-html-el" prefix="html-el" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-logic-el" prefix="logic-el" %>
+<%@ taglib uri="tags-logic" prefix="logic" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
 <script language="javascript" type="text/JavaScript">
 function toggleCheckboxes(roleIndex, object){
-	<logic-el:iterate id="userBean" name="UserOrgRoleForm" property="userBeans" indexId="beanIndex" >
+	<logic:iterate id="userBean" name="UserOrgRoleForm" property="userBeans" indexId="beanIndex" >
 	document.UserOrgRoleForm.elements[roleIndex+1+<c:out value="${numroles}" />*(<c:out value="${beanIndex}" />+1)].checked=object.checked;
-	</logic-el:iterate>
+	</logic:iterate>
 }
 </script>
 
-<h2><fmt:message key="admin.user.assign.roles" /></h2>
+<h2>
+	<a href="orgmanage.do?org=1"><fmt:message key="admin.course.manage" /></a>
+    <logic:notEmpty name="pOrgId">
+        : <a href="orgmanage.do?org=<bean:write name="pOrgId" />"><bean:write name="pOrgName"/></a>
+    </logic:notEmpty>
+    : <a href="<logic:equal name="orgType" value="3">user</logic:equal><logic:notEqual name="orgType" value="3">org</logic:notEqual>manage.do?org=<bean:write name="UserOrgRoleForm" property="orgId" />">
+		<bean:write name="orgName"/></a>
+	: <fmt:message key="admin.user.assign.roles" />
+</h2>
 <p>&nbsp;</p>
 
 <html-el:form action="/userorgrolesave.do" method="post">
@@ -24,26 +32,26 @@
 <table class="alternative-color" width=100%>
 <tr>
 	<th><fmt:message key="admin.user.login"/></th>
-	<logic-el:iterate id="role" name="roles" indexId="roleIndex">
+	<logic:iterate id="role" name="roles" indexId="roleIndex">
 		<th><input type="checkbox" 
 					name="<c:out value="${roleIndex}" />" 
 					onclick="toggleCheckboxes(<c:out value="${roleIndex}" />, this);" 
 					onkeyup="toggleCheckboxes(<c:out value="${roleIndex}" />, this);" />
 			<fmt:message>role.<lams:role role="${role.name}" /></fmt:message></th>
-	</logic-el:iterate>
+	</logic:iterate>
 </tr>
-<logic-el:iterate id="userBean" name="UserOrgRoleForm" property="userBeans" indexId="beanIndex">
+<logic:iterate id="userBean" name="UserOrgRoleForm" property="userBeans" indexId="beanIndex">
 	<tr>
 		<td>
 			<c:out value="${userBean.login}" /><c:if test="${!userBean.memberOfParent}"> *<c:set var="parentFlag" value="true" /></c:if>
 		</td>
-		<logic-el:iterate id="role" name="roles">
+		<logic:iterate id="role" name="roles">
 			<td>
 				<html-el:multibox property="userBeans[${beanIndex}].roleIds" value="${role.roleId}" />&nbsp;
 			</td>
-		</logic-el:iterate>
+		</logic:iterate>
 	</tr>
-</logic-el:iterate>
+</logic:iterate>
 <tr>
 	<td></td>
 	<td colspan=<c:out value="${numroles}" /> align="right">
Index: lams_admin/web/userrole.jsp
===================================================================
diff -u -r1ae8efc0a44c969acdf3311f34085998edbf9152 -ra7b0a98ccdef7a9308b07052506a7d3d8ecfa307
--- lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision 1ae8efc0a44c969acdf3311f34085998edbf9152)
+++ lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision a7b0a98ccdef7a9308b07052506a7d3d8ecfa307)
@@ -10,8 +10,20 @@
 <html-el:form action="/userrolessave.do" method="post">
 <html-el:hidden property="userId" />
 <html-el:hidden property="orgId" />
-<h2 align="left"><fmt:message key="admin.user.assign.roles"/>: <bean:write name="orgName" /></h2>
+<h2 align="left">
+	<a href="orgmanage.do?org=1"><fmt:message key="admin.course.manage" /></a>
+	<logic:notEmpty name="pOrgId">
+		: <a href="orgmanage.do?org=<c:out value="${pOrgId}" />"><c:out value="${parentName}" /></a>
+		: <a href="usermanage.do?org=<bean:write name="UserRolesForm" property="orgId" />"><c:out value="${orgName}" /></a>
+	</logic:notEmpty>
+	<logic:empty name="pOrgId">
+		: <a href="orgmanage.do?org=<bean:write name="UserRolesForm" property="orgId" />"><c:out value="${orgName}" /></a>
+	</logic:empty>
+	: <fmt:message key="admin.user.assign.roles"/>
+</h2>
 
+<p>&nbsp;</p>
+
 <div align="center"><html-el:errors/><html-el:messages id="roles" message="true"><bean:write name="roles" /></html-el:messages></div>
 <table>
     <tr>
Index: lams_admin/web/usersearchlist.jsp
===================================================================
diff -u -r8659f689b0c7bdd5528f37956db905ce5adc753d -ra7b0a98ccdef7a9308b07052506a7d3d8ecfa307
--- lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision 8659f689b0c7bdd5528f37956db905ce5adc753d)
+++ lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision a7b0a98ccdef7a9308b07052506a7d3d8ecfa307)
@@ -15,12 +15,11 @@
 	}
 </script>
 
-<h2><fmt:message key="admin.user.find"/></h2>
+<h2>
+	<a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a> 
+	: <fmt:message key="admin.user.find"/>
+</h2>
 
-<p align="right">
-	<input type="button" value='<fmt:message key="admin.user.import"/>' onclick=javascript:document.location='importexcel.do' />
-</p>
-
 <logic:notEqual name="isSysadmin" value="false">
 <html-el:form action="/usersearch.do" method="post">
 <html-el:hidden property="searched" />