Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
===================================================================
diff -u -r2f527006e6e1e214dd86ccecb8782bfe27df1e24 -r4f23888b7f7ab9234285d6565b5995ed94fee49f
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision 2f527006e6e1e214dd86ccecb8782bfe27df1e24)
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision 4f23888b7f7ab9234285d6565b5995ed94fee49f)
@@ -64,7 +64,9 @@
  * 
  * @struts.action path="/index" validate="false"
  * 
- * @struts.action-forward name="index" path="/indexContent.jsp"
+ * @struts.action-forward name="main" path="/main.jsp"
+ * 
+ * @struts.action-forward name="content" path="/indexContent.jsp"
  */
 public class IndexAction extends Action {
 
@@ -82,20 +84,19 @@
 		// 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>();
-			//headerLinks.add(new IndexLinkBean("index.dummymonitor","javascript:openDummyMonitor()"));
-			headerLinks.add(new IndexLinkBean("index.myprofile", "javascript:openProfile('" + request.getRemoteUser()+"')"));
-			if (request.isUserInRole(Role.SYSADMIN)) {
-				log.debug("user is sysadmin");
-				headerLinks.add(new IndexLinkBean("index.sysadmin", "javascript:openSysadmin()"));
+			if (request.isUserInRole(Role.AUTHOR)) {
+				log.debug("user is author");
+				headerLinks.add(new IndexLinkBean("index.author", "home.do?method=author"));
 			}
 			if (request.isUserInRole(Role.SYSADMIN) || request.isUserInRole(Role.COURSE_ADMIN) || request.isUserInRole(Role.COURSE_MANAGER)) {
 				log.debug("user is an admin or manager");
-				headerLinks.add(new IndexLinkBean("index.courseman", "javascript:openOrgManagement(" + getService().getRootOrganisation().getOrganisationId()+")"));
+				headerLinks.add(new IndexLinkBean("index.courseman", "admin/orgmanage.do?org=" + getService().getRootOrganisation().getOrganisationId()));
 			}
-			if (request.isUserInRole(Role.AUTHOR)) {
-				log.debug("user is author");
-				headerLinks.add(new IndexLinkBean("index.author", "javascript:openAuthor()"));
+			if (request.isUserInRole(Role.SYSADMIN)) {
+				log.debug("user is sysadmin");
+				headerLinks.add(new IndexLinkBean("index.sysadmin", "admin/sysadminstart.do"));
 			}
+			headerLinks.add(new IndexLinkBean("index.myprofile", "profile.do?method=view"));
 			log.debug("set headerLinks in request");
 			request.setAttribute("headerLinks", headerLinks);
 		}
@@ -125,7 +126,10 @@
 			}
 		}
 		request.setAttribute("orgBeans",orgBeans);
-		return mapping.findForward("index");
+		if(state.equals(OrganisationState.ACTIVE))
+			return mapping.findForward("main");
+		else
+			return mapping.findForward("content");
 	}
 
 	@SuppressWarnings({"unchecked","static-access"})
