Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
===================================================================
diff -u -r885521cf88a11ca03304d18d0c84afd4d8b3e43f -re55d23b8e9a54ee0cfed58cb167510e8d2551fe4
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision 885521cf88a11ca03304d18d0c84afd4d8b3e43f)
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision e55d23b8e9a54ee0cfed58cb167510e8d2551fe4)
@@ -30,6 +30,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
@@ -65,7 +66,10 @@
  * @struts.action path="/index" validate="false"
  * 
  * @struts.action-forward name="main" path="/main.jsp"
- * 
+ * @struts.action-forward name="profile" path="/profile.do?method=view"
+ * @struts.action-forward name="editprofile" path="/profile.do?method=edit"
+ * @struts.action-forward name="password" path="/password.do"
+ * @struts.action-forward name="portrait" path="/portrait.do"
  * @struts.action-forward name="content" path="/indexContent.jsp"
  */
 public class IndexAction extends Action {
@@ -78,29 +82,30 @@
 	
 	@SuppressWarnings("unchecked")
 	public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception {
+		
 		String stateParam = WebUtil.readStrParam(request, "state");
 		state = (stateParam.equals("active")?OrganisationState.ACTIVE:OrganisationState.ARCHIVED);
+		
 		log.debug("User:"+request.getRemoteUser());
 		// only set header links if we are displaying 'active' organisations; i.e., on the index page
 		if(state.equals(OrganisationState.ACTIVE)){
-			List<IndexLinkBean> headerLinks = new ArrayList<IndexLinkBean>();
-			if (request.isUserInRole(Role.AUTHOR) || request.isUserInRole(Role.AUTHOR_ADMIN)) {
-				log.debug("user is author");
-				headerLinks.add(new IndexLinkBean("index.author", "javascript:openAuthor()"));
-			}
-			if (request.isUserInRole(Role.SYSADMIN) || request.isUserInRole(Role.COURSE_ADMIN) || request.isUserInRole(Role.COURSE_MANAGER)) {
-				log.debug("user is a course admin or manager");
-				headerLinks.add(new IndexLinkBean("index.courseman", "javascript:openOrgManagement(" + getService().getRootOrganisation().getOrganisationId()+')'));
-			}
-			if (request.isUserInRole(Role.SYSADMIN) || request.isUserInRole(Role.AUTHOR_ADMIN)) {
-				log.debug("user is sysadmin or author admin");
-				headerLinks.add(new IndexLinkBean("index.sysadmin", "javascript:openSysadmin()"));
-			}
-			headerLinks.add(new IndexLinkBean("index.myprofile", "javascript:openProfile()"));
-			log.debug("set headerLinks in request");
-			request.setAttribute("headerLinks", headerLinks);
+			setHeaderLinks(request);
 		}
 		
+		String tab = WebUtil.readStrParam(request, "tab", true);
+		if (StringUtils.equals(tab, "profile")) {
+			return mapping.findForward("profile");
+		} else if (StringUtils.equals(tab, "editprofile")) {
+			return mapping.findForward("editprofile");
+		} else if (StringUtils.equals(tab, "password")) {
+			return mapping.findForward("password");
+		} else if (StringUtils.equals(tab, "portrait")) {
+			return mapping.findForward("portrait");
+		} else if(StringUtils.equals(tab, "sysadmin") || StringUtils.equals(tab, "groupmgmt")) {
+			request.setAttribute("tab", tab);
+			return mapping.findForward("main");
+		}
+		
 		List<IndexOrgBean> orgBeans = new ArrayList<IndexOrgBean>();
 		if (request.isUserInRole(Role.SYSADMIN)) {
 			List<Integer> roles = new ArrayList<Integer>();
@@ -131,6 +136,28 @@
 		else
 			return mapping.findForward("content");
 	}
+	
+	private void setHeaderLinks(HttpServletRequest request) {
+		List<IndexLinkBean> headerLinks = new ArrayList<IndexLinkBean>();
+		if (request.isUserInRole(Role.AUTHOR) || request.isUserInRole(Role.AUTHOR_ADMIN)) {
+			log.debug("user is author");
+			headerLinks.add(new IndexLinkBean("index.author", "javascript:openAuthor()"));
+		}
+		if (request.isUserInRole(Role.SYSADMIN) || request.isUserInRole(Role.COURSE_ADMIN) || request.isUserInRole(Role.COURSE_MANAGER)) {
+			log.debug("user is a course admin or manager");
+			headerLinks.add(new IndexLinkBean("index.courseman", "javascript:openOrgManagement(" + getService().getRootOrganisation().getOrganisationId()+')'));
+			//headerLinks.add(new IndexLinkBean("index.courseman", "index.do?state=active&tab=groupmgmt"));
+		}
+		if (request.isUserInRole(Role.SYSADMIN) || request.isUserInRole(Role.AUTHOR_ADMIN)) {
+			log.debug("user is sysadmin or author admin");
+			headerLinks.add(new IndexLinkBean("index.sysadmin", "javascript:openSysadmin()"));
+			//headerLinks.add(new IndexLinkBean("index.sysadmin", "index.do?state=active&tab=sysadmin"));
+		}
+		//headerLinks.add(new IndexLinkBean("index.myprofile", "javascript:openProfile()"));
+		headerLinks.add(new IndexLinkBean("index.myprofile", "index.do?state=active&tab=profile"));
+		log.debug("set headerLinks in request");
+		request.setAttribute("headerLinks", headerLinks);
+	}
 
 	@SuppressWarnings({"unchecked","static-access"})
 	private IndexOrgBean createOrgBean(Organisation org, List<Integer> roles, String username, boolean isSysAdmin) {
Index: lams_central/src/java/org/lamsfoundation/lams/web/PasswordAction.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -re55d23b8e9a54ee0cfed58cb167510e8d2551fe4
--- lams_central/src/java/org/lamsfoundation/lams/web/PasswordAction.java	(.../PasswordAction.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_central/src/java/org/lamsfoundation/lams/web/PasswordAction.java	(.../PasswordAction.java)	(revision e55d23b8e9a54ee0cfed58cb167510e8d2551fe4)
@@ -51,6 +51,7 @@
 	
 		PasswordChangeActionForm passwordChangeForm = (PasswordChangeActionForm)form;
 		passwordChangeForm.setLogin(request.getRemoteUser());
+		request.setAttribute("tab", "profile");
 		return mapping.findForward("passwordChange");
 	}
 }
Index: lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -re55d23b8e9a54ee0cfed58cb167510e8d2551fe4
--- lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java	(.../PasswordChangeAction.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java	(.../PasswordChangeAction.java)	(revision e55d23b8e9a54ee0cfed58cb167510e8d2551fe4)
@@ -53,7 +53,8 @@
  * 				validate="false"
  * 
  * @struts:action-forward name="okay" path=".passwordChangeOk"
- * @struts:action-forward name="cancelled" path="/profile.do?method=view"
+ * @struts:action-forward name="cancelled" path="/index.do?state=active&amp;tab=profile"
+ * @struts:action-forward name="errors" path="/index.do?state=active&amp;tab=password"
  */
 public class PasswordChangeAction extends Action {
 
@@ -144,12 +145,13 @@
             {
             	passwordChangeForm.reset(mapping,request);
                 //return (new ActionForward(mapping.getInput()));
-            	return (mapping.getInputForward());
+            	return (mapping.findForward("errors"));
             }
             // If no input page, use error forwarding
             return (mapping.findForward("error.system"));
         }
         
+        request.setAttribute("tab", "password");
 		return mapping.findForward("okay");
 
     } 
Index: lams_central/src/java/org/lamsfoundation/lams/web/PortraitAction.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -re55d23b8e9a54ee0cfed58cb167510e8d2551fe4
--- lams_central/src/java/org/lamsfoundation/lams/web/PortraitAction.java	(.../PortraitAction.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_central/src/java/org/lamsfoundation/lams/web/PortraitAction.java	(.../PortraitAction.java)	(revision e55d23b8e9a54ee0cfed58cb167510e8d2551fe4)
@@ -61,6 +61,7 @@
 		log.debug("using portraitUuid="+portraitUuid);
 		// if no portrait has been uploaded, set the uuid to 0
 		portraitForm.setPortraitUuid(portraitUuid==null?0:portraitUuid);
+		request.setAttribute("tab", "profile");
 		return mapping.findForward("portrait");
 	}
 	
Index: lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -re55d23b8e9a54ee0cfed58cb167510e8d2551fe4
--- lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java	(.../PortraitSaveAction.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java	(.../PortraitSaveAction.java)	(revision e55d23b8e9a54ee0cfed58cb167510e8d2551fe4)
@@ -56,7 +56,8 @@
  * 	              scope="request"
  * 				  validate="false"
  * 
- * @struts:action-forward name="profile" path="/profile.do?method=view"
+ * @struts:action-forward name="profile" path="/index.do?state=active&amp;tab=profile"
+ * @struts:action-forward name="errors" path="/index.do?state=active&amp;tab=portrait"
  */
 public class PortraitSaveAction extends Action {
 	
@@ -92,7 +93,7 @@
 		if (!mediaType.equals("image")) {
 			errors.add("file",new ActionMessage("error.portrait.not.image"));
 			saveErrors(request, errors);
-			return mapping.getInputForward();
+			return mapping.findForward("errors");
 		}
 		
 		// resize picture into new buffer
@@ -103,7 +104,7 @@
 		if (is==null) {
 			errors.add("file",new ActionMessage("error.general.1"));
 			saveErrors(request, errors);
-			return mapping.getInputForward();
+			return mapping.findForward("errors");
 		}
     	
 		// write to content repository
Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java
===================================================================
diff -u -r6bc2cddb06f7f24ac3d84e0d6f4adf0e836f3805 -re55d23b8e9a54ee0cfed58cb167510e8d2551fe4
--- lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java	(.../ProfileAction.java)	(revision 6bc2cddb06f7f24ac3d84e0d6f4adf0e836f3805)
+++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java	(.../ProfileAction.java)	(revision e55d23b8e9a54ee0cfed58cb167510e8d2551fe4)
@@ -81,6 +81,7 @@
 		request.setAttribute("fullName", fullName);
 		request.setAttribute("email", (email!=null ? email : ""));
 		request.setAttribute("portraitUuid", (requestor.getPortraitUuid()==null ? 0 : requestor.getPortraitUuid()));
+		request.setAttribute("tab", "profile");
 		return mapping.findForward("view");
 	}
 	
@@ -96,6 +97,7 @@
 		SupportedLocale locale = requestor.getLocale();
 		userForm.set("localeId",locale.getLocaleId());
 		request.setAttribute("locales", locales);
+		request.setAttribute("tab", "profile");
 		return mapping.findForward("edit");
 	}
 	
Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java
===================================================================
diff -u -r56856bd68b40ca6b0bdf1e13c6812ed23063fb25 -re55d23b8e9a54ee0cfed58cb167510e8d2551fe4
--- lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java	(.../ProfileSaveAction.java)	(revision 56856bd68b40ca6b0bdf1e13c6812ed23063fb25)
+++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java	(.../ProfileSaveAction.java)	(revision e55d23b8e9a54ee0cfed58cb167510e8d2551fe4)
@@ -57,7 +57,7 @@
  * 	              scope="request"
  * 				  validate="false"
  * 
- * @struts:action-forward name="profile" path="/profile.do?method=view"
+ * @struts:action-forward name="profile" path="/index.do?state=active&amp;tab=profile"
  */
 public class ProfileSaveAction extends Action {
 	
Index: lams_central/web/WEB-INF/tiles/tiles-defs.xml
===================================================================
diff -u -rae236274f70ed614b26b1c34d3b6d87faad3c8bf -re55d23b8e9a54ee0cfed58cb167510e8d2551fe4
--- lams_central/web/WEB-INF/tiles/tiles-defs.xml	(.../tiles-defs.xml)	(revision ae236274f70ed614b26b1c34d3b6d87faad3c8bf)
+++ lams_central/web/WEB-INF/tiles/tiles-defs.xml	(.../tiles-defs.xml)	(revision e55d23b8e9a54ee0cfed58cb167510e8d2551fe4)
@@ -22,33 +22,24 @@
 -->
 <tiles-definitions>
 
-	<definition name=".portrait" path="/template.jsp">
-		<put name="titleKey" value="title.change.portrait.window"/>
-		<put name="content" value="portrait.jsp"/>	
+	<definition name=".portrait" path="/main.jsp">
+		<put name="profile" value="portrait.jsp"/>	
 	</definition>
 
-	<definition name=".profile" path="/template.jsp">
-		<put name="titleKey" value="title.profile.window"/>
-		<put name="content" value="profile.jsp"/>	
+	<definition name=".profile" path="/main.jsp">
+		<put name="profile" value="profile.jsp"/>	
 	</definition>
 	
-	<definition name=".editprofile" path="/template.jsp">
-		<put name="titleKey" value="title.edit.profile.window"/>
-		<put name="content" value="editprofile.jsp"/>	
+	<definition name=".editprofile" path="/main.jsp">
+		<put name="profile" value="editprofile.jsp"/>	
 	</definition>
 
-	<definition name=".passwordChange" path="/template.jsp">
-		<put name="titleKey" value="title.change.password.window"/>
-		<put name="header" value="header.jsp"/>
-		<put name="content" value="passwordChangeContent.jsp"/>	
-		<put name="footer" value="footer.jsp"/>	
+	<definition name=".passwordChange" path="/main.jsp">
+		<put name="profile" value="passwordChangeContent.jsp"/>	
 	</definition>
 	
-	<definition name=".passwordChangeOk" path="/template.jsp">
-		<put name="titleKey" value="title.password.changed.window"/>
-		<put name="header" value="header.jsp"/>
-		<put name="content" value="passwordChangeOkContent.jsp" />	
-		<put name="footer" value="footer.jsp"/>	
+	<definition name=".passwordChangeOk" path="/main.jsp">
+		<put name="profile" value="passwordChangeOkContent.jsp" />	
 	</definition>
 
 	<definition name=".error" path="/template.jsp">
Index: lams_central/web/main.jsp
===================================================================
diff -u -rd933f0efad1cd32ea633be75601818f98156093f -re55d23b8e9a54ee0cfed58cb167510e8d2551fe4
--- lams_central/web/main.jsp	(.../main.jsp)	(revision d933f0efad1cd32ea633be75601818f98156093f)
+++ lams_central/web/main.jsp	(.../main.jsp)	(revision e55d23b8e9a54ee0cfed58cb167510e8d2551fe4)
@@ -6,6 +6,7 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-tiles" prefix="tiles" %>
 
 <%JspRedirectStrategy.welcomePageStatusUpdate(request, response);%>
 <%HttpSessionManager.getInstance().updateHttpSessionByLogin(request.getSession(),request.getRemoteUser());%>
@@ -36,9 +37,18 @@
 	<div id="header-my-courses">
 		<div id="nav-right">
 			<div class="nav-box-right">
-				<div class="tab-left-selected"></div>
-				<div class="tab-middle-selected"><a class="tab-middle-link-selected" style="border:0;" href="#"><fmt:message key="index.mycourses"/> </a></div>
-				<div class="tab-right-selected"></div>
+				<c:choose>
+					<c:when test="${empty tab}">
+						<div class="tab-left-selected"></div>
+						<div class="tab-middle-selected"><a class="tab-middle-link-selected" style="border:0;" href="index.do?state=active"><fmt:message key="index.mycourses"/> </a></div>
+						<div class="tab-right-selected"></div>
+					</c:when>
+					<c:otherwise>
+						<div class="tab-left"></div>
+						<div class="tab-middle"><a class="tab-middle-link" style="border:0;" href="index.do?state=active"><fmt:message key="index.mycourses"/> </a></div>
+						<div class="tab-right"></div>
+					</c:otherwise>
+				</c:choose>
 			</div>
 			<c:forEach var="headerlink" items="${headerLinks}">
 			<div class="nav-box-right">
@@ -47,6 +57,14 @@
 				<c:set var="tabMiddle" value="tab-middle"/>
 				<c:set var="tabRight" value="tab-right"/>	
 				<c:set var="highlight" value="false" />
+				<c:if test="${tab eq 'profile'}">
+					<c:if test="${headerlink.name eq 'index.myprofile'}">
+						<c:set var="tabLeft" value="tab-left-selected"/>
+						<c:set var="tabMiddle" value="tab-middle-selected"/>
+						<c:set var="tabRight" value="tab-right-selected"/>	
+						<c:set var="highlight" value="false" />
+					</c:if>
+				</c:if>
 				<c:if test="${headerlink.name eq 'index.author'}">
 					<c:set var="tabLeft" value="tab-left-highlight"/>
 					<c:set var="tabMiddle" value="tab-middle-highlight"/>
@@ -84,7 +102,12 @@
 									</a>
 								</div>
 							</div>
-							<c:import url="indexCommon.jsp" charEncoding="utf-8"/>						
+							<c:if test="${empty tab}">
+								<c:import url="indexCommon.jsp" charEncoding="utf-8"/>	
+							</c:if>
+							<c:if test="${tab eq 'profile'}">
+								<tiles:insert attribute="profile" />
+							</c:if>
 						</td>
 					</tr>
 				</tbody>
Index: lams_central/web/profile.jsp
===================================================================
diff -u -r4f23888b7f7ab9234285d6565b5995ed94fee49f -re55d23b8e9a54ee0cfed58cb167510e8d2551fe4
--- lams_central/web/profile.jsp	(.../profile.jsp)	(revision 4f23888b7f7ab9234285d6565b5995ed94fee49f)
+++ lams_central/web/profile.jsp	(.../profile.jsp)	(revision e55d23b8e9a54ee0cfed58cb167510e8d2551fe4)
@@ -21,6 +21,7 @@
 		}
 	</script>
 
+<p>&nbsp;</p>
 <h2><fmt:message key="index.myprofile" /></h2>
 
 <table border="0">
@@ -49,9 +50,9 @@
 	</tr>
 </table>
 
-<p><a href="profile.do?method=edit"><fmt:message key="title.profile.edit.screen" /></a><br />
-<a href="password.do"><fmt:message key="title.password.change.screen" /></a><br />
-<a href="portrait.do"><fmt:message key="title.portrait.change.screen" /></a><br />
+<p><a href="index.do?state=active&tab=editprofile"><fmt:message key="title.profile.edit.screen" /></a><br />
+<a href="index.do?state=active&tab=password"><fmt:message key="title.password.change.screen" /></a><br />
+<a href="index.do?state=active&tab=portrait"><fmt:message key="title.portrait.change.screen" /></a><br />
 </p>
 
 <h2><fmt:message key="title.archived.groups" /></h2>