@@ -136,20 +140,20 @@
 		List<IndexLinkBean> links = new ArrayList<IndexLinkBean>();
 		if(isSysAdmin && state.equals(OrganisationState.ACTIVE)){
 			if (orgBean.getType().equals(OrganisationType.COURSE_TYPE)) {
-				links.add(new IndexLinkBean("index.classman", "javascript:openOrgManagement(" + org.getOrganisationId()+")"));
+				links.add(new IndexLinkBean("index.classman", "javascript:openOrgManagement(" + org.getOrganisationId()+")", "manage-group-button"));
 			}
 		}
 		if ((contains(roles, Role.ROLE_COURSE_ADMIN) || contains(roles, Role.ROLE_COURSE_MANAGER) || contains(roles,Role.ROLE_MONITOR))
 				&& state.equals(OrganisationState.ACTIVE)) {
 			if (orgBean.getType().equals(OrganisationType.COURSE_TYPE)) {
 				if((!isSysAdmin)&&(contains(roles, Role.ROLE_COURSE_ADMIN) || contains(roles, Role.ROLE_COURSE_MANAGER))){
-					links.add(new IndexLinkBean("index.classman", "javascript:openOrgManagement(" + org.getOrganisationId()+")"));
+					links.add(new IndexLinkBean("index.classman", "javascript:openOrgManagement(" + org.getOrganisationId()+")", "manage-group-button"));
 				}
 				if(contains(roles, Role.ROLE_COURSE_MANAGER) || contains(roles,Role.ROLE_MONITOR))
-					links.add(new IndexLinkBean("index.addlesson", "javascript:openAddLesson(" + org.getOrganisationId()+",'')"));
+					links.add(new IndexLinkBean("index.addlesson", "javascript:openAddLesson(" + org.getOrganisationId()+",'')", "add-lesson-button"));
 			}else{//CLASS_TYPE
 				if(contains(roles, Role.ROLE_COURSE_MANAGER) || contains(roles,Role.ROLE_MONITOR))
-					links.add(new IndexLinkBean("index.addlesson","javascript:openAddLesson("+org.getParentOrganisation().getOrganisationId()+","+org.getOrganisationId()+")"));
+					links.add(new IndexLinkBean("index.addlesson","javascript:openAddLesson("+org.getParentOrganisation().getOrganisationId()+","+org.getOrganisationId()+")", "add-lesson-button"));
 			}
 		}
 		
@@ -161,6 +165,7 @@
 			if(isInLesson(user,lesson)){
 				if(!lesson.isPreviewLesson()){
 					List<IndexLinkBean> lessonLinks = new ArrayList<IndexLinkBean>();
+					String url = null;
 					if(state.equals(OrganisationState.ACTIVE)){
 						if(contains(roles,Role.ROLE_COURSE_MANAGER)||contains(roles,Role.ROLE_MONITOR)){
 							if(!lesson.getLessonStateId().equals(lesson.REMOVED_STATE)){
@@ -170,7 +175,7 @@
 						if(contains(roles,Role.ROLE_LEARNER)){
 							log.debug("Lesson State:"+lesson.getLessonStateId());
 							if(lesson.getLessonStateId().equals(lesson.STARTED_STATE)||lesson.getLessonStateId().equals(lesson.FINISHED_STATE)){
-								lessonLinks.add(new IndexLinkBean("index.participate","javascript:openLearner("+lesson.getLessonId()+")"));
+								url = "javascript:openLearner("+lesson.getLessonId()+")";
 							}
 						}
 					}else if(state.equals(OrganisationState.ARCHIVED)){
@@ -186,8 +191,9 @@
 							}
 						}
 					}
-					if(lessonLinks.size()>0){
+					if(lessonLinks.size()>0 || url!=null){
 						IndexLessonBean lessonBean = new IndexLessonBean(lesson.getLessonName(), lessonLinks);
+						lessonBean.setUrl(url);
 						lessonBeans.add(lessonBean);
 					}
 				}
Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexLessonBean.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r4f23888b7f7ab9234285d6565b5995ed94fee49f
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexLessonBean.java	(.../IndexLessonBean.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexLessonBean.java	(.../IndexLessonBean.java)	(revision 4f23888b7f7ab9234285d6565b5995ed94fee49f)
@@ -37,6 +37,7 @@
  */
 public class IndexLessonBean implements Comparable{
 	private String name;
+	private String url;
 	private List<IndexLinkBean> links;
 
 	public IndexLessonBean(String name, List<IndexLinkBean> links) {
@@ -70,4 +71,10 @@
 	public int compareTo(Object o) {
 		return name.compareTo(((IndexLessonBean)o).getName());
 	}
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
 }
Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexLinkBean.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r4f23888b7f7ab9234285d6565b5995ed94fee49f
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexLinkBean.java	(.../IndexLinkBean.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexLinkBean.java	(.../IndexLinkBean.java)	(revision 4f23888b7f7ab9234285d6565b5995ed94fee49f)
@@ -37,7 +37,15 @@
 	
 	private String name;
 	private String url;
+	private String style;
 	
+	public IndexLinkBean(String name, String url, String style) {
+		super();
+		this.name = name;
+		this.url = url;
+		this.style = style;
+	}
+	
 	public IndexLinkBean(String name, String url) {
 		this.name = name;
 		this.url = url;
@@ -66,5 +74,13 @@
 	public void setUrl(String url) {
 		this.url = url;
 	}
+	
+	public String getStyle() {
+		return style;
+	}
+	
+	public void setStyle(String style) {
+		this.style = style;
+	}
 
 }
Index: lams_central/web/index.jsp
===================================================================
diff -u -r5e3a1e5f73e433076f00eb9b0a489c54430b5672 -r4f23888b7f7ab9234285d6565b5995ed94fee49f
--- lams_central/web/index.jsp	(.../index.jsp)	(revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672)
+++ lams_central/web/index.jsp	(.../index.jsp)	(revision 4f23888b7f7ab9234285d6565b5995ed94fee49f)
@@ -1,104 +1,28 @@
-<%@ page contentType="text/html; charset=utf-8" language="java" %>
-<%@ page import="org.lamsfoundation.lams.security.JspRedirectStrategy" %>
-<%@ page import="org.lamsfoundation.lams.web.util.HttpSessionManager" %>
-<%@ page import="org.lamsfoundation.lams.util.Configuration" %>
-<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 
-<%JspRedirectStrategy.welcomePageStatusUpdate(request,response);%>
-<%HttpSessionManager.getInstance().updateHttpSessionByLogin(request.getSession(),request.getRemoteUser()); %>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <lams:html>
 <head>
-	<title>LAMS::<fmt:message key="index.welcome"/></title>
+	<meta HTTP-EQUIV="Refresh" CONTENT="0;URL=index.do?state=active">
 	<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">
-	<meta http-equiv="Expires" content="-1">
+	<title><fmt:message key="index.welcome" /></title>
 	<lams:css/>
-	<link rel="icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
-	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
-	<script language="JavaScript" type="text/javascript" src="includes/javascript/getSysInfo.js"></script>
-	<script language="JavaScript" type="text/javascript" src="includes/javascript/openUrls.js"></script>
-	<script language="JavaScript" type="text/javascript" src="includes/javascript/prototype.js"></script>
-	<script type="text/javascript" language="javascript">
-		var i = Math.round(1000*Math.random());
-		function getContent(){
-			i++;
-			var url = "index.do?unique="+i+"&state=active";
-			var params = "";
-			var myAjax = new Ajax.Updater(
-				"courselist",
-				url,
-				{
-					method: 'get',
-					parameters: params
-				});
-		}
-
-		function findNextDiv(node)
-		 {
-		 	 var nd = node.nextSibling;
-		 	  while(nd.nodeName.toUpperCase()!="DIV"){
-		 	   	nd=nd.nextSibling;
-		 	  }  
-		 	   return nd
-		 }
-		 
-		function toggle(node)
-		{
-			// Unfold the branch if it isn't visible
-			var nextDiv = findNextDiv(node);
-			if (nextDiv.style.display == 'none')
-			{
-				// Change the image (if there is an image)
-				if (node.childNodes.length > 0)
-				{
-					if (node.childNodes.item(0).nodeName == "IMG")
-					{
-						node.childNodes.item(0).src = "images/tree_open.gif";
-					}
-				}
-		
-				nextDiv.style.display = 'block';
-			}
-			// Collapse the branch if it IS visible
-			else
-			{
-				// Change the image (if there is an image)
-				if (node.childNodes.length > 0)
-				{
-					if (node.childNodes.item(0).nodeName == "IMG")
-					{
-						node.childNodes.item(0).src = "images/tree_closed.gif";
-					}
-				}
-		
-				nextDiv.style.display = 'none';
-			}
-		
-		}
-	</script>
 </head>
-<body onload="getContent()" bgcolor="#9DC5EC" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
-	<div id="page">	
-		<H1 class="no-tabs-below"><fmt:message key="index.welcome"/>, <lams:user property="firstName"/> <img src="images/lamb_big.png"/></H1>
-		<div id="header-no-tabs"></div>
-		<div id="content">
-			<p align="right"><fmt:message key="msg.LAMS.version"/> <%= Configuration.get(ConfigurationKeys.VERSION) %></p>
-			<p align="right"><a title="<fmt:message key="index.refresh.hint"/>" href="javascript:getContent()"><fmt:message key="index.refresh"/></a>
-					<a href="home.do?method=logout" onClick="closeAllChildren()"><fmt:message key="index.logout"/></a>
-				</p>
-			<div id="courselist" align="center">
-					<img src="images/loading.gif" /> <font color="gray" size="4"><fmt:message key="msg.loading"/></font>
-			</div>
-			<p><img src="images/launch_page_graphic.jpg"/></p>
-			<p><A HREF="copyright.jsp" target='copyright' onClick="window.open('copyright.jsp','copyright','resizable,left='+(self.screen.width/2-750/2)+',top='+(self.screen.height/2-33/2)+',width=750,height=388,scrollbars');return false;">
-						&copy; <fmt:message key="msg.LAMS.copyright.short"/></a></p>
+
+<body>
+	<div id="page-learner"><!--main box 'page'-->
+	
+		<div id="header-no-tabs-learner">
+		</div><!--closes header-->
+
+		<div id="content-learner"  valign="middle">
+			<p align="center"><img src="images/loading.gif" /> <font color="gray" size="4"><fmt:message key="msg.loading"/></font></p>
 		</div>
-	</div>
-</body>	
-</lams:html>
+	   
+		<div id="footer-learner">
+		</div><!--closes footer-->
 
+	</div><!--closes page-->
+</body>
+</lams:html>
\ No newline at end of file
Index: lams_central/web/indexCommon.jsp
===================================================================
diff -u
--- lams_central/web/indexCommon.jsp	(revision 0)
+++ lams_central/web/indexCommon.jsp	(revision 4f23888b7f7ab9234285d6565b5995ed94fee49f)
@@ -0,0 +1,65 @@
+<%@ page contentType="text/html; charset=utf-8" language="java"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+
+<c:forEach var="orgBean" items="${orgBeans}">
+	<!--Start course section -->
+	<div class="course-bg">
+		<!--start course heading - coloured bar section-->
+		<div class="row">
+			<div class="left-buttons">
+				<h2><c:out value="${orgBean.name}" /></h2>
+			</div>
+			<div class="mycourses-right-buttons">
+				<c:forEach var="link" items="${orgBean.links}">
+				<a class="<c:out value='${link.style}'/>" href="<c:out value='${link.url}'/>"> 
+					<fmt:message key="${link.name}" /> 
+				</a>
+				</c:forEach>
+			</div>
+		</div>
+		<!--end course heading - coloured bar section--> <!--start sequence name-->
+		<c:forEach var="lesson" items="${orgBean.lessons}">
+			<div class="sequence-name">
+				<p>
+					<a href="<c:out value="${lesson.url}"/>" class="sequence-name-link"> <c:out value="${lesson.name}" /></a> 
+					<c:forEach var="lessonlink" items="${lesson.links}">
+						<a href="<c:out value='${lessonlink.url}'/>" class="sequence-action-link"> 
+							<img src="images/css/mycourses_monitor.jpg" alt="monitor" width="19" height="16" class="align-middle" /> 
+							<fmt:message key="${lessonlink.name}" /> 
+						</a>
+					</c:forEach>
+				</p>
+			</div>
+		</c:forEach> <!--close sequence name--> <!--start group name--> 
+		<c:forEach var="childOrg" items="${orgBean.childIndexOrgBeans}">
+		<div class="group-name">
+			<p>
+				<c:out value="${childOrg.name}" /> 
+				<c:forEach var="childlink" items="${childOrg.links}">
+					<a href="<c:out value='${childlink.url}'/>" class="sequence-action-link"> 
+						<img src="images/css/mycourses_addlesson.jpg" alt="add lesson" width="13" height="15" class="align-middle"> 
+						<fmt:message key="${childlink.name}" /> 
+					</a>
+				</c:forEach>
+			</p>
+			<c:forEach var="childLesson" items="${childOrg.lessons}">
+				<p>
+					<a href="<c:out value='${childLesson.url}'/>" class="sequence-name-link"> 
+						<c:out value="${childLesson.name}" /> 
+					</a> 
+					<c:forEach var="childlessonlink" items="${childLesson.links}">
+					<a href="<c:out value='${childlessonlink.url}'/>" class="sequence-action-link"> 
+						<img src="images/css/mycourses_monitor.jpg" alt="monitor" width="19" height="16" border="0" class="align-middle"> 
+						<fmt:message key="${childlessonlink.name}" /> 
+					</a>
+					</c:forEach>
+				</p>
+			</c:forEach>
+		</div>
+	</c:forEach> <!--end group name --></div>
+	<!-- close course section  -->
+</c:forEach>
+<c:if test="${empty orgBeans}">
+	<p align="left"><fmt:message key="msg.groups.empty" /></p>
+</c:if>
Index: lams_central/web/indexContent.jsp
===================================================================
diff -u -r085c036bf6ccd97b08e12f5f25368fb932c606db -r4f23888b7f7ab9234285d6565b5995ed94fee49f
--- lams_central/web/indexContent.jsp	(.../indexContent.jsp)	(revision 085c036bf6ccd97b08e12f5f25368fb932c606db)
+++ lams_central/web/indexContent.jsp	(.../indexContent.jsp)	(revision 4f23888b7f7ab9234285d6565b5995ed94fee49f)
@@ -1,97 +1,18 @@
-<%@ page contentType="text/html; charset=utf-8" language="java" %>
-
+<%@ page contentType="text/html; charset=utf-8" language="java"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
 
-<p align="right"> 
-	<c:forEach var="headerlink" items="${headerLinks}">
-		[<a href="<c:out value='${headerlink.url}'/>"><fmt:message key="${headerlink.name}"/></a>]&nbsp;
-	</c:forEach>
-</p>
-
-<table>
-	<c:forEach var="orgBean" items="${orgBeans}">
-		<tr><td>
-			<table>
-				<tr><td>
-					<c:choose>
-					<c:when test="${not empty orgBean.lessons || not empty orgBean.childIndexOrgBeans}">
-						<a onclick="toggle(this)"><img src="images/tree_open.gif"/></a>
-					</c:when>
-					<c:otherwise>
-						<img src="images/tree_white.gif"/>
-					</c:otherwise>
-					</c:choose>&nbsp;
-					<strong><c:out value="${orgBean.name}"/></strong>
-					<img src="images/spacer.gif" height="10" width="20"/>
-					<c:forEach var="link" items="${orgBean.links}">
-						[<a href="<c:out value='${link.url}'/>"><fmt:message key="${link.name}"/></a>]&nbsp;
-					</c:forEach>
-					<div>
-						<table>
-							<c:forEach var="lesson" items="${orgBean.lessons}">
-								<tr>
-									<td width="10"></td>
-									<td>
-										<img src="images/tree_white.gif"/> <c:out value="${lesson.name}"/>
-										<img src="images/spacer.gif" height="10" width="20"/>
-										<c:forEach var="lessonlink" items="${lesson.links}">
-											[<a href="<c:out value='${lessonlink.url}'/>"><fmt:message key="${lessonlink.name}"/></a>]&nbsp;
-										</c:forEach>
-										<div></div> 
-									</td>
-								</tr>
-							</c:forEach>
-		
-							<c:forEach var="childOrg" items="${orgBean.childIndexOrgBeans}">
-								<tr>
-									<td width="10"></td>
-									<td colspan="2">
-										<c:choose>
-										<c:when test="${not empty childOrg.lessons}">
-											<a onclick="toggle(this)"><img src="images/tree_open.gif"/></a>
-										</c:when>
-										<c:otherwise>
-											<img src="images/tree_white.gif"/>
-										</c:otherwise>
-										</c:choose>&nbsp;
-										<strong><c:out value="${childOrg.name}"/></strong>
-										<img src="images/spacer.gif" height="10" width="30"/>
-										<c:forEach var="childlink" items="${childOrg.links}">
-											[<a href="<c:out value='${childlink.url}'/>"><fmt:message key="${childlink.name}"/></a>]&nbsp;
-										</c:forEach>
-										<div>
-											<c:forEach var="childLesson" items="${childOrg.lessons}">
-												<table>
-													<tr>
-														<td width="10"></td>
-														<td>
-															<img src="images/tree_white.gif"/> <c:out value="${childLesson.name}"/>
-															<img src="images/spacer.gif" height="5" width="20"/>
-															<c:forEach var="childlessonlink" items="${childLesson.links}">
-																[<a href="<c:out value='${childlessonlink.url}'/>"><fmt:message key="${childlessonlink.name}"/></a>]&nbsp;
-															</c:forEach>
-															<div></div> 
-														</td>
-													</tr>
-												</table>
-											</c:forEach>
-										</div>
-									</td>
-								</tr>
-						</c:forEach>
-
-						</table>
-					</div>
-				</td></tr>
+	<div id="content">
+		<div id="message" style="text-align: center;"></div>
+		<div style="display: block;" class="box">
+			<table cellpadding="0">
+				<tbody>
+					<tr>
+						<td>
+							<c:import url="indexCommon.jsp" charEncoding="utf-8"/>
+						</td>
+					</tr>
+				</tbody>
 			</table>
-		</td></tr>
-	</c:forEach>			
-</table>
-
-<p align="left">
-<c:if test="${empty orgBeans}">
-	<fmt:message key="msg.groups.empty" />
-</c:if>
-</p>
-
+		</div>
+	</div>
Index: lams_central/web/main.jsp
===================================================================
diff -u
--- lams_central/web/main.jsp	(revision 0)
+++ lams_central/web/main.jsp	(revision 4f23888b7f7ab9234285d6565b5995ed94fee49f)
@@ -0,0 +1,97 @@
+<%@ page contentType="text/html; charset=utf-8" language="java"%>
+<%@ page import="org.lamsfoundation.lams.security.JspRedirectStrategy"%>
+<%@ page import="org.lamsfoundation.lams.web.util.HttpSessionManager"%>
+<%@ page import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+
+<%JspRedirectStrategy.welcomePageStatusUpdate(request, response);%>
+<%HttpSessionManager.getInstance().updateHttpSessionByLogin(request.getSession(),request.getRemoteUser());%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<lams:html>
+<head>
+	<title>LAMS::<fmt:message key="index.welcome" /></title>
+	<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">
+	<meta http-equiv="Expires" content="-1">
+	<lams:css />
+	<link rel="icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
+	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
+	<script language="JavaScript" type="text/javascript" src="includes/javascript/getSysInfo.js"></script>
+	<script language="JavaScript" type="text/javascript" src="includes/javascript/openUrls.js"></script>
+	<script>
+		<!--
+			function refresh(){
+				document.location.reload();
+			}
+		//->
+	</script>
+</head>
+<body class="my-courses">
+<div id="page-mycourses">
+	<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" href="#"><fmt:message key="index.mycourses"/> </a></div>
+				<div class="tab-right-selected"></div>
+			</div>
+			<c:forEach var="headerlink" items="${headerLinks}">
+			<div class="nav-box-right">
+				<div class="tab-left"></div>
+				<div class="tab-middle">
+					<a class="tab-middle-link" href="<c:out value='${headerlink.url}'/>">
+						<fmt:message key="${headerlink.name}" />
+					</a>
+				</div>
+				<div class="tab-right"></div>
+			</div>
+			</c:forEach>
+		</div>
+	</div>
+	<!--closes header-->
+	<div id="content">
+		<div id="message" style="text-align: center;"></div>
+		<div style="display: block;" class="box">
+			<table cellpadding="0">
+				<tbody>
+					<tr>
+						<td>
+							<div class="welcome">
+								<div class="float-left">
+									<img src="images/css/user.gif" alt="" width="14" height="13" /> 
+									<fmt:message key="index.welcome" /> 
+									<lams:user property="firstName" />
+								</div>
+								<div class="float-right">
+									<a title="<fmt:message key="index.refresh.hint"/>" href="javascript:refresh()">
+										<fmt:message key="index.refresh" />
+									</a> | <a href="home.do?method=logout" onClick="closeAllChildren()">
+										<fmt:message key="index.logout" />
+									</a>
+								</div>
+							</div>
+							<c:import url="indexCommon.jsp" charEncoding="utf-8"/>						
+						</td>
+					</tr>
+				</tbody>
+			</table>
+		</div>
+	</div>
+	<div id="footer">
+		<p>
+			<fmt:message key="msg.LAMS.version" /> <%=Configuration.get(ConfigurationKeys.VERSION)%>
+			<a href="copyright.jsp" target='copyright' onClick="openCopyRight()">
+				&copy; <fmt:message key="msg.LAMS.copyright.short" /> 
+			</a>
+		</p>
+	</div>
+</div>
+	<!--closes footer-->
+</body>
+</lams:html>
+
Index: lams_central/web/profile.jsp
===================================================================
diff -u -rd1d4b9a5af1887e382f087d7c8f858f0f7983bdc -r4f23888b7f7ab9234285d6565b5995ed94fee49f
--- lams_central/web/profile.jsp	(.../profile.jsp)	(revision d1d4b9a5af1887e382f087d7c8f858f0f7983bdc)
+++ lams_central/web/profile.jsp	(.../profile.jsp)	(revision 4f23888b7f7ab9234285d6565b5995ed94fee49f)
@@ -19,51 +19,6 @@
 					parameters: params
 				});
 		}
-
-		function findNextDiv(node)
-		 {
-		 	 var nd = node.nextSibling;
-		 	  while(nd.nodeName.toUpperCase()!="DIV"){
-		 	   	nd=nd.nextSibling;
-		 	  }  
-		 	   return nd
-		 }
-		 
-		function toggle(node)
-		{
-			// Unfold the branch if it isn't visible
-			var nextDiv = findNextDiv(node);
-			if (nextDiv.style.display == 'none')
-			{
-				// Change the image (if there is an image)
-				if (node.childNodes.length > 0)
-				{
-					if (node.childNodes.item(0).nodeName == "IMG")
-					{
-						node.childNodes.item(0).src = "images/tree_open.gif";
-					}
-				}
-		
-				nextDiv.style.display = 'block';
-			}
-			// Collapse the branch if it IS visible
-			else
-			{
-				// Change the image (if there is an image)
-				if (node.childNodes.length > 0)
-				{
-					if (node.childNodes.item(0).nodeName == "IMG")
-					{
-						node.childNodes.item(0).src = "images/tree_closed.gif";
-					}
-				}
-		
-				nextDiv.style.display = 'none';
-			}
-		
-		}
-		
-		getContent();
 	</script>
 
 <h2><fmt:message key="index.myprofile" /></h2>