Index: lams_build/lib/lams/lams-central.jar
===================================================================
diff -u -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 -rdc7b67e7677c8cd2289130c67094a62b39177d05
Binary files differ
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r9948b6f3d51147a1325de6e18651a1d9bce1cea4 -rdc7b67e7677c8cd2289130c67094a62b39177d05
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
===================================================================
diff -u -r56a78648ef24c607f16cb249439a2d624f6b8f12 -rdc7b67e7677c8cd2289130c67094a62b39177d05
--- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	(.../DisplayGroupAction.java)	(revision 56a78648ef24c607f16cb249439a2d624f6b8f12)
+++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	(.../DisplayGroupAction.java)	(revision dc7b67e7677c8cd2289130c67094a62b39177d05)
@@ -24,8 +24,6 @@
 package org.lamsfoundation.lams.web;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -41,7 +39,6 @@
 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;
@@ -63,9 +60,6 @@
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.UserOrganisationRole;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
-import org.lamsfoundation.lams.util.CentralConstants;
-import org.lamsfoundation.lams.util.Configuration;
-import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.IndexUtils;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.springframework.web.context.WebApplicationContext;
@@ -75,8 +69,6 @@
  * @author jliew
  * 
  * @struts.action path="/displayGroup" validate="false"
- * @struts.action-forward name="groupHeader" path="/groupHeader.jsp"
- * @struts.action-forward name="groupContents" path="/groupContents.jsp"
  * @struts.action-forward name="group" path="/group.jsp"
  */
 public class DisplayGroupAction extends Action {
@@ -95,11 +87,11 @@
     private static ILearningDesignService learningDesignService;
     private Integer stateId = OrganisationState.ACTIVE;
 
+    @Override
     @SuppressWarnings({ "unchecked" })
     public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 
-	String display = WebUtil.readStrParam(request, "display", false);
 	stateId = WebUtil.readIntParam(request, "stateId", false);
 	Integer orgId = WebUtil.readIntParam(request, "orgId", false);
 
@@ -108,7 +100,6 @@
 	    org = (Organisation) getService().findById(Organisation.class, orgId);
 	}
 
-	String forwardPath = "group";
 	if (org != null) {
 	    boolean allowSorting = false;
 	    List<Integer> roles = new ArrayList<Integer>();
@@ -122,136 +113,87 @@
 		}
 	    }
 
-	    IndexOrgBean iob = null;
-	    if (StringUtils.equals(display, "contents")) {
-		iob = new IndexOrgBean(org.getOrganisationId(), org.getName(), org.getOrganisationType()
-			.getOrganisationTypeId());
-		iob = populateContentsOrgBean(iob, org, roles, request.getRemoteUser(),
-			request.isUserInRole(Role.SYSADMIN));
-		forwardPath = "groupContents";
-	    } else if (StringUtils.equals(display, "header")) {
-		iob = createHeaderOrgBean(org, roles, request.getRemoteUser(), request.isUserInRole(Role.SYSADMIN),
-			false);
-		forwardPath = "groupHeader";
-	    } else {
-		iob = createHeaderOrgBean(org, roles, request.getRemoteUser(), request.isUserInRole(Role.SYSADMIN),
-			true);
-	    }
+	    IndexOrgBean iob = createOrgBean(org, roles, request.getRemoteUser(), request.isUserInRole(Role.SYSADMIN));
 
 	    request.setAttribute("orgBean", iob);
 	    request.setAttribute("allowSorting", allowSorting);
 	    iob.setAllowSorting(allowSorting && iob.getAllowSorting());
 	    if (org.getEnableSingleActivityLessons()
-		    && (contains(roles, Role.ROLE_GROUP_MANAGER) || contains(roles, Role.ROLE_MONITOR))) {
+		    && (roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_MONITOR))) {
 		// if sinble activity lessons are enabled, put sorted list of tools
 		request.setAttribute("tools", getToolDTOs(request.getRemoteUser()));
 	    }
 	}
 
-	return mapping.findForward(forwardPath);
+	return mapping.findForward("group");
     }
 
-    @SuppressWarnings({ "unchecked" })
-    private IndexOrgBean createHeaderOrgBean(Organisation org, List<Integer> roles, String username,
-	    boolean isSysAdmin, boolean includeContents) throws SQLException, NamingException {
+    private IndexOrgBean createOrgBean(Organisation org, List<Integer> roles, String username, boolean isSysAdmin)
+	    throws SQLException, NamingException {
 	IndexOrgBean orgBean = new IndexOrgBean(org.getOrganisationId(), org.getName(), org.getOrganisationType()
 		.getOrganisationTypeId());
 
-	// set org links
+	// First, populate header part
 	List<IndexLinkBean> links = new ArrayList<IndexLinkBean>();
 	List<IndexLinkBean> moreLinks = new ArrayList<IndexLinkBean>();
 	if (isSysAdmin && stateId.equals(OrganisationState.ACTIVE)) {
 	    if (orgBean.getType().equals(OrganisationType.COURSE_TYPE)) {
 		moreLinks.add(new IndexLinkBean("index.classman", "javascript:openOrgManagement("
-			+ org.getOrganisationId() + ")", "manage-group-button", null, null));
+			+ org.getOrganisationId() + ")", "manage-group-button", null));
 	    }
 	}
 
-	if (org.getEnableGradebookForLearners() && contains(roles, Role.ROLE_LEARNER)) {
-	    try {
-		// for some reason the name needs to be encoded twice so it's encoded on JSP page as well
-		String encodedOrgName = URLEncoder.encode(URLEncoder.encode(org.getName(), "UTF8"), "UTF8");
-		String link = "javascript:openGradebookLearnerPopup(" + "'" + encodedOrgName + "','"
-			+ Configuration.get(ConfigurationKeys.SERVER_URL)
-			+ "/gradebook/gradebookLearning.do?dispatch=courseLearner&organisationID="
-			+ org.getOrganisationId() + "'," + "750,400,0,0);";
-
-		links.add(new IndexLinkBean("index.coursegradebook.learner", link, "my-grades-button", null, null));
-	    } catch (UnsupportedEncodingException e) {
-		DisplayGroupAction.log.error(
-			"Error while encoding course name, skipping gradebook course monitor link", e);
-	    }
+	if (org.getEnableGradebookForLearners() && roles.contains(Role.ROLE_LEARNER)) {
+	    String link = "javascript:showGradebookLearnerDialog(" + org.getOrganisationId() + ")";
+	    links.add(new IndexLinkBean("index.coursegradebook.learner", link, "my-grades-button", null));
 	}
 
-	if ((contains(roles, Role.ROLE_GROUP_ADMIN) || contains(roles, Role.ROLE_GROUP_MANAGER) || contains(roles,
-		Role.ROLE_MONITOR)) && stateId.equals(OrganisationState.ACTIVE)) {
+	if ((roles.contains(Role.ROLE_GROUP_ADMIN) || roles.contains(Role.ROLE_GROUP_MANAGER) || roles
+		.contains(Role.ROLE_MONITOR)) && stateId.equals(OrganisationState.ACTIVE)) {
 	    if (orgBean.getType().equals(OrganisationType.COURSE_TYPE)) {
-		if ((!isSysAdmin)
-			&& (contains(roles, Role.ROLE_GROUP_ADMIN) || contains(roles, Role.ROLE_GROUP_MANAGER))) {
+		if ((!isSysAdmin) && (roles.contains(Role.ROLE_GROUP_ADMIN) || roles.contains(Role.ROLE_GROUP_MANAGER))) {
 		    moreLinks.add(new IndexLinkBean("index.classman", "javascript:openOrgManagement("
-			    + org.getOrganisationId() + ")", "manage-group-button", null, null));
+			    + org.getOrganisationId() + ")", "manage-group-button", null));
 		}
-		if (contains(roles, Role.ROLE_GROUP_MANAGER) || contains(roles, Role.ROLE_MONITOR)) {
+		if (roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_MONITOR)) {
 		    String name = org.getEnableSingleActivityLessons() ? "index.addlesson.single" : "index.addlesson";
 		    links.add(new IndexLinkBean(name,
 			    "javascript:showAddLessonDialog(" + org.getOrganisationId() + ")", "add-lesson-button",
-			    null, null));
+			    null));
 		}
-		moreLinks.add(new IndexLinkBean("index.searchlesson", Configuration.get(ConfigurationKeys.SERVER_URL)
-			+ "/findUserLessons.do?dispatch=getResults&courseID=" + org.getOrganisationId()
-			+ "&KeepThis=true&TB_iframe=true&height=400&width=600", "search-lesson thickbox"
-			+ org.getOrganisationId(), null, "index.searchlesson.tooltip"));
+		moreLinks.add(new IndexLinkBean("index.searchlesson", "javascript:showSearchLessonDialog("
+			+ org.getOrganisationId() + ")", "search-lesson", "index.searchlesson.tooltip"));
 
 		// Adding course notifications links if enabled
 		if (org.getEnableCourseNotifications()
-			&& (contains(roles, Role.ROLE_GROUP_MANAGER) || contains(roles, Role.ROLE_MONITOR))) {
+			&& (roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_MONITOR))) {
 		    moreLinks.add(new IndexLinkBean("index.emailnotifications", "javascript:showNotificationsDialog("
-			    + org.getOrganisationId() + ",null)", "course-notifications", null,
+			    + org.getOrganisationId() + ",null)", "course-notifications",
 			    "index.emailnotifications.tooltip"));
 		}
 
 		// Adding gradebook course monitor links if enabled
 		if (org.getEnableGradebookForMonitors()
-			&& (contains(roles, Role.ROLE_GROUP_MANAGER) || contains(roles, Role.ROLE_MONITOR))) {
-		    try {
-			// for some reason the name needs to be encoded twice so it's encoded on JSP page as well
-			String encodedOrgName = URLEncoder.encode(URLEncoder.encode(org.getName(), "UTF8"), "UTF8");
-			String link = "javascript:openGradebookCourseMonitorPopup(" + "'" + encodedOrgName + "','"
-				+ Configuration.get(ConfigurationKeys.SERVER_URL)
-				+ "/gradebook/gradebookMonitoring.do?dispatch=courseMonitor&organisationID="
-				+ org.getOrganisationId() + "'," + "850,400,0,0);";
-			moreLinks.add(new IndexLinkBean("index.coursegradebook", link, "course-gradebook-button", null,
-				"index.coursegradebook.tooltip"));
-		    } catch (UnsupportedEncodingException e) {
-			DisplayGroupAction.log.error(
-				"Error while encoding course name, skipping gradebook course monitor link", e);
-		    }
+			&& (roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_MONITOR))) {
+		    String link = "javascript:showGradebookCourseDialog(" + org.getOrganisationId() + ")";
+		    moreLinks.add(new IndexLinkBean("index.coursegradebook", link, "course-gradebook-button",
+			    "index.coursegradebook.tooltip"));
 		}
 
 	    } else {// CLASS_TYPE
-		if (contains(roles, Role.ROLE_GROUP_MANAGER) || contains(roles, Role.ROLE_MONITOR)) {
-		    String name = org.getParentOrganisation().getEnableSingleActivityLessons() ? "index.addlesson.single" : "index.addlesson";
+		if (roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_MONITOR)) {
+		    String name = org.getParentOrganisation().getEnableSingleActivityLessons() ? "index.addlesson.single"
+			    : "index.addlesson";
 		    links.add(new IndexLinkBean(name,
 			    "javascript:showAddLessonDialog(" + org.getOrganisationId() + ")", "add-lesson-button",
-			    null, null));
+			    null));
 		}
 
 		// Adding gradebook course monitor links if enabled
 		if (org.getParentOrganisation().getEnableGradebookForMonitors()
-			&& (contains(roles, Role.ROLE_GROUP_MANAGER) || contains(roles, Role.ROLE_MONITOR))) {
-		    try {
-			// for some reason the name needs to be encoded twice so it's encoded on JSP page as well
-			String encodedOrgName = URLEncoder.encode(URLEncoder.encode(org.getName(), "UTF8"), "UTF8");
-			String link = "javascript:openGradebookCourseMonitorPopup(" + "'" + encodedOrgName + "','"
-				+ Configuration.get(ConfigurationKeys.SERVER_URL)
-				+ "/gradebook/gradebookMonitoring.do?dispatch=courseMonitor&organisationID="
-				+ org.getOrganisationId() + "'," + "850,400,0,0);";
-			moreLinks.add(new IndexLinkBean("index.coursegradebook.subgroup", link, "my-grades-button",
-				null, null));
-		    } catch (UnsupportedEncodingException e) {
-			DisplayGroupAction.log.error(
-				"Error while encoding course name, skipping gradebook course monitor link", e);
-		    }
+			&& (roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_MONITOR))) {
+		    String link = "javascript:showGradebookCourseDialog(" + org.getOrganisationId() + ")";
+		    moreLinks.add(new IndexLinkBean("index.coursegradebook.subgroup", link, "my-grades-button", null));
 		}
 	    }
 	}
@@ -264,28 +206,24 @@
 	    orgBean.setArchivedDate(org.getArchivedDate());
 	}
 
-	if (includeContents) {
-	    orgBean = populateContentsOrgBean(orgBean, org, roles, username, isSysAdmin);
-	}
+	// now populate group contents
+	orgBean = populateContentsOrgBean(orgBean, org, roles, username, isSysAdmin);
 
 	return orgBean;
     }
 
+    @SuppressWarnings("unchecked")
     private IndexOrgBean populateContentsOrgBean(IndexOrgBean orgBean, Organisation org, List<Integer> roles,
 	    String username, boolean isSysAdmin) throws SQLException, NamingException {
 	User user = (User) getService().findByProperty(User.class, "login", username).get(0);
 
 	// set lesson beans
-	List<IndexLessonBean> lessonBeans = null;
-	try {
-	    Map<Long, IndexLessonBean> map = populateLessonBeans(user.getUserId(), org.getOrganisationId(), roles);
-	    lessonBeans = IndexUtils.sortLessonBeans(org.getOrderedLessonIds(), map);
-	} catch (Exception e) {
-	    DisplayGroupAction.log.error("Failed retrieving user's lessons from database: " + e, e);
-	}
+	Map<Long, IndexLessonBean> map = populateLessonBeans(user.getUserId(), org.getOrganisationId(), roles);
+	List<IndexLessonBean> lessonBeans = IndexUtils.sortLessonBeans(org.getOrderedLessonIds(), map);
+
 	orgBean.setLessons(lessonBeans);
 	if (!lessonBeans.isEmpty()) {
-	   orgBean.setAllowSorting(true);
+	    orgBean.setAllowSorting(true);
 	}
 
 	// create subgroup beans
@@ -299,22 +237,20 @@
 		    List<UserOrganisationRole> userOrganisationRoles = getService().getUserOrganisationRoles(
 			    organisation.getOrganisationId(), username);
 		    // don't list the subgroup if user is not a member, and not a group admin/manager
-		    if ((userOrganisationRoles == null) || userOrganisationRoles.isEmpty()) {
-			if (!contains(roles, Role.ROLE_GROUP_ADMIN) && !contains(roles, Role.ROLE_GROUP_MANAGER)
-				&& !isSysAdmin) {
-			    continue;
-			}
+		    if (((userOrganisationRoles == null) || userOrganisationRoles.isEmpty()) && !isSysAdmin
+			    && !roles.contains(Role.ROLE_GROUP_ADMIN) && !roles.contains(Role.ROLE_GROUP_MANAGER)) {
+			continue;
 		    }
+
 		    for (UserOrganisationRole userOrganisationRole : userOrganisationRoles) {
 			classRoles.add(userOrganisationRole.getRole().getRoleId());
 		    }
-		    if (contains(roles, Role.ROLE_GROUP_MANAGER)) {
+		    if (roles.contains(Role.ROLE_GROUP_MANAGER)) {
 			classRoles.add(Role.ROLE_GROUP_MANAGER);
 		    }
-		    IndexOrgBean childOrgBean = createHeaderOrgBean(organisation, classRoles, username, isSysAdmin,
-			    true);
+		    IndexOrgBean childOrgBean = createOrgBean(organisation, classRoles, username, isSysAdmin);
 		    childOrgBeans.add(childOrgBean);
-		    if (childOrgBean.getLessons() != null && !childOrgBean.getLessons().isEmpty()) {
+		    if ((childOrgBean.getLessons() != null) && !childOrgBean.getLessons().isEmpty()) {
 			orgBean.setAllowSorting(true);
 		    }
 		}
@@ -347,16 +283,16 @@
 	    String url = null;
 	    Integer lessonStateId = bean.getState();
 	    if (stateId.equals(OrganisationState.ACTIVE)) {
-		if (contains(roles, Role.ROLE_LEARNER)) {
+		if (roles.contains(Role.ROLE_LEARNER)) {
 		    if (lessonStateId.equals(Lesson.STARTED_STATE) || lessonStateId.equals(Lesson.FINISHED_STATE)) {
 			url = "javascript:openLearner(" + bean.getId() + ")";
 		    }
 		}
 	    } else if (stateId.equals(OrganisationState.ARCHIVED)) {
-		if (contains(roles, Role.ROLE_LEARNER)) {
+		if (roles.contains(Role.ROLE_LEARNER)) {
 		    if (lessonStateId.equals(Lesson.STARTED_STATE) || lessonStateId.equals(Lesson.FINISHED_STATE)) {
-			lessonLinks.addFirst(new IndexLinkBean("label.export.portfolio", "javascript:openExportPortfolio("
-				+ bean.getId() + ")"));
+			lessonLinks.addFirst(new IndexLinkBean("label.export.portfolio",
+				"javascript:openExportPortfolio(" + bean.getId() + ")"));
 		    }
 		}
 	    }
@@ -374,11 +310,10 @@
 
 	// iterate through user's lessons where they are staff (or simply through all lessons in case of Group_Manager),
 	// and add staff links to the beans in the map.
-	Integer userRole = (contains(roles, Role.ROLE_GROUP_MANAGER)) ? Role.ROLE_GROUP_MANAGER : Role.ROLE_MONITOR;
+	Integer userRole = (roles.contains(Role.ROLE_GROUP_MANAGER)) ? Role.ROLE_GROUP_MANAGER : Role.ROLE_MONITOR;
 	Map<Long, IndexLessonBean> staffMap = getLessonService().getLessonsByOrgAndUserWithCompletedFlag(userId, orgId,
 		userRole);
-	boolean isGroupManagerOrMonitor = contains(roles, Role.ROLE_GROUP_MANAGER)
-		|| contains(roles, Role.ROLE_MONITOR);
+	boolean isGroupManagerOrMonitor = roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_MONITOR);
 	for (IndexLessonBean bean : staffMap.values()) {
 	    if (map.containsKey(bean.getId())) {
 		bean = map.get(bean.getId());
@@ -389,48 +324,38 @@
 	    }
 
 	    if ((isGroupManagerOrMonitor && stateId.equals(OrganisationState.ACTIVE))
-		    || (stateId.equals(OrganisationState.ARCHIVED) && contains(roles, Role.ROLE_GROUP_MANAGER))) {
-		lessonLinks.addFirst(new IndexLinkBean("index.monitor", "javascript:showMonitorLessonDialog(" + bean.getId()
-			+ ")", null, "mycourses-monitor-img", null));
+		    || (stateId.equals(OrganisationState.ARCHIVED) && roles.contains(Role.ROLE_GROUP_MANAGER))) {
+		lessonLinks.addFirst(new IndexLinkBean("index.monitor", "javascript:showMonitorLessonDialog("
+			+ bean.getId() + ")", "mycourses-monitor-img", null));
 	    }
 
 	    // Adding lesson notifications links if enabled
 	    if (isGroupManagerOrMonitor && bean.isEnableLessonNotifications()) {
 		lessonLinks.addFirst(new IndexLinkBean("index.emailnotifications",
-			"javascript:showNotificationsDialog(null," + bean.getId() + ")", null,
-			"mycourses-notifications-img", "index.emailnotifications.tooltip"));
+			"javascript:showNotificationsDialog(null," + bean.getId() + ")", "mycourses-notifications-img",
+			"index.emailnotifications.tooltip"));
 	    }
 
 	    // Adding gradebook course monitor links if enabled
 	    if (isGroupManagerOrMonitor
 		    && (org.getEnableGradebookForMonitors() || ((parent != null) && parent
 			    .getEnableGradebookForMonitors()))) {
-		try {
-		    String encodedOrgName = URLEncoder.encode(URLEncoder.encode(org.getName(), "UTF8"), "UTF8");
-		    String link = "javascript:openGradebookLessonMonitorPopup(" + "'" + encodedOrgName + "','"
-			    + Configuration.get(ConfigurationKeys.SERVER_URL)
-			    + "/gradebook/gradebookMonitoring.do?lessonID=" + bean.getId() + "'," + "850,700,0,0);";
-		    lessonLinks.addFirst(new IndexLinkBean("index.coursegradebookmonitor", link, null, "mycourses-mark-img",
-			    null));
-		} catch (UnsupportedEncodingException e) {
-		    DisplayGroupAction.log.error(
-			    "Error while encoding course name, skipping gradebook lesson monitor link", e);
-		}
+		String link = "javascript:showGradebookLessonDialog(" + bean.getId() + ")";
+		lessonLinks
+			.addFirst(new IndexLinkBean("index.coursegradebookmonitor", link, "mycourses-mark-img", null));
 	    }
 
-	    // Add lesson conditions thickbox
+	    // Add lesson conditions
 	    if (isGroupManagerOrMonitor) {
-		String conditionsLink = Configuration.get(ConfigurationKeys.SERVER_URL)
-			+ "/lessonConditions.do?method=getIndexLessonConditions&" + CentralConstants.PARAM_LESSON_ID
-			+ "=" + bean.getId() + "&KeepThis=true&TB_iframe=true&height=480&width=610";
-		lessonLinks.addFirst(new IndexLinkBean("index.conditions", conditionsLink, "thickbox" + orgId,
-			"mycourses-conditions-img", "index.conditions.tooltip"));
+		String conditionsLink = "javascript:showConditionsDialog(" + bean.getId() + ")";
+		lessonLinks.addFirst(new IndexLinkBean("index.conditions", conditionsLink, "mycourses-conditions-img",
+			"index.conditions.tooltip"));
 	    }
 
 	    // Add delete lesson option
 	    if (isGroupManagerOrMonitor) {
 		String removeLessonLink = "javascript:removeLesson(" + bean.getId() + ")";
-		lessonLinks.addFirst(new IndexLinkBean("index.remove.lesson", removeLessonLink, null,
+		lessonLinks.addFirst(new IndexLinkBean("index.remove.lesson", removeLessonLink,
 			"mycourses-removelesson-img", "index.remove.lesson.tooltip"));
 	    }
 
@@ -443,15 +368,6 @@
 	return map;
     }
 
-    private boolean contains(List<Integer> roles, Integer roleId) {
-	for (int i = 0; i < roles.size(); i++) {
-	    if (roleId.equals(roles.get(i))) {
-		return true;
-	    }
-	}
-	return false;
-    }
-
     /**
      * Gets basic information on available tools: IDs and i18n names.
      */
Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
===================================================================
diff -u -r4166c2c316d883794011c0b6bede4dd54c104779 -rdc7b67e7677c8cd2289130c67094a62b39177d05
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision 4166c2c316d883794011c0b6bede4dd54c104779)
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision dc7b67e7677c8cd2289130c67094a62b39177d05)
@@ -69,7 +69,6 @@
  * @struts.action path="/index" validate="false"
  * 
  * @struts.action-forward name="main" path="/main.jsp"
- * @struts.action-forward name="main2" path="/main2.jsp"
  * @struts.action-forward name="community" path=".community"
  * @struts.action-forward name="profile" path="/profile.do?method=view"
  * @struts.action-forward name="editprofile" path="/profile.do?method=edit"
@@ -117,12 +116,15 @@
 		return mapping.findForward("password");
 	    }
 	}
-
+	
+	User user = getUserManagementService().getUserByLogin(userDTO.getLogin());
+	request.setAttribute("portraitUuid", user.getPortraitUuid());
+	
 	String tab = WebUtil.readStrParam(request, "tab", true);
 	if (StringUtils.equals(tab, "profile")) {
-	    List collapsedOrgDTOs = getUserManagementService().getArchivedCourseIdsByUser(loggedInUser.getUserId(),
+	    List orgDTOs = getUserManagementService().getArchivedCourseIdsByUser(loggedInUser.getUserId(),
 		    request.isUserInRole(Role.SYSADMIN));
-	    request.setAttribute("collapsedOrgDTOs", collapsedOrgDTOs);
+	    request.setAttribute("orgDTOs", orgDTOs);
 	    return mapping.findForward("profile");
 	} else if (StringUtils.equals(tab, "editprofile")) {
 	    return mapping.findForward("editprofile");
@@ -142,7 +144,7 @@
 	    request.setAttribute("tab", tab);
 	    return mapping.findForward("community");
 	}
-
+	
 	if (request.isUserInRole(Role.SYSADMIN)) {
 	    // don't load group ids for sysadmins, unless 'groups' parameter is set
 	    String groups = WebUtil.readStrParam(request, "groups", true);
@@ -157,19 +159,13 @@
 	    request.setAttribute("lamsCommunityEnabled", reg.isEnableLamsCommunityIntegration());
 	}
 
-	List collapsedOrgDTOs = getUserManagementService().getActiveCourseIdsByUser(loggedInUser.getUserId(),
+	List orgDTOs = getUserManagementService().getActiveCourseIdsByUser(loggedInUser.getUserId(),
 		request.isUserInRole(Role.SYSADMIN));
-	request.setAttribute("collapsedOrgDTOs", collapsedOrgDTOs);
-	boolean newLayout = WebUtil.readBooleanParam(request, "newLayout", false);
-	if (newLayout) {
-	    User user = getUserManagementService().getUserByLogin(userDTO.getLogin());
-	    request.setAttribute("portraitUuid", user.getPortraitUuid());
-	    return mapping.findForward("main2");
-	} 
+	request.setAttribute("orgDTOs", orgDTOs);
 	return mapping.findForward("main");
     }
 
-    private void setHeaderLinks(HttpServletRequest request) {
+    private static void setHeaderLinks(HttpServletRequest request) {
 	List<IndexLinkBean> headerLinks = new ArrayList<IndexLinkBean>();
 	if (request.isUserInRole(Role.AUTHOR) || request.isUserInRole(Role.AUTHOR_ADMIN)) {
 	    if (isPedagogicalPlannerAvailable()) {
@@ -220,7 +216,7 @@
 	return IndexAction.userManagementService;
     }
 
-    private boolean isPedagogicalPlannerAvailable() {
+    private static boolean isPedagogicalPlannerAvailable() {
 	String lamsEarPath = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR);
 	String plannerPath = lamsEarPath + File.separator + IndexAction.PATH_LAMS_CENTRAL + File.separator
 		+ IndexAction.PATH_PEDAGOGICAL_PLANNER;
Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java
===================================================================
diff -u -r3480d4f851a1f828386c7921ad5901b6048ee1d3 -rdc7b67e7677c8cd2289130c67094a62b39177d05
--- lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java	(.../ProfileAction.java)	(revision 3480d4f851a1f828386c7921ad5901b6048ee1d3)
+++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java	(.../ProfileAction.java)	(revision dc7b67e7677c8cd2289130c67094a62b39177d05)
@@ -108,7 +108,7 @@
 
 	request.setAttribute("fullName", fullName);
 	request.setAttribute("email", (email != null ? email : ""));
-	request.setAttribute("portraitUuid", (requestor.getPortraitUuid() == null ? 0 : requestor.getPortraitUuid()));
+	request.setAttribute("portraitUuid", requestor.getPortraitUuid());
 	request.setAttribute("tab", "profile");
 
 	return mapping.findForward("view");
Index: lams_central/web/css/defaultHTML.css
===================================================================
diff -u -rb90424e9272f93f30b5de83a07365c03850d2944 -rdc7b67e7677c8cd2289130c67094a62b39177d05
--- lams_central/web/css/defaultHTML.css	(.../defaultHTML.css)	(revision b90424e9272f93f30b5de83a07365c03850d2944)
+++ lams_central/web/css/defaultHTML.css	(.../defaultHTML.css)	(revision dc7b67e7677c8cd2289130c67094a62b39177d05)
@@ -6,17 +6,16 @@
 *************************************************
 General page styles
 ********************************************** */
-
 * {
 	margin: 0px;
 	padding: 0px;
 }
 
 body {
-	background-color:#fff;
-	line-height:16px;
+	background-color: #fff;
+	line-height: 16px;
 	font-size: 11px;
-	font-family: verdana, arial, helvetica, sans-serif;
+	font-family: arial, helvetica, sans-serif;
 }
 
 a {
@@ -37,60 +36,57 @@
 	background: url('../images/css/diagonal_bg.gif');
 }
 
-.row {
-	voice-family: "\"}\""; /* hide the following rules from IE5 */
-	voice-family: inherit;
-	overflow: hidden; /* CSS 'clearing hack' - works on all except for IE5, that's why the IE5 box model hack above */
+h1 {
+	color: #0087e5;
+	font-size: 15px;
+	margin-bottom: 0px;
+	margin-left: 10px;
+	padding-top: 5px;
 }
 
-* html .row {
-	height: 1%;
-}  /* part of the CSS 'clearing hack' */
-
-
-h1 {
-	color:#0087e5; 
-	font-size:15px; 
-	margin-bottom:0px; 
-	margin-left:10px; 
-	padding-top:5px; }
-
-
 /*when there are no tabs at the top of the page */
 h1.no-tabs-below {
-	color:#0087e5; 
-	font-size:16px; 
-	margin-bottom:0px; 
-	margin-left:10px; 
-	padding-top:25px; }
+	color: #0087e5;
+	font-size: 16px;
+	margin-bottom: 0px;
+	margin-left: 10px;
+	padding-top: 25px;
+}
 
-h2 {color:#47bc23; 
-	font-size:12px; 
-	margin-left:10px; 
-	margin-bottom:10px; 
-	margin-top:10px; }
-	
+h2 {
+	color: #47bc23;
+	font-size: 12px;
+	margin-left: 10px;
+	margin-bottom: 10px;
+	margin-top: 10px;
+}
+
 h2.no-space-left {
-	margin-left:0px;
+	margin-left: 0px;
 }
 
-h2.spacer-left{
-	margin-left:25px;
+h2.spacer-left {
+	margin-left: 25px;
 }
 
-span.h2font {color:#47bc23;  
-	font-size:12px; } 
+span.h2font {
+	color: #47bc23;
+	font-size: 12px;
+}
 
-h3 {color:#47bc23; 
-	font-size:12px; 
-	margin-left:10px; 
-	margin-bottom:10px; 
-	margin-top:10px; }
-	
+h3 {
+	color: #47bc23;
+	font-size: 12px;
+	margin-left: 10px;
+	margin-bottom: 10px;
+	margin-top: 10px;
+}
 
+h4 {
+	color: #47bc23;
+	font-size: 11px;
+}
 
-h4 {color:#47bc23; font-size:11px;}
-
 /*defines when instructions are given and places a blue arrow before the text */
 p.instructions {
 	color: #0087e5;
@@ -125,17 +121,16 @@
 	margin-right: 30px;
 }
 
-li.no-list-type  {
+li.no-list-type {
 	list-style-type: none;
 }
 
 #page { /*whole layout of page*/
 	margin: 15px auto 10px auto;
-	width:95%;
+	width: 95%;
 	min-width: 707px;
-	max-width: 1024px;
+	max-width: 100%;
 	background: url('../images/css/lams_logo.gif') no-repeat 96% 10px;
-
 }
 
 #page-main { /*whole layout of page*/
@@ -145,39 +140,36 @@
 }
 
 #header { /*layout of the header */
-
 	height: 17px;
-
 }
 
 #header-main { /*layout of the header */
 	width: 90%;
-	min-width:707px;
-	max-width:1024px;
-	margin-left:auto;
-	margin-right:auto;
-	margin-bottom:5px;
-	
+	min-width: 707px;
+	max-width: 100%;
+	margin-left: auto;
+	margin-right: auto;
+	margin-bottom: 5px;
 }
 
-#header-no-tabs { /*layout of the header  when no-tabs are required. Big enough to line up with LAMS icon - don't use for learner (see header-no-tabs-learner) */
-	width:707px; 
-	height:40px; 
-	background:url('../images/css/top_bg.jpg') no-repeat bottom; 
+#header-no-tabs {
+	/*layout of the header  when no-tabs are required. Big enough to line up with LAMS icon - don't use for learner (see header-no-tabs-learner) */
+	width: 707px;
+	height: 40px;
+	background: url('../images/css/top_bg.jpg') no-repeat bottom;
 }
 
-#header-no-tabs-main { /*layout of the header  when no-tabs are required. Big enough to line up with LAMS icon - don't use for learner (see header-no-tabs-learner) */
-	width:90%;
-	margin-left:auto;
-	margin-right:auto;
-	min-width:707px;
-	max-width:1024px;
-	height:40px; 
-	background:url('../images/css/top_bg.jpg') no-repeat bottom;
+#header-no-tabs-main {
+	/*layout of the header  when no-tabs are required. Big enough to line up with LAMS icon - don't use for learner (see header-no-tabs-learner) */
+	width: 90%;
+	margin-left: auto;
+	margin-right: auto;
+	min-width: 707px;
+	max-width: 100%;
+	height: 40px;
+	background: url('../images/css/top_bg.jpg') no-repeat bottom;
 }
 
-
-
 /*
 *************************************************
 
@@ -195,23 +187,20 @@
 	text-decoration: none;
 	font-size: 12px;
 	font-weight: bold;
-	border:0;
+	border: 0;
 }
 
 #nav a:hover {
 	color: #006bb6;
 	text-decoration: none;
-	border:0;
+	border: 0;
 }
 
 #nav a.selected {
 	color: #333;
-	border:0;
+	border: 0;
 }
 
-
-
-
 /*
 *************************************************
 
@@ -230,7 +219,7 @@
 	height: 31px;
 	width: 8px;
 	background: url('../images/css/selected_left.jpg') no-repeat top left;
-	z-index:2;
+	z-index: 2;
 	float: left;
 }
 
@@ -239,8 +228,8 @@
 	width: 90px;
 	background: url('../images/css/selected_bg.jpg') repeat-x;
 	float: left;
-	z-index:1;
-	padding:8px 5px 0px 5px;
+	z-index: 1;
+	padding: 8px 5px 0px 5px;
 }
 
 #nav .tab-middle-link-selected {
@@ -252,7 +241,7 @@
 	width: 8px;
 	background: url('../images/css/selected_right.jpg') no-repeat top right;
 	float: left;
-	z-index:1;
+	z-index: 1;
 }
 
 .tab-left { /* defines left side of selected tab */
@@ -267,7 +256,7 @@
 	width: 90px;
 	background: url('../images/css/button_bg.jpg') repeat-x;
 	float: left;
-	padding:8px 5px 0px 5px;
+	padding: 8px 5px 0px 5px;
 }
 
 #nav .tab-middle-link {
@@ -281,37 +270,36 @@
 	float: left
 }
 
- .tab-left-highlight { /* defines left side of selected tab */ 	 
-         height: 31px; 	 
-         width: 8px; 	 
-         background: url('../images/css/button_highlight_left.jpg') no-repeat top left; 	 
-         float: left 	 
- } 	 
-  	 
- .tab-middle-highlight { /* defines middle of selected tab */ 	 
-         height: 31px; 	 
-         width: 90px; 	 
-         background: url('../images/css/button_highlight_bg.jpg') repeat-x; 	 
-         float: left; 	 
-  	 
-         padding:8px 5px 0px 5px; 	 
- } 	 
- 	 
- #nav .tab-middle-highlight-link { 	 
-         color: #FFFFFF 	 
- } 	 
- 	 
- .tab-right-highlight { /* defines right side of selected tab */ 	 
-         height: 31px; 	 
-         width: 8px; 	 
-         background: url('../images/css/button_highlight_right.jpg') no-repeat top right; 
-         float: left 	 
- }
- 
- #nav-right a.tab-link-highlight, #nav-right a.tab-link-highlight:hover {
- 	color: #e7eef8;
- }
+.tab-left-highlight { /* defines left side of selected tab */
+	height: 31px;
+	width: 8px;
+	background: url('../images/css/button_highlight_left.jpg') no-repeat top left;
+	float: left
+}
 
+.tab-middle-highlight { /* defines middle of selected tab */
+	height: 31px;
+	width: 90px;
+	background: url('../images/css/button_highlight_bg.jpg') repeat-x;
+	float: left;
+	padding: 8px 5px 0px 5px;
+}
+
+#nav .tab-middle-highlight-link {
+	color: #FFFFFF
+}
+
+.tab-right-highlight { /* defines right side of selected tab */
+	height: 31px;
+	width: 8px;
+	background: url('../images/css/button_highlight_right.jpg') no-repeat top right;
+	float: left
+}
+
+#nav-right a.tab-link-highlight,#nav-right a.tab-link-highlight:hover {
+	color: #e7eef8;
+}
+
 /*
 *************************************************
 
@@ -320,34 +308,34 @@
 ********************************************** */
 #content { /*box around the main content area */
 	min-width: 707px;
-	max-width: 1024px;
+	max-width: 100%;
 	width: 98%;
-	margin-left:auto;
-	margin-right:auto;
+	margin-left: auto;
+	margin-right: auto;
 	background-color: white;
-	padding-bottom:40px;
-	padding-left:10px;
-	padding-right:10px;
+	padding-bottom: 40px;
+	padding-left: 10px;
+	padding-right: 10px;
 	font-size: 11px;
 	margin-top: 12px;
-	border-left:1px solid #aaa;
-	border:1px solid #aaa;
-	border-right:1px solid #aaa;
+	border-left: 1px solid #aaa;
+	border: 1px solid #aaa;
+	border-right: 1px solid #aaa;
 }
 
 #content-main { /*box around the main content area */
-	background-color:#fff;
+	background-color: #fff;
 	font-size: 11px;
-	border:1px solid #d4d8da;
+	border: 1px solid #d4d8da;
 	margin-top: 0px;
-	margin-left:auto;
-	margin-right:auto;
-	margin-bottom:-5px;
-	width:90%; 
-	height:100%; 
-	padding-bottom:-5px;
-	min-width:707px;
-	max-width:1024px;
+	margin-left: auto;
+	margin-right: auto;
+	margin-bottom: -5px;
+	width: 90%;
+	height: 100%;
+	padding-bottom: -5px;
+	min-width: 707px;
+	max-width: 100%;
 }
 
 /*layout of Links within the content area */
@@ -368,24 +356,24 @@
 	background: url('../images/css/btn_off.gif') repeat-x 0px 0px;
 	color: #333;
 	border: 0px none;
-	padding:5px 20px 6px 20px;
+	padding: 5px 20px 6px 20px;
 	text-decoration: none;
-	font-size:11px;
+	font-size: 11px;
 }
 
 /*  style to disbable input buttons */
 #content a.button .disabled {
 	color: #999;
 	background: url('../images/css/btn_off.gif') repeat-x 0px 0px;
 	border: 0px none;
-	padding:5px 20px 6px 20px;
-	}
+	padding: 5px 20px 6px 20px;
+}
 
 #content a:hover.button {
 	background: url('../images/css/btn_over.gif') repeat-x 0px 0px;
 	color: #349018;
 	border: 0px none;
-	padding:5px 20px 6px 20px;
+	padding: 5px 20px 6px 20px;
 	text-decoration: none;
 }
 
@@ -396,201 +384,188 @@
 	background: url('../images/css/btn_off.gif') repeat-x 0px 2px;
 	color: #333;
 	border: 0px none;
-	padding:5px 20px 6px 20px;
+	padding: 5px 20px 6px 20px;
 	text-decoration: none;
-	font-size:11px;
+	font-size: 11px;
 }
 
 /*  style to disbable input buttons */
 #saveCancelButtons a.button .disabled {
 	color: #999;
 	background: url('../images/css/btn_off.gif') repeat-x 0px 2px;
 	border: 0px none;
-	padding:5px 20px 6px 10px;
-	}
+	padding: 5px 20px 6px 10px;
+}
 
 #saveCancelButtons a:hover.button {
 	background: url('../images/css/btn_over.gif') repeat-x 0px 2px;
 	color: #349018;
 	border: 0px none;
-	padding:5px 20px 6px 20px;
+	padding: 5px 20px 6px 20px;
 	text-decoration: none;
 }
 
 /* OK and Cancel icon buttons */
 .okIcon {
-	padding: 0 0 5px 18px; 
+	padding: 0 0 5px 18px;
 	background: url('../images/css/accept.png') no-repeat;
-	
 }
 
 /* OK and Cancel icon buttons */
 .cancelIcon {
-	padding: 0 0 5px 18px; 
+	padding: 0 0 5px 18px;
 	background: url('../images/css/cancel.png') no-repeat;
-	
 }
 
 /*layout of a general button*/
 a.button {
 	background: url('../images/css/btn_off.gif') repeat-x 0px 0px;
 	color: #333;
 	border: 0px none;
-	padding:5px 20px 6px 20px;
+	padding: 5px 20px 6px 20px;
 	text-decoration: none;
-	font-size:11px;
-	
+	font-size: 11px;
 }
 
 a:hover.button {
 	background: url('../images/css/btn_over.gif') repeat-x 0px 0px;
 	color: #349018;
 	border: 0px none;
-	padding:5px 20px 6px 20px;
+	padding: 5px 20px 6px 20px;
 	text-decoration: none;
-	font-size:11px;
+	font-size: 11px;
 }
 
-
 /*layout of adding a topic button */
 a.button-add-item {
 	background: url('../images/css/btn_add_off.gif') no-repeat 0px 0px;
 	color: #333;
 	border: 0px none;
-	padding:5px 15px 6px 25px;
-    text-decoration: none;
-	font-size:11px;
+	padding: 5px 15px 6px 25px;
+	text-decoration: none;
+	font-size: 11px;
 }
 
 a:hover.button-add-item {
 	background: url('../images/css/btn_add_over.gif') no-repeat 0px 0px;
 	color: #349018;
 	border: 0px none;
-	padding:5px 15px 6px 25px;
-    text-decoration: none;
-	font-size:11px;
+	padding: 5px 15px 6px 25px;
+	text-decoration: none;
+	font-size: 11px;
 }
 
-
 /*layout of adding a topic button */
 #content a.button-add-item {
 	background: url('../images/css/btn_add_off.gif') no-repeat 0px 0px;
 	color: #333;
 	border: 0px none;
-	padding:5px 15px 6px 25px;
-	font-size:11px;
+	padding: 5px 15px 6px 25px;
+	font-size: 11px;
 }
 
 #content a:hover.button-add-item {
 	background: url('../images/css/btn_add_over.gif') no-repeat 0px 0px;
 	color: #349018;
 	border: 0px none;
-	padding:5px 15px 6px 25px;
-	font-size:11px;
+	padding: 5px 15px 6px 25px;
+	font-size: 11px;
 }
 
 #content-main a.sequence-name-link {
-	color:#0087E5;
+	color: #0087E5;
 	text-decoration: none;
-	border-bottom: 1px dotted #0087E5;
-	}
-		
+}
+
 #content-main a:hover.sequence-name-link {
-	color:#0087E5;
+	color: #0087E5;
 	text-decoration: none;
 	border-bottom: 1px solid #0087E5;
-	
 }
 
 #content-main a.disabled-sequence-name-link {
-	color:#FF6666;
+	color: #FF6666;
 	text-decoration: none;
 	border-bottom: 1px dotted #FF6666;
-	}
-	
-	
+}
+
 #content-main a:hover.disabled-sequence-name-link {
-	color:#FF6666;
+	color: #FF6666;
 	text-decoration: none;
 	border-bottom: 1px solid #FF6666;
-	
 }
 
-
 #content-main a.sequence-action-link {
-	color:#47bc23;
+	color: #47bc23;
 	text-decoration: none;
-	border:0px;
-	font-variant:small-caps;
-	margin-left:20px;	
+	border: 0px;
+	font-variant: small-caps;
+	margin-left: 20px;
 }
 
 #content-main a:hover.sequence-action-link {
-	color:#47bc23;
+	color: #47bc23;
 	text-decoration: none;
-	border-bottom:0px;
-	font-variant:small-caps;
-	margin-left:20px;
-	}
+	border-bottom: 0px;
+	font-variant: small-caps;
+	margin-left: 20px;
+}
 
 /* my courses individual course boxes */
-
-.course-bg {  /*---- box around the green tabbed items -- */
-	margin-top:15px;
-	margin-bottom:20px;
-	width:100%;
-	background:#fff url('../images/css/mycourses_greentab.jpg') no-repeat top; 
-	margin-left:0px;
-
+.course-bg { /*---- box around the green tabbed items -- */
+	margin-top: 15px;
+	margin-bottom: 20px;
+	width: 100%;
+	background: #fff url('../images/css/mycourses_greentab.jpg') no-repeat top;
+	margin-left: 0px;
 }
 
 .course-bg h2 {
-	font-size:13px;
-	color:#47bc23;
-	padding-left:0px;
-	margin-top:12px;
-	margin-left:0px;
+	font-size: 13px;
+	color: #47bc23;
+	padding-left: 0px;
+	margin-top: 12px;
+	margin-left: 0px;
 }
 
 .course-bg h4 {
-	font-size:12px;
-	color:#47bc23;
-	padding-left:0px
+	font-size: 12px;
+	color: #47bc23;
+	padding-left: 0px
 }
 
 .course-buttons {
-	margin-right:0px;
+	margin-right: 0px;
 }
 
-
 /* Hovering submit button */
 input.button {
 	background: url('../images/css/btn_off.gif') repeat-x 0px 0px;
 	color: #333;
 	border: 0px none;
-	padding:5px 20px 6px 20px;
+	padding: 5px 20px 6px 20px;
 	text-decoration: none;
 	font-size: 11px;
-	font-family: verdana, arial, helvetica, sans-serif;
+	font-family: arial, helvetica, sans-serif;
 }
 
 input:hover.button {
 	background: url('../images/css/btn_over.gif') repeat-x 0px 0px;
 	color: #349018;
 	border: 0px none;
-	padding:5px 20px 6px 20px;
+	padding: 5px 20px 6px 20px;
 	text-decoration: none;
 	font-size: 11px;
-	font-family: verdana, arial, helvetica, sans-serif;
+	font-family: arial, helvetica, sans-serif;
 }
 
 input.disabled {
 	color: #999;
 	background: url('../images/css/btn_off.gif') repeat-x 0px 0px;
 	border: 0px none;
-	padding:5px 20px 6px 20px;
-	font-size:11px;
-	}
+	padding: 5px 20px 6px 20px;
+	font-size: 11px;
+}
 
 .box {
 	display: none;
@@ -600,27 +575,27 @@
 .box-main {
 	display: none;
 	min-height: 100px;
-	margin-right:5%;
-	margin-left:5%;
+	margin-right: 5%;
+	margin-left: 5%;
 }
 
 #footer-main { /*layout of the footer - the bottom of the box */
-	background-color: white;
-//	background: url('../images/css/footer_bg.jpg') no-repeat bottom;
+	background-color: white; //
+	background: url('../images/css/footer_bg.jpg') no-repeat bottom;
 }
 
-#footer a{ /*layout of the footer - the bottom of the box */
-	color:#85aacd;
-	border-bottom:1px solid #85aacd;
-	}
+#footer a { /*layout of the footer - the bottom of the box */
+	color: #85aacd;
+	border-bottom: 1px solid #85aacd;
+}
 
 /*layout of the table with the alternate color for the table heading cell */
 table.alternative-color {
- 	 width:91%; 
-	 margin-left:17px; 
-	 padding-top:0px; 
-	 margin-bottom:15px; 
-	 text-align:left;
+	width: 91%;
+	margin-left: 17px;
+	padding-top: 0px;
+	margin-bottom: 15px;
+	text-align: left;
 }
 
 table.alternative-color th {
@@ -637,146 +612,141 @@
 	padding-left: 20px;
 	font-size: 11px;
 	border-bottom: 1px solid #efefef;
-	vertical-align: top; 
-	background:url('../images/css/greyfade_bg.jpg') repeat-x 3px 0px
+	vertical-align: top;
+	background: url('../images/css/greyfade_bg.jpg') repeat-x 3px 0px
 }
 
-table.alternative-color td.first, table.alternative-color th.first {
+table.alternative-color td.first,table.alternative-color th.first {
 	border-left: none;
 	padding-left: 20px;
 }
 
-
 /*layout of the forum tables with the colored table heading cell */
-table.forum { 
-	width:93%;
-	margin-left:20px; 
-	padding-top:5px; 
-	margin-bottom:10px;
-	background:url('../images/css/greyfade_bg.jpg') repeat-x 3px 49px; 
-	text-align:left; 
-	border-bottom:1px solid #efefef;}
+table.forum {
+	width: 93%;
+	margin-left: 20px;
+	padding-top: 5px;
+	margin-bottom: 10px;
+	background: url('../images/css/greyfade_bg.jpg') repeat-x 3px 49px;
+	text-align: left;
+	border-bottom: 1px solid #efefef;
+}
 
-table.forum th { 
-	background: url('../images/css/green_bg_forum.jpg') repeat-x #f0f5df; 
-	height:20px; 
-	padding-top:5px; 
-	color:#47bc23; 
-	padding-left:15px; 
-	border-left:1px solid #cacdd1;  
-	font-size:12px; 
-	vertical-align:middle;
+table.forum th {
+	background: url('../images/css/green_bg_forum.jpg') repeat-x #f0f5df;
+	height: 20px;
+	padding-top: 5px;
+	color: #47bc23;
+	padding-left: 15px;
+	border-left: 1px solid #cacdd1;
+	font-size: 12px;
+	vertical-align: middle;
 }
 
 table.forum td.posted-by {
-	background: url('../images/css/forum_postedby_bg.jpg') repeat-x; 
-	height:20px; 
-	padding-left:15px; 
-	padding-top:0px; 
-	font-size:10px;
-	vertical-align:top; 
-	border-left:1px solid #cacdd1; 
-	color:#666;
+	background: url('../images/css/forum_postedby_bg.jpg') repeat-x;
+	height: 20px;
+	padding-left: 15px;
+	padding-top: 0px;
+	font-size: 10px;
+	vertical-align: top;
+	border-left: 1px solid #cacdd1;
+	color: #666;
 }
 
-
 table.forum td {
-	padding-left:20px; 
-	font-size:11px; 
-	vertical-align:top; 
+	padding-left: 20px;
+	font-size: 11px;
+	vertical-align: top;
 }
 
-
 /* Used for chosen grouping */
-table.chosengrouping { 
-	 width:98%;
-	 margin-left:0px; 
-	 text-align:center; 
-	 }
+table.chosengrouping {
+	width: 98%;
+	margin-left: 0px;
+	text-align: center;
+}
 
-table.chosengrouping tr { 
-	vertical-align:top
+table.chosengrouping tr {
+	vertical-align: top
 }
 
-table.chosengrouping th { 
-	padding:0px; 
-	font-size:11px;
-	text-align:center;
+table.chosengrouping th {
+	padding: 0px;
+	font-size: 11px;
+	text-align: center;
 }
 
-table.chosengrouping td { 
-	padding:0px; 
-	font-size:11px;
-	text-align:center;
+table.chosengrouping td {
+	padding: 0px;
+	font-size: 11px;
+	text-align: center;
 }
 
-table.chosengrouping td p{ 
-	padding:0px; 
-	font-size:11px; 
-	line-height:11px;
+table.chosengrouping td p {
+	padding: 0px;
+	font-size: 11px;
+	line-height: 11px;
 }
 
-table.chosengrouping td select { 
-	font-size:11px; 
+table.chosengrouping td select {
+	font-size: 11px;
 }
 /*layout of the table with form elements */
-
-table { 
-	 width:100%;
-//	 margin-left:7px; 
-	 text-align:left; 
+table {
+	width: 100%; //
+	margin-left: 7px;
+	text-align: left;
 }
 
-table-main { 
-	 width:100%;
-	 margin-left:auto; 
-	 margin-right:auto; 
-	 text-align:left; 
-	 table-layout: #;
+table-main {
+	width: 100%;
+	margin-left: auto;
+	margin-right: auto;
+	text-align: left;
+	table-layout: #;
 }
-	 
 
-td { 
-	padding:10px; 
-	font-size:12px;
+td {
+	padding: 10px;
+	font-size: 12px;
 }
 
-td-main { 
-	padding:10px; 
-	font-size:12px;
-	margin-right:auto;
-	margin-left:auto;
-	align:center;
+td-main {
+	padding: 10px;
+	font-size: 12px;
+	margin-right: auto;
+	margin-left: auto;
+	align: center;
 }
 
-td p{ 
-	padding:10px; 
-	font-size:12px; 
-	line-height:18px;
+td p {
+	padding: 10px;
+	font-size: 12px;
+	line-height: 18px;
 }
 
 /*layout of button in table 
 td .button{
 	margin:0px; 
 	padding:10px 10px 10px 0px; 
 	font-size:11px;
-	font-family: verdana, arial, helvetica, sans-serif;
+	font-family: arial, helvetica, sans-serif;
 }
 */
 
-
 /* */ /*layout of form styles */
-.field-name{
+.field-name {
 	color: #0087e5;
 	font-weight: bold;
 	text-align: left;
-	padding-bottom:10px;
+	padding-bottom: 10px;
 }
 
 .field-name-alternative-color {
 	color: #47bc23;
 	font-weight: bold;
-	padding-bottom:10px;
+	padding-bottom: 10px;
 	text-align: left;
 }
 
@@ -810,30 +780,36 @@
 .space-bottom-top {
 	padding-bottom: 20px;
 	padding-top: 20px;
-	padding-right:20px; /* Testing spacing IE */
+	padding-right: 20px; /* Testing spacing IE */
 }
 
 .small-space-bottom {
 	margin-bottom: 20px;
 }
 
-.small-space-top {padding-top:6px;}
+.small-space-top {
+	padding-top: 6px;
+}
 
-.space-top {padding-top:20px;}
+.space-top {
+	padding-top: 20px;
+}
 
-.title-space-top {margin-top:12px;}
+.title-space-top {
+	margin-top: 12px;
+}
 
-hr {border:0px;
-	border-top:1px solid #ccc; 
+hr {
+	border: 0px;
+	border-top: 1px solid #ccc;
 	width: 630px;
 	height: 1px;
-	
-	}
+}
 
 /* Warning message style */
 .warning {
 	color: #cc0000;
-	padding:8px 10px 10px 40px;
+	padding: 8px 10px 10px 40px;
 	margin-top: 25px;
 	margin-left: auto;
 	margin-right: auto;
@@ -846,7 +822,7 @@
 
 .warning-login {
 	color: #cc0000;
-	padding:5px 5px;
+	padding: 5px 5px;
 	padding-left: 35px;
 	padding-bottom: -10px;
 	margin-top: -5px;
@@ -859,7 +835,9 @@
 	border: 1px solid #E82A28;
 }
 
-b.error {color:#cc0000;} 
+b.error {
+	color: #cc0000;
+}
 
 /* ***********************************************
     Monitoring page styles
@@ -872,224 +850,228 @@
 	margin-bottom: 20px;
 }
 
-
 /*
 *************************************************
 
 Login page styles
 
 ********************************************** */
-
-
 #login-page { /*whole layout of login page*/
-margin:-35px auto; 
-width:707px;
+	margin: -35px auto;
+	width: 707px;
 }
 
 /*layout of the header  when no-tabs are required */
-#login-header { 
-width:707px; 
-height:25px; 
-background:url('../images/css/top_bg.jpg') no-repeat bottom;
+#login-header {
+	width: 707px;
+	height: 25px;
+	background: url('../images/css/top_bg.jpg') no-repeat bottom;
 }
 
- /*box around the main content area */
+/*box around the main content area */
 #login-content {
-width:707px; 
-background:url('../images/css/body_bg.jpg') repeat-y; 
-padding-bottom:20px; 
-font-size: 11px; 
-margin-top:-5px; 
-line-height:18px;
+	width: 707px;
+	background: url('../images/css/body_bg.jpg') repeat-y;
+	padding-bottom: 20px;
+	font-size: 11px;
+	margin-top: -5px;
+	line-height: 18px;
 }
 
 #login-left-col {
-width:370px; 
-float:left; 
-padding-left:25px;
-margin-top:5px;
+	width: 370px;
+	float: left;
+	padding-left: 25px;
+	margin-top: 5px;
 }
 
-
 #login-left-col h1 {
-margin:0px; 
-padding:0px;
+	margin: 0px;
+	padding: 0px;
 }
 
 #login-left-col h2 {
-margin:10px 0px 0px 3px; 
-padding:0px;
-font-weight:100;
-font-size:1.5em;
+	margin: 10px 0px 0px 3px;
+	padding: 0px;
+	font-weight: 100;
+	font-size: 1.5em;
 }
 
 #login-left-col h3 {
-color:#239CF7; 
-font-size:11px; 
-margin:8px 0px 0px 3px; 
-
+	color: #239CF7;
+	font-size: 11px;
+	margin: 8px 0px 0px 3px;
 }
 
 #login-left-col ul {
-list-style-type:none; 
-margin-top:0px; 
-margin-left:4px;
+	list-style-type: none;
+	margin-top: 0px;
+	margin-left: 4px;
 }
 
 #login-left-col li {
-padding:10px 0px 15px 0px; 
-border-bottom:1px dotted #ccc;
-list-style-type:none;
+	padding: 10px 0px 15px 0px;
+	border-bottom: 1px dotted #ccc;
+	list-style-type: none;
 }
 
 #login-right-col {
-width:285px; 
-float:left; 
-margin-left:17px; 
-background: url('../images/css/lams_login_bar.jpg') no-repeat 0 0; 
-margin-top:5px;
-height:450px;
+	width: 285px;
+	float: left;
+	margin-left: 17px;
+	background: url('../images/css/lams_login_bar.jpg') no-repeat 0 0;
+	margin-top: 5px;
+	height: 450px;
 }
 
 #login-right-col h2 {
-margin-top:22px; 
-margin-left:20px;
-color:#239CF7;
-margin-bottom: 30px;
+	margin-top: 22px;
+	margin-left: 20px;
+	color: #239CF7;
+	margin-bottom: 30px;
 }
 
 #login-right-col p {
-margin-top:5px; 
-margin-right:50px; 
-text-align:right;
+	margin-top: 5px;
+	margin-right: 50px;
+	text-align: right;
 }
+
 #login-right-col p.first {
-margin-top:25px; 
-margin-right:50px; 
-text-align:right; 
-margin-bottom:15px;
+	margin-top: 25px;
+	margin-right: 50px;
+	text-align: right;
+	margin-bottom: 15px;
 }
 
 #login-right-col p.version {
-color:#47bc23;
-margin-top:5px; 
-margin-right:20px;
-margin-bottom:0px; 
-text-align:right;
-font-size:1.2em;
+	color: #47bc23;
+	margin-top: 5px;
+	margin-right: 20px;
+	margin-bottom: 0px;
+	text-align: right;
+	font-size: 1.2em;
 }
+
 #login-right-col p.login-button {
-margin-top:0px; 
-margin-right:50px; 
-text-align:right;
+	margin-top: 0px;
+	margin-right: 50px;
+	text-align: right;
 }
+
 #login-right-col a.button {
-background:url('../images/css/btn_off.gif') no-repeat 0px 0px; 
-color:#333; 
-border:0px none; 
-padding:5px 20px 6px 20px;
-text-decoration:none; }
+	background: url('../images/css/btn_off.gif') no-repeat 0px 0px;
+	color: #333;
+	border: 0px none;
+	padding: 5px 20px 6px 20px;
+	text-decoration: none;
+}
 
 #login-right-col a:hover.button {
-background:url('../images/css/btn_over.gif') repeat-x 0px 0px; 
-color:#349018; 
-border:0px none; 
-padding:5px 20px 6px 20px;
-text-decoration:none;}
+	background: url('../images/css/btn_over.gif') repeat-x 0px 0px;
+	color: #349018;
+	border: 0px none;
+	padding: 5px 20px 6px 20px;
+	text-decoration: none;
+}
 
 #login-page #footer { /*layout of the footer - the bottom of the box */
 	width: 707px;
 	height: 14px;
 	background: url('../images/css/footer_bg.jpg') no-repeat top;
 }
 
-#login-page #footer p{ 
-	padding:20px 0px 0px 10px;
-	text-align:center;
-    font-family: verdana, arial, helvetica, sans-serif;
-	font-size:.9em;
-	color:#999;
+#login-page #footer p {
+	padding: 20px 0px 0px 10px;
+	text-align: center;
+	font-family: arial, helvetica, sans-serif;
+	font-size: .9em;
+	color: #999;
 }
 
-.clear { 
-clear:both
+.clear {
+	clear: both
 }
 
-
 /*
 *************************************************
 
 Floating button containers
 
 ********************************************** */
+.left-buttons {
+	float: left;
+	padding-left: 20px;
+}
 
-.left-buttons {float:left; padding-left:20px;}
+.right-buttons {
+	float: right;
+	padding-right: 20px;
+	padding-top: 5px;
+}
 
-.right-buttons {float:right; padding-right:20px; padding-top:5px;}
-
-
-
 /*
 *************************************************
 
 My Courses Pages
 ********************************************** */
 
 /* welcome user box */
+.welcome {
+	margin-bottom: 35px;
+	margin-top: 0px;
+	background-color: #33FFFF;
+	margin-left: 20px;
+	margin-right: 20px;
+}
 
+.float-left {
+	float: left;
+}
 
-.welcome {margin-bottom:35px; margin-top:0px; background-color:#33FFFF; margin-left:20px;margin-right:20px;}
+.float-right {
+	float: right;
+}
 
-.float-left {float:left;}
-
-.float-right {float:right;}
-
-
-
 /* layout for my-courses pages */
-
 .my-courses {
 	background: url('../images/css/diagonal_bg.gif') repeat;
 }
 
-
 #page-mycourses { /*whole layout of page*/
-	margin: 25px auto;
+	margin: 1px auto;
 	min-width: 707px;
-	max-width: 1024px;
+	max-width: 100%;
 	width: 100%;
 	background: url('../images/css/lams_logo.gif') no-repeat 5% -7px;
-
 }
 
 #page-mycourses #footer { /*layout of the footer - the bottom of the box */
 	width: 90%;
-	min-width:707px;
-	max-width:1024px;
-	margin-left:auto;
-	margin-right:auto;
+	min-width: 707px;
+	max-width: 100%;
+	margin-left: auto;
+	margin-right: auto;
 }
 
-#page-mycourses #footer p{ 
-	padding:20px 0px 0px 10px;
-	text-align:center;
-    font-family: verdana, arial, helvetica, sans-serif;
-	font-size:.9em;
-	color:#999;
+#page-mycourses #footer p {
+	padding: 20px 0px 0px 10px;
+	text-align: center;
+	font-family: arial, helvetica, sans-serif;
+	font-size: .9em;
+	color: #999;
 }
 
-
 #header-my-courses { /*layout of the header */
-	width:90%;
-	min-width:707px;
-	max-width:1024px;
-	margin-left:auto;
-	margin-right:auto;
-	margin-bottom:5px;
+	width: 90%;
+	min-width: 707px;
+	max-width: 100%;
+	margin-left: auto;
+	margin-right: auto;
+	margin-bottom: 5px;
 }
 
 /* my courses nav */
-
 .nav-box-right {
 	height: 31px;
 	width: auto;
@@ -1101,7 +1083,7 @@
 }
 
 #nav-right { /* layout of box that contains the main navigation */
-	margin-top:30px;
+	margin-top: 10px;
 	width: 100%;
 	height: 40px;
 }
@@ -1122,186 +1104,125 @@
 	color: #333;
 }
 
-
 /* my courses grey buttons in the green bar */
-
-.mycourses-left-buttons {float:left; padding-left:10px;}
-
-.mycourses-right-buttons {float:right; padding-right:20px;  margin-top:11px; height:24px; font-size:11px}
-
-#content-main a.sorting { border-bottom: none; cursor: pointer; }
-
-#content-main a.add-lesson-button {
-	background: url('../images/css/add_lesson.jpg') no-repeat 0px 0px;
-	color: #666;
-	padding: 5px 12px 6px 30px;
-	text-decoration: none;
-	border-right:1px solid #d2d2d2;
-	border-bottom: 0px;
-	margin-left:5px;
-	display: run-in;
+.mycourses-left-buttons {
+	float: left;
+	padding-left: 10px;
 }
 
-#content-main a.find-learners-button {
-	background: url('../images/css/find.png') no-repeat 0px 0px;
-	color: #666;
-	padding: 5px 12px 6px 30px;
-	text-decoration: none;
-	border-right:1px solid #d2d2d2;
-	border-bottom: 0px;
-	
-	margin-left:5px;
+.mycourses-right-buttons {
+	float: right;
+	padding-right: 20px;
+	height: 24px;
+	font-size: 11px
 }
 
-#content-main a:hover.add-lesson-button {
-	background: url('../images/css/add_lesson.jpg') no-repeat 0px 0px;
-	color: #47bc23;
-	padding: 5px 12px 6px 30px;
-	text-decoration: none;
-	margin-left:5px;
-	border-right:1px solid #d2d2d2;
-	border-bottom: 0px;
-	display: run-in;
+#content-main a.sorting {
+	border-bottom: none;
+	cursor: pointer;
 }
 
-#content-main a.manage-group-button {
-	background: url('../images/css/manage_groups.jpg') no-repeat 0px 0px;
-	color: #666;
-	padding: 5px 12px 6px 30px;
-	text-decoration: none;
-	border-right:1px solid #d2d2d2;
-	border-bottom: 0px;
-}
-
-#content-main a:hover.manage-group-button {
-	background: url('../images/css/manage_groups_over.jpg') no-repeat 0px 0px;
-	color: #47bc23;
-	padding: 5px 12px 6px 30px;
-	text-decoration: none;
-	
-	border-right:1px solid #d2d2d2;
-	border-bottom: 0px;
-}
-
-#content-main a.show-all-groups-button {
-	background: url('../images/css/show_all_groups.jpg') no-repeat 0px 0px;
-	color: #666;
-	padding: 5px 12px 6px 16px;
-	text-decoration: none;
-	border-right:1px solid #d2d2d2;
-	border-bottom: 0px;
-}
-
-#content-main a:hover.show-all-groups-button {
-	background: url('../images/css/show_all_groups.jpg') no-repeat 0px 0px;
-	color: #47bc23;
-	padding: 5px 12px 6px 16px;
-	text-decoration: none;
-	text-align:left;
-	border-right:1px solid #d2d2d2;
-	border-bottom: 0px;
-}
-
 /* my courses individual course boxes */
-
-.course-bg {  /*---- box around the green tabbed items -- */
-	margin-top:15px;
-	margin-bottom:20px;
-	width:100%;
-	background:#fff url('../images/css/mycourses_greentab-minimal.jpg') repeat-x top; 
-	margin-left:0px;
+.course-bg { /*---- box around the green tabbed items -- */
+	margin-top: 15px;
+	margin-bottom: 20px;
+	width: 100%;
+	background: #fff url('../images/css/mycourses_greentab-minimal.jpg') repeat-x top;
+	margin-left: 0px;
 }
 
 .course-bg h2 {
-	font-size:13px;
-	color:#47bc23;
-	padding-left:0px;
-	margin-top:12px;
-	margin-left:0px;
+	font-size: 13px;
+	color: #47bc23;
+	padding-left: 0px;
+	margin-top: 12px;
+	margin-left: 0px;
 }
 
 .course-bg h4 {
-	font-size:12px;
-	color:#47bc23;
-	padding-left:0px
+	font-size: 12px;
+	color: #47bc23;
+	padding-left: 0px
 }
 
 .course-buttons {
-	margin-right:0px;
+	margin-right: 0px;
 }
 
 /************ The sequence name box **********/
 .sequence-name {
-	margin-top:5px;
-	margin-left:10px;
-    margin-right:10px;
-	
+	margin-top: 5px;
+	margin-left: 10px;
+	margin-right: 10px;
+	clear: both;
 }
 
-.sequence-name p{
-	margin:0px;
-	
+.sequence-name p {
+	margin: 0px;
 }
 
-
 #content-main a.sequence-name-link {
-	color:#0087E5;
+	color: #0087E5;
 	text-decoration: none;
 	border-bottom: 1px dotted #0087E5;
-	}
-	
-	
+}
+
 #content-main a:hover.sequence-name-link {
-	color:#0087E5;
+	color: #0087E5;
 	text-decoration: none;
 	border-bottom: 1px solid #0087E5;
-	
 }
 
 #content-main a.sequence-action-link {
-	color:#47bc23;
+	color: #47bc23;
 	text-decoration: none;
-	border:0px;
-	font-variant:small-caps;
-	margin-left:20px;	
+	border: 0px;
+	font-variant: small-caps;
+	margin-left: 20px;
 }
 
 #content-main a:hover.sequence-action-link {
-	color:#47bc23;
+	color: #47bc23;
 	text-decoration: none;
-	border-bottom:0px;
-	font-variant:small-caps;
-	margin-left:20px;
+	border-bottom: 0px;
+	font-variant: small-caps;
+	margin-left: 20px;
 }
 
 /************ The group name box **********/
-
 .group-name {
-margin-top:5px;
-margin-left:80px;
+	margin-top: 25px;
+	margin-left: 80px;
 }
 
 .group-name p {
-padding-top:0px;
-margin-bottom:0px;
-padding-left:0px;
-margin-left:0px;
+	padding-top: 0px;
+	margin-bottom: 0px;
+	padding-left: 0px;
+	margin-left: 0px;
 }
 
 .group-name strong {
-color: #666;
+	color: #666;
 }
 
 /*aligns the image in the middle of the line - gives padding */
 .align-middle {
-vertical-align:middle;
-padding-right:0px;
-border:0px;
+	vertical-align: middle;
+	padding-right: 0px;
+	border: 0px;
 }
 
-.help {text-align:right; margin-right:35px; cursor: pointer;}
+.help {
+	text-align: right;
+	margin-right: 35px;
+	cursor: pointer;
+}
 
-.help-no-tabs {float:right; cursor:pointer;}
+.help-no-tabs {
+	float: right;
+	cursor: pointer;
+}
 
 /************ My Profile custom **********/
 .align-right {
@@ -1312,10 +1233,6 @@
 	text-align: left;
 }
 
-.align-center {
-	text-align: center;
-}
-
 .shading-bg {
 	padding: 5px;
 	padding-left: 10px;
@@ -1332,97 +1249,224 @@
 	border: 1px solid #dcdcdc;
 }
 
-.userpage-td {border-left:1px solid #ccc;}
+.userpage-td {
+	border-left: 1px solid #ccc;
+}
 
+.j-single-lesson {
+	list-style: none;
+	margin: 6px;
+	padding: 6px 9px;
+	position: relative;
+	/* CSS3 text shadow and rounded corners: */
+	text-shadow: 1px 1px 0 white;
+}
 
-.user-img {background: url('../images/css/user.png') no-repeat 0 3px; margin-right:5px; padding:5px 0px 5px 25px; 
+.j-single-lesson:hover {
+	border-color: #9be0f9;
+	background-color: #F0F8FF;
+	display: block;
+	/* CSS3 glow effect: */
+	-moz-border-radius: 6px;
+	-webkit-border-radius: 6px;
+	border-radius: 6px;
+	-moz-box-shadow: 0 0 5px #A6E5FD;
+	-webkit-box-shadow: 0 0 5px #A6E5FD;
+	box-shadow: 0 0 5px #A6E5FD;
 }
 
-.mycourses-monitor-img {background: url('../images/css/mycourses_monitor.png') no-repeat 0 3px; margin-right:5px; padding:5px 0px 5px 25px; 
+.lesson-table {
+	margin: 0 auto;
+	width: 100%;
 }
 
-.mycourses-mark-img {background: url('../images/css/mark.png') no-repeat 0 3px; margin-right:5px; padding:5px 0px 5px 25px; 
+.subgroup-lesson-table {
+	padding-top: 30px;
 }
 
-.mycourses-addlesson-img {background: url('../images/css/mycourses_addlesson.png') no-repeat 0 3px; margin-right:5px; padding:5px 0px 5px 25px;
+.lesson-actions {
+	float: right;
+	opacity: 0.1;
+	filter: alpha(opacity = 10); /* msie */
 }
 
-.mycourses-stop-img {background: url('../images/css/lesson_disabled.png') no-repeat 0 3px; margin-right:5px; padding:5px 0px 5px 25px; 
+.j-single-lesson:hover .lesson-actions {
+	opacity: 1;
+	filter: alpha(opacity = 100); /* msie */
+	display: block;
 }
 
-.mycourses-completed-img {background: url('../images/css/lesson_completed.png') no-repeat 0 3px;  margin-right:5px; padding:5px 0px 5px 25px; 
+.j-single-lesson:hover .mycourses-monitor-img {
+	background: url('../images/css/mycourses_monitor.png') no-repeat 0 0px;
 }
 
-.mycourses-notifications-img {background: url('../images/css/notifications_go.png') no-repeat 0 3px;  margin-right:5px; padding:5px 0px 5px 25px;
+.j-single-lesson:hover .mycourses-mark-img {
+	background: url('../images/css/mark.png') no-repeat 0 0px;
 }
 
-.mycourses-conditions-img {background: url('../images/css/conditions.png') no-repeat 0 3px; margin-right:5px; padding:5px 0px 5px 25px; 
+.j-single-lesson:hover .mycourses-notifications-img {
+	background: url('../images/css/notifications_go.png') no-repeat 0 0px;
 }
 
-.mycourses-removelesson-img {background: url('../images/css/delete.png') no-repeat 0 3px; margin-right:5px; padding:5px 0px 5px 25px; 
+.j-single-lesson:hover .mycourses-conditions-img {
+	background: url('../images/css/conditions.png') no-repeat 0 0px;
 }
 
+.j-single-lesson:hover .mycourses-removelesson-img {
+	background: url('../images/css/delete.png') no-repeat 0 0px;
+}
+
+.j-single-lesson:hover .mycourses-move-img {
+	background: url('../images/css/arrow_move.png') no-repeat 0 0px;
+}
+
+.mycourses-div {
+	width: 20px;
+	height: 18px;
+	padding-right: 5px;
+	float: right;
+	cursor: pointer;
+}
+
+.mycourses-span {
+	margin: 0 0 0 15px;
+	padding: 3px 0 3px 40px;
+	cursor: default;
+}
+
+.mycourses-stop-img {
+	background: url('../images/css/lesson_disabled.png') no-repeat 0 3px;
+}
+
+.mycourses-completed-img {
+	background: url('../images/css/lesson_completed.png') no-repeat 0 3px;
+}
+
+.mycourses-monitor-img {
+	background: url('../images/css/mycourses_monitor_bw.png') no-repeat 0 0px;
+}
+
+.mycourses-mark-img {
+	background: url('../images/css/mark_bw.png') no-repeat 0 0;
+}
+
+.mycourses-notifications-img {
+	background: url('../images/css/notifications_go_bw.png') no-repeat 0 0;
+}
+
+.mycourses-conditions-img {
+	background: url('../images/css/conditions_bw.png') no-repeat 0 0;
+}
+
+.mycourses-removelesson-img {
+	background: url('../images/css/delete_bw.png') no-repeat 0 0;
+}
+
+.mycourses-move-img {
+	background: url('../images/css/arrow_move.png') no-repeat 0 0;
+}
+
+.lesson-action-label {
+	display: none;
+	color: #999;
+}
+
+.mycourses-div:hover .lesson-action-label {
+	position:relative;
+	top: -18px;
+	left: -8px;
+	display: inline;
+}
+
 /* Date and time restriction area in monitor */
-#restrictUsageDiv {font-size: 13px; padding-bottom: 10px; padding-left: 18px; padding-top: -5px;}
-#restrictUsageDiv :first-child {padding-bottom: 10px; padding-top: -5px;}
-#datetime {padding-left: 7px; margin-right: 20px;}
-#dateInfo {padding-left: 7px;}
-#dateInfoDiv a {margin-left:10px;}
+#restrictUsageDiv {
+	font-size: 13px;
+	padding-bottom: 10px;
+	padding-left: 18px;
+	padding-top: -5px;
+}
 
+#restrictUsageDiv :first-child {
+	padding-bottom: 10px;
+	padding-top: -5px;
+}
+
+#datetime {
+	padding-left: 7px;
+	margin-right: 20px;
+}
+
+#dateInfo {
+	padding-left: 7px;
+}
+
+#dateInfoDiv a {
+	margin-left: 10px;
+}
+
 /* Growl functionality, jquery.blockUI (version: 2.38) */
-div.growlUI { background: url(../images/css/check48.png) no-repeat 10px 10px }
-div.growlUI h1, div.growlUI h2 { color: white; padding: 5px 5px 5px 75px; text-align: left }
-div.growlUI h1 { font-size: medium }
+div.growlUI {
+	background: url(../images/css/check48.png) no-repeat 10px 10px
+}
 
-/*IE style workarounds */
+div.growlUI h1,div.growlUI h2 {
+	color: white;
+	padding: 5px 5px 5px 75px;
+	text-align: left
+}
 
+div.growlUI h1 {
+	font-size: medium
+}
+
+/*IE style workarounds */
 * html  #content {
-	background-color:#fff;
+	background-color: #fff;
 	font-size: 11px;
-	border:1px solid #d4d8da;
+	border: 1px solid #d4d8da;
 	margin-top: -16px;
-	margin-left:auto;
-	margin-right:auto;
-	margin-bottom:10px;
-	width:90%; 
-	height:100%; 
-	padding-bottom:5px;
-	min-width:707px;
-	max-width:1024px;
-	position:relative;
+	margin-left: auto;
+	margin-right: auto;
+	margin-bottom: 10px;
+	width: 90%;
+	height: 100%;
+	padding-bottom: 5px;
+	min-width: 707px;
+	max-width: 100%;
+	position: relative;
 }
 
 * html #content-main { /*box around the main content area */
-	background-color:#fff;
+	background-color: #fff;
 	font-size: 11px;
-	border:1px solid #d4d8da;
+	border: 1px solid #d4d8da;
 	margin-top: -15px;
-	margin-left:auto;
-	margin-right:auto;
-	margin-bottom:-5px;
-	width:90%; 
-	height:100%; 
-	padding-bottom:-5px;
-	min-width:707px;
-	max-width:1024px;
+	margin-left: auto;
+	margin-right: auto;
+	margin-bottom: -5px;
+	width: 90%;
+	height: 100%;
+	padding-bottom: -5px;
+	min-width: 707px;
+	max-width: 100%;
 }
 
 * html  #header { /*layout of the header */
-	width:90%;
-	min-width:707px;
-	max-width:1024px;
-	margin-left:auto;
-	margin-right:auto;
-	margin-bottom:5px;
+	width: 90%;
+	min-width: 707px;
+	max-width: 100%;
+	margin-left: auto;
+	margin-right: auto;
+	margin-bottom: 5px;
 }
-	
+
 * html  #header-my-courses { /*layout of the header */
-	width:90%;
-	min-width:707px;
-	max-width:1024px;
-	margin-left:auto;
-	margin-right:auto;
-	margin-bottom:5px;
+	width: 90%;
+	min-width: 707px;
+	max-width: 100%;
+	margin-left: auto;
+	margin-right: auto;
+	margin-bottom: 5px;
 }
 
 * html  .nav-box-right {
@@ -1446,73 +1490,77 @@
 }
 
 * html  #nav-right { /* layout of box that contains the main navigation */
-	margin-top:15px;
+	margin-top: 15px;
 	width: auto;
 	height: 40px;
 	margin-right: 1px;
 }
 
-* html  .mycourses-right-buttons {float:right; height:24px; padding-top:5px; padding-bottom:5px; margin-top:4px;}
+* html .mycourses-right-buttons {
+	float: right;
+	height: 24px;
+	padding-top: 5px;
+	padding-bottom: 5px;
+	margin-top: 4px;
+}
 
-* html  #content-main a.add-lesson-button {
-	background: url ('../images/css/add_lesson.jpg') no-repeat 0px 0px;
-	color: #666;
-	border: 0px none;
-	padding: 5px 12px 6px 30px;
-	text-decoration: none;
-	border-right:1px solid #d2d2d2;
-	margin-left:5px;
-	display: run-in;
+#content-main .add-lesson-button {
+	background: url('../images/icons/page_add.png') no-repeat 0 0;
+	padding-left: 25px;
+	padding-bottom: 2px;
 }
 
-* html  #content-main a:hover.add-lesson-button {
-	background: url ('../images/css/add_lesson.jpg') no-repeat 0px 0px;
-	color: #47bc23;
-	border: 0px none;
-	padding: 5px 12px 6px 30px;
-	text-decoration: none;
-	margin-top:0px;
-	margin-left:5px;
-	border-right:1px solid #d2d2d2;
-	display: run-in;
+#content-main .manage-group-button {
+	background: url('../images/icons/wrench.png') no-repeat 0 0;
+	padding-left: 25px;
+	padding-bottom: 2px;
 }
 
-* html  #content-main a.manage-group-button {
-	background: url ('../images/css/manage_groups.jpg') no-repeat 0px 0px;
-	color: #666;
-	border: 0px none;
-	padding: 5px 12px 6px 30px;
-	text-decoration: none;
-	border-right:1px solid #d2d2d2;
-	margin-top:6px;
-	margin-left:10px;
+#content-main .my-grades-button {
+	background: url('../images/icons/book_edit.png') no-repeat 0 0;
+	padding-left: 25px;
+	padding-bottom: 2px;
 }
 
-* html  #content-main a:hover.manage-group-button {
-	background: url ('../images/css/manage_groups.jpg') no-repeat 0px 0px;
-	color: #47bc23;
-	border: 0px none;
-	padding: 5px 12px 6px 30px;
-	text-decoration: none;
-	margin-top:0px;
-	margin-left:10px;
-	border-right:1px solid #d2d2d2;
+#content-main .more-actions-button {
+	background: url('../images/icons/cog.png') no-repeat 0 0;
+	padding-left: 25px;
+	padding-bottom: 2px;
 }
-	
-* html  .right-buttons {float:right; padding-top:5px; padding-bottom:5px; margin-bottom:20px;}
 
-* html  .space-bottom {
+#content-main .course-gradebook-button {
+	background: url('../images/icons/book_edit.png') no-repeat 0 3px;
+	padding-left: 25px;
+}
+
+#content-main .search-lesson {
+	background: url('../images/icons/magnifier.png') no-repeat 0 3px;
+	padding-left: 25px;
+}
+
+#content-main .course-notifications {
+	background: url('../images/icons/email_go.png') no-repeat 0 3px;
+	padding-left: 25px;
+}
+
+* html .right-buttons {
+	float: right;
+	padding-top: 5px;
+	padding-bottom: 5px;
+	margin-bottom: 20px;
+}
+
+* html .space-bottom {
 	margin-bottom: 40px;
-	
 }
 
 * html #nav-right { /* layout of box that contains the main navigation */
-	margin-top:30px;
+	margin-top: 30px;
 	width: 100%;
 	height: 40px;
-	position:relative;
-	z-index:2;
-	margin-right:-1px;
+	position: relative;
+	z-index: 2;
+	margin-right: -1px;
 }
 
 * html #page-mycourses { /*whole layout of page*/
@@ -1522,24 +1570,22 @@
 }
 
 /*IE 7 workarounds */
-
 *:first-child+html #content {
-	background-color:#fff;
+	background-color: #fff;
 	font-size: 11px;
-	border:1px solid #d4d8da;
+	border: 1px solid #d4d8da;
 	margin-top: 53px;
-	margin-left:auto;
-	margin-right:auto;
-	margin-bottom:10px;
-	width:90%; 
-	height:100%; 
-	padding-bottom:15px;
-	min-width:707px;
-	max-width:1024px;
-	position:relative;
+	margin-left: auto;
+	margin-right: auto;
+	margin-bottom: 10px;
+	width: 90%;
+	height: 100%;
+	padding-bottom: 15px;
+	min-width: 707px;
+	max-width: 100%;
+	position: relative;
 }
 
-
 *:first-child+html .nav-box-right {
 	height: 0px;
 	width: auto;
@@ -1549,30 +1595,38 @@
 	text-align: center;
 }
 
-*:first-child+html .mycourses-right-buttons {float:right; padding-right:20px;  margin-top:0px; height:24px; font-size:11px; padding-top:10px; padding-bottom:10px;}
+*:first-child+html .mycourses-right-buttons {
+	float: right;
+	padding-right: 20px;
+	margin-top: 0px;
+	height: 24px;
+	font-size: 11px;
+	padding-top: 10px;
+	padding-bottom: 10px;
+}
 
 *:first-child+html  #header { /*layout of the header */
-	width:90%;
-	min-width:707px;
-	margin-left:auto;
-	margin-right:auto;
-	margin-bottom:-25px;
+	width: 90%;
+	min-width: 707px;
+	margin-left: auto;
+	margin-right: auto;
+	margin-bottom: -25px;
 }
-	
+
 *:first-child+html  #header-my-courses { /*layout of the header */
-	width:90%;
-	min-width:707px;
-	margin-left:auto;
-	margin-right:auto;
-	margin-bottom:-25px;
+	width: 90%;
+	min-width: 707px;
+	margin-left: auto;
+	margin-right: auto;
+	margin-bottom: -25px;
 }
 
 *:first-child+html #nav-right { /* layout of box that contains the main navigation */
-	margin-top:30px;
+	margin-top: 30px;
 	width: 100%;
 	height: 40px;
-	position:relative;
-	z-index:2;
+	position: relative;
+	z-index: 2;
 }
 
 *:first-child+html .nav-box-right {
@@ -1584,197 +1638,18 @@
 	text-align: center;
 }
 
-
-
-/* Index Page more actions drop down menu */
-ul.more-actions-list {
-	background: white;
-	position: absolute; 
-	z-index: 99; 
-	display: none;
-	margin: 0px;
-	padding: 2px;
-	border:thin solid gray;
+.split-ui-button+ul {
+	z-index: 1;
 }
 
-ul.more-actions-list li {
-	padding: 6px;
-	font-size: 10px;
-	margin: 0px;
-	list-style: none;
+.split-ui-button+ul li {
+	list-style-type: none;
 }
 
-#content-main a.more-actions-button {
-	background: url('../images/css/more_options.png') no-repeat 0px 0px;
-	color: #666;
-	padding: 5px 12px 6px 30px;
-	text-decoration: none;
-	border-right:1px solid #d2d2d2;
-	border-bottom: 0px;
-	display: run-in;
+.split-ui-button+ul li a {
+	border: none;
 }
 
-#content-main a:hover.more-actions-button {
-        background: url('../images/css/more_options.png') no-repeat 0px 0px;
-        color: #47bc23;
-	padding: 5px 12px 6px 30px;
-        text-decoration: none;
-        border-right:1px solid #d2d2d2;
-        border-bottom: 0px;
-	display: run-in;
-}
-
-#content-main a.my-grades-button {
-	background: url('../images/css/my-grades.png') no-repeat 0px 0px;
-	color: #666;
-	padding: 5px 12px 6px 30px;
-	text-decoration: none;
-	border-right:1px solid #d2d2d2;
-	border-bottom: 0px;
-	display: run-in;
-}
-
-#content-main a:hover.my-grades-button {
-        background: url('../images/css/my-grades.png') no-repeat 0px 0px;
-        color: #47bc23;
-	padding: 5px 12px 6px 30px;
-        text-decoration: none;
-        border-right:1px solid #d2d2d2;
-        border-bottom: 0px;
-	display: run-in;
-}
-
-#content-main a.course-gradebook-button {
-	background: url('../images/css/course_gradebook.png') no-repeat 0px 0px;
-	color: #666;
-	padding: 5px 12px 6px 30px;
-	text-decoration: none;
-	border-right:1px solid #d2d2d2;
-	border-bottom: 0px;
-	display: run-in;
-}
-
-#content-main a:hover.course-gradebook-button {
-        background: url('../images/css/course_gradebook.png') no-repeat 0px 0px;
-        color: #47bc23;
-	padding: 5px 12px 6px 30px;
-        text-decoration: none;
-        border-right:1px solid #d2d2d2;
-        border-bottom: 0px;
-	display: run-in;
-}
-
-#content-main a.search-lesson {
-	background: url('../images/css/search_lesson.png') no-repeat 0px 0px;
-	color: #666;
-	padding: 5px 12px 6px 30px;
-	text-decoration: none;
-	border-right:1px solid #d2d2d2;
-	border-bottom: 0px;
-	display: run-in;
-}
-
-#content-main a:hover.search-lesson {
-	background: url('../images/css/search_lesson.png') no-repeat 0px 0px;
-        color: #47bc23;
-        padding: 5px 12px 6px 30px;
-        text-decoration: none;
-        border-right:1px solid #d2d2d2;
-        border-bottom: 0px;
-}
-
-#content-main a.course-notifications {
-	background: url('../images/css/course-notifications.png') no-repeat 0px 0px;
-	color: #666;
-	padding: 5px 12px 6px 30px;
-	text-decoration: none;
-	border-right:1px solid #d2d2d2;
-	border-bottom: 0px;
-	display: run-in;
-}
-
-#content-main a:hover.course-notifications {
-	background: url('../images/css/course-notifications.png') no-repeat 0px 0px;
-        color: #47bc23;
-        padding: 5px 12px 6px 30px;
-        text-decoration: none;
-        border-right:1px solid #d2d2d2;
-        border-bottom: 0px;
-}
-
-/* LDEV-2820 button-dropdown */
-.j-single-lesson {
-    padding-left:3px;
-    padding-right:3px;
-    height:30px; 
-}
-
-.j-single-lesson:hover { background: #F0F8FF; }
-
-.lesson-table {
-    border: 0px;
-    border-spacing:  0px;
-    table-layout: auto;
-    clear: both;
-}
-.td-lesson {
-    padding: 2px;
-}
-.em-menu-button {
-    border: none;
-}
-
-.split-menu-button {
-	}
-	.split-menu-button ul {
-		}
-		.split-menu-button ul li {
-			position: relative;
-            list-style-type: none;
-			}
-			.split-menu-button ul li:hover {
-            /*    background-color: #e6e6e6; */
-			}
-			.split-menu-button ul li a {
-                border-bottom: none;
-				display: block;
-				float: left;
-				position: relative;
-				color: #808080;
-				text-decoration: none;
-                border: 1px solid #ccc;
-                background-color: #F5F5F5;
-			}
-				.split-menu-button ul li a:hover, #zone-bar ul li a.zoneCur {
-                     background-color: #e6e6e6;
-				}
-			.split-menu-button ul li ul {
-				display: none;
-				position: absolute;
-				margin-top: 22px;
-				left: -25px;
-				border: 1px solid #ccc;
-				background-color: #FFFFFF;
-				z-index: 1;
-				}
-				.split-menu-button ul li ul li {
-					float: none;
-					padding-top: 3px; 
-                    margin: 0;
-				}
-				.split-menu-button ul li ul li:hover {
-					background: #e6e6e6;
-					}
-					.split-menu-button ul li ul li a {
-						display: block;
-						float: none;
-						margin-left: 5px;
-						width: 170px;
-                        border: 0px;
-                        background-color: #FFFFFF;
-					}
-					.split-menu-button ul li ul li a:hover {
-						/* background: #d9f0b7; */
-					}
-}
-/* end LDEV-2820 */
+.split-ui-button div:first-child {
+	margin-right: -0.4em;
+}
\ No newline at end of file
Index: lams_central/web/css/defaultHTML_learner.css
===================================================================
diff -u -rd88538c41fd833c61210bfbd9318925fc22ab106 -rdc7b67e7677c8cd2289130c67094a62b39177d05
--- lams_central/web/css/defaultHTML_learner.css	(.../defaultHTML_learner.css)	(revision d88538c41fd833c61210bfbd9318925fc22ab106)
+++ lams_central/web/css/defaultHTML_learner.css	(.../defaultHTML_learner.css)	(revision dc7b67e7677c8cd2289130c67094a62b39177d05)
@@ -581,4 +581,4 @@
 }
 .align-left{
 text-align:left;
-}
+}
\ No newline at end of file
Index: lams_central/web/css/defaultMainHTML.css
===================================================================
diff -u -rc596693ba33aa285ce587e35b0de17ba4d873c80 -rdc7b67e7677c8cd2289130c67094a62b39177d05
--- lams_central/web/css/defaultMainHTML.css	(.../defaultMainHTML.css)	(revision c596693ba33aa285ce587e35b0de17ba4d873c80)
+++ lams_central/web/css/defaultMainHTML.css	(.../defaultMainHTML.css)	(revision dc7b67e7677c8cd2289130c67094a62b39177d05)
@@ -138,7 +138,7 @@
 #header { /*layout of the header */
 	width: 90%;
 	min-width:707px;
-	max-width:1024px;
+	max-width:1366px;
 	margin-left:auto;
 	margin-right:auto;
 	margin-bottom:5px;
@@ -150,7 +150,7 @@
 	margin-left:auto;
 	margin-right:auto;
 	min-width:707px;
-	max-width:1024px;
+	max-width:1366px;
 	height:40px; 
 	background:url('../images/css/top_bg.jpg') no-repeat bottom;
 }
@@ -309,7 +309,7 @@
 	height:100%; 
 	padding-bottom:-5px;
 	min-width:707px;
-	max-width:1024px;
+	max-width:1366px;
 }
 
 /*layout of Links within the content area */
@@ -644,7 +644,7 @@
 #page-mycourses { /*whole layout of page*/
 	margin: 25px auto;
 	min-width: 707px;
-	max-width: 1024px;
+	max-width: 1366px;
 	width: 100%;
 	background: url('../images/css/lams_logo.gif') no-repeat 5% -7px;
 
@@ -653,7 +653,7 @@
 #page-mycourses #footer { /*layout of the footer - the bottom of the box */
 	width: 90%;
 	min-width:707px;
-	max-width:1024px;
+	max-width:1366px;
 	margin-left:auto;
 	margin-right:auto;
 }
@@ -670,7 +670,7 @@
 #header-my-courses { /*layout of the header */
 	width:90%;
 	min-width:707px;
-	max-width:1024px;
+	max-width:1366px;
 	margin-left:auto;
 	margin-right:auto;
 	margin-bottom:5px;
@@ -955,7 +955,7 @@
 * html  #header { /*layout of the header */
 	width:90%;
 	min-width:707px;
-	max-width:1024px;
+	max-width:1366px;
 	margin-left:auto;
 	margin-right:auto;
 	margin-bottom:5px;
@@ -964,7 +964,7 @@
 * html  #header-my-courses { /*layout of the header */
 	width:90%;
 	min-width:707px;
-	max-width:1024px;
+	max-width:1366px;
 	margin-left:auto;
 	margin-right:auto;
 	margin-bottom:5px;
@@ -1047,7 +1047,7 @@
 	height:100%; 
 	padding-bottom:-5px;
 	min-width:707px;
-	max-width:1024px;
+	max-width:1366px;
 	position:relative;
 	z-index:1;
 	}
Index: lams_central/web/css/index.css
===================================================================
diff -u -raf5130ddec364ee2a42e8856d6e66f2650563f7a -rdc7b67e7677c8cd2289130c67094a62b39177d05
--- lams_central/web/css/index.css	(.../index.css)	(revision af5130ddec364ee2a42e8856d6e66f2650563f7a)
+++ lams_central/web/css/index.css	(.../index.css)	(revision dc7b67e7677c8cd2289130c67094a62b39177d05)
@@ -15,6 +15,7 @@
 
 .linksCell {
 	padding: 0 0 10px 0;
+	vertical-align: top;
 }
 
 .linksCell div {
@@ -49,6 +50,7 @@
 #orgTabs li.orgTabsHeader {
 	width: 150px;
 	white-space: normal;
+	word-break: break-all;
 }
 
 #orgTabsPanelCell {
Index: lams_central/web/group.jsp
===================================================================
diff -u -r07578aaa7f526c0c1b537c127cf5f88e0410d472 -rdc7b67e7677c8cd2289130c67094a62b39177d05
--- lams_central/web/group.jsp	(.../group.jsp)	(revision 07578aaa7f526c0c1b537c127cf5f88e0410d472)
+++ lams_central/web/group.jsp	(.../group.jsp)	(revision dc7b67e7677c8cd2289130c67094a62b39177d05)
@@ -1,5 +1,45 @@
 <%@ page contentType="text/html; charset=utf-8" language="java"%>
+
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
-<c:import url="groupHeader.jsp"/>
-<c:import url="groupContents.jsp"/>
\ No newline at end of file
+<!-- Group header -->
+<c:if test="${orgBean.allowSorting}">
+	<div class="mycourses-left-buttons">
+		<a class="sorting" href="#" onClick="javascript:makeOrgSortable(${orgBean.id})" title="<fmt:message key="label.enable.lesson.sorting"/>">
+			<img src="<lams:LAMSURL/>images/sorting_disabled.gif"> </a>
+	</div>
+</c:if>
+
+<c:set var="org" value="${orgBean}" />
+<%@ include file="groupHeader.jsp"%>
+
+
+<!-- Group contents -->
+<div class="j-course-contents">
+	<div class="sequence-name">
+		<div id="${orgBean.id}-lessons" class="lesson-table">
+			<%@ include file="groupContents.jsp"%>
+		</div>
+	</div>
+	
+	<!-- Child organisations -->
+	<c:forEach var="childOrg" items="${orgBean.childIndexOrgBeans}">
+		<div class="group-name">
+			<div class="child-org-name">
+				<c:out value="${childOrg.name}" />
+				<c:if test="${not empty childOrg.archivedDate}">
+					<small>(<fmt:message key="label.archived"/> <lams:Date value="${childOrg.archivedDate}"/>)</small>
+				</c:if>
+			</div>
+			
+			<c:set var="org" value="${childOrg}" />
+			<%@ include file="groupHeader.jsp"%>
+			
+			<div id="${childOrg.id}-lessons" class="lesson-table subgroup-lesson-table">
+				<%@ include file="groupContents.jsp"%>
+			</div>
+		</div>
+	</c:forEach>
+</div>
\ No newline at end of file
Index: lams_central/web/groupContents.jsp
===================================================================
diff -u -r4f284603a74199f14d9eb0d5e1cc04b89755ba31 -rdc7b67e7677c8cd2289130c67094a62b39177d05
--- lams_central/web/groupContents.jsp	(.../groupContents.jsp)	(revision 4f284603a74199f14d9eb0d5e1cc04b89755ba31)
+++ lams_central/web/groupContents.jsp	(.../groupContents.jsp)	(revision dc7b67e7677c8cd2289130c67094a62b39177d05)
@@ -1,202 +1,47 @@
 <%@ page contentType="text/html; charset=utf-8" language="java"%>
+
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-lams" prefix="lams"%>
 
-<c:set var="hasLessonToSort">false</c:set>
-
-<div class="j-course-contents">
-		
-	<div class="sequence-name">
-		<div id="<c:out value="${orgBean.id}"/>-lessons" class="j-lessons">
-		<c:if test="${allowSorting}">
-			<div id="sorter-div-${orgBean.id}" class="mycourses-right-buttons" style="display:none;">
-				<a class="sorting" onclick="makeOrgSortable(<c:out value="${orgBean.id}"/>)" title="<fmt:message key="label.enable.lesson.sorting"/>">
-					<img src="<lams:LAMSURL/>/images/sorting_disabled.gif">
+<c:forEach var="lesson" items="${org.lessons}">
+	<div id="${lesson.id}" class="j-single-lesson">
+		<c:choose>
+			<c:when test="${empty lesson.url}">
+				<a class="disabled-sequence-name-link"> <c:out value="${lesson.name}" />
 				</a>
-			</div>
+			</c:when>
+			<c:otherwise>
+				<a href="<c:out value="${lesson.url}"/>" class="sequence-name-link"> <c:out value="${lesson.name}" />
+				</a>
+			</c:otherwise>
+		</c:choose>
+		<c:if test="${lesson.state eq 4}">
+			<span class="mycourses-stop-img mycourses-span" title="<fmt:message key="label.disabled"/>">&nbsp;</span>
 		</c:if>
-		<table class="lesson-table">
-			<c:forEach var="lesson" items="${orgBean.lessons}">
-				<c:set var="hasLessonToSort">true</c:set>
-			<tr id="<c:out value="${lesson.id}"/>" class="j-single-lesson">
-					<td class="td-lesson" style="width: 25px;">
-					<c:if test="${lesson.completed}"> <span class="mycourses-completed-img" title="<fmt:message key="label.completed"/>" >&nbsp;</span> </c:if>
-                    </td>
-					<td class="td-lesson" style="word-wrap: break-word;">
-						<c:choose>
-							<c:when test="${empty lesson.url}">
-								<a class="disabled-sequence-name-link"> <c:out value="${lesson.name}" /></a> 
-							</c:when>
-							<c:otherwise>
-								<a href="<c:out value="${lesson.url}"/>" class="sequence-name-link"> <c:out value="${lesson.name}" /></a> 
-							</c:otherwise>
-						</c:choose>
-                        </td>
-					<td class="td-lesson" style="width: 150px;">
-						<c:if test="${lesson.state eq 4}"> <span class="mycourses-stop-img" title="<fmt:message key="label.disabled"/>" >&nbsp;</span> </c:if>
-						<c:if test="${lesson.state eq 6}"> <span class="mycourses-stop-img" title="<fmt:message key="label.archived"/>" >&nbsp;</span> </c:if>
-						<c:if test="${lesson.dependent or lesson.scheduledFinish}"> <span class="mycourses-conditions-img" title="<fmt:message key="index.conditions.flag.tooltip"/>" >&nbsp;</span> </c:if>
-					</td>
-					<c:choose>
-						<c:when test="${empty lesson.links}">
-							<td class="td-lesson" style="width: 220px;"></td>
-						</c:when>
-						<c:otherwise>
-							<td class="split-menu-button" style="width: 220px;">
-								<ul>
-									<li>
-										<c:forEach var="lessonlink" items="${lesson.links}" varStatus="status">
-											<c:set var="tooltip" value="" />
-											<c:if test="${lessonlink.tooltip ne null}">
-												<c:set var="tooltip">
-													<fmt:message key="${lessonlink.tooltip}" />
-												</c:set>
-											</c:if>
-											
-											<c:choose>
-												<c:when test="${status.first}">
-													<a href="#nogo" class="${lessonlink.style}">
-						                        		<span onclick="<c:out value='${lessonlink.url}'/>" title="${tooltip}" 
-						                        		class="${lessonlink.spanStyle}" style="margin-right:0px">
-						                        			<fmt:message key="${lessonlink.name}" /> &nbsp;
-						                        		</span>
-														<em class="em-menu-button">
-															<img src="<lams:LAMSURL/>/images/icons/bullet_arrow_down.png" alt="dropdown" style="border-style: none;">
-														</em>
-													</a>
-													<ul class="button-menu">
-												</c:when>
-												<c:otherwise>
-													<li>
-														<a href="<c:out value='${lessonlink.url}'/>" class="${lessonlink.style}">
-															<span class="${lessonlink.spanStyle}" title="${tooltip}"><fmt:message key="${lessonlink.name}" /> &nbsp;</span>
-														</a>
-													</li>
-													<c:if test="${status.last}">
-														</ul>
-													</c:if>
-												</c:otherwise>
-											</c:choose>
-										</c:forEach>
-									</li>
-								</ul>
-			        		</td>
-						</c:otherwise>
-					</c:choose>
-				</tr>
-			</c:forEach>
-		</table>
-		</div>
-	</div>
-		
-	<c:forEach var="childOrg" items="${orgBean.childIndexOrgBeans}">
-	<div class="group-name">
-		<p>
-			<c:out value="${childOrg.name}" />
-			<c:if test="${not empty childOrg.archivedDate}">
-				<small>(<fmt:message key="label.archived"/> <lams:Date value="${childOrg.archivedDate}"/>)</small>
-			</c:if>
-			<c:forEach var="childlink" items="${childOrg.links}">
-				<a href="<c:out value='${childlink.url}'/>" class="sequence-action-link"> 
-					<span class="mycourses-addlesson-img" >
-						<fmt:message key="${childlink.name}" />
-					</span>
+		<c:if test="${lesson.state eq 6}">
+			<span class="mycourses-stop-img mycourses-span" title="<fmt:message key="label.archived"/>">&nbsp;</span>
+		</c:if>
+		<c:if test="${lesson.dependent or lesson.scheduledFinish}">
+			<span class="mycourses-conditions-img mycourses-span" title="<fmt:message key="index.conditions.flag.tooltip"/>">&nbsp;</span>
+		</c:if>
+		<c:if test="${lesson.completed}">
+			<span class="mycourses-completed-img mycourses-span" title="<fmt:message key="label.completed"/>">&nbsp;</span>
+		</c:if>
+
+		<div class="lesson-actions">
+			<c:forEach var="lessonlink" items="${lesson.links}">
+				<a href="<c:out value='${lessonlink.url}'/>"
+					<c:if test="${not empty lessonlink.tooltip}">
+						title="<fmt:message key='${lessonlink.tooltip}'/>"
+					</c:if>
+				>
+					<div class="${lessonlink.style} mycourses-div">
+						<span class="lesson-action-label">
+							<fmt:message key="${lessonlink.name}" />
+						</span>
+					</div>
 				</a>
 			</c:forEach>
-			<c:forEach var="childlink" items="${childOrg.moreLinks}">
-				<a href="${childlink.url}" class="sequence-action-link" title="${childlink.tooltip}"> 
-					<span class="${childlink.style}" >
-						<fmt:message key="${childlink.name}" />
-					</span>
-				</a>
-			</c:forEach>    
-		</p>
-		
-		<div class="sequence-name">
-			<div id="<c:out value="${childOrg.id}"/>" class="j-subgroup-lessons">
-			<table class="lesson-table">
-			
-				<c:forEach var="childLesson" items="${childOrg.lessons}">
-					<c:set var="hasLessonToSort">true</c:set>
-					<tr id="<c:out value="${childLesson.id}"/>" class="j-single-lesson">
-						<td class="td-lesson" style="width: 25px;">
-							<c:if test="${childLesson.completed}"> <span class="mycourses-completed-img" title="<fmt:message key="label.completed"/>" >&nbsp;</span> </c:if>
-	                    </td>
-						<td class="td-lesson" style="word-wrap: break-word;">
-							<c:choose>
-								<c:when test="${empty childLesson.url}">
-									<a class="disabled-sequence-name-link"> <c:out value="${childLesson.name}" /></a> 
-								</c:when>
-								<c:otherwise>
-									<a href="<c:out value="${childLesson.url}"/>" class="sequence-name-link"> <c:out value="${childLesson.name}" /></a> 
-								</c:otherwise>
-							</c:choose>
-						</td>
-						<td class="td-lesson" style="width: 150px;">
-							<c:if test="${childLesson.state eq 4}"> <span class="mycourses-stop-img" title="<fmt:message key="label.disabled"/>" >&nbsp;</span> </c:if>
-							<c:if test="${childLesson.state eq 6}"> <span class="mycourses-stop-img" title="<fmt:message key="label.archived"/>" >&nbsp;</span> </c:if>
-							<c:if test="${childLesson.dependent or childLesson.scheduledFinish}"> <span class="mycourses-conditions-img" title="<fmt:message key="index.conditions.flag.tooltip"/>" >&nbsp;</span> </c:if>
-						</td>
-						<c:choose>
-							<c:when test="${empty childLesson.links}">
-							<td class="td-lesson" style="width: 220px;"></td>
-							</c:when>
-							<c:otherwise>
-								<td class="split-menu-button" style="width: 220px;">
-									<ul>
-										<li>
-											<c:forEach var="childLessonlink" items="${childLesson.links}" varStatus="status">
-												<c:set var="tooltip" value="" />
-												<c:if test="${childLessonlink.tooltip ne null}">
-													<c:set var="tooltip">
-														<fmt:message key="${childLessonlink.tooltip}" />
-													</c:set>
-												</c:if>
-												
-												<c:choose>
-													<c:when test="${status.first}">
-														<a href="#nogo" class="${childLessonlink.style}">
-							                        		<span onclick="<c:out value='${childLessonlink.url}'/>" title="${tooltip}" 
-							                        		class="${childLessonlink.spanStyle}" style="margin-right:0px">
-							                        			<fmt:message key="${childLessonlink.name}" /> &nbsp;
-							                        		</span>
-															<em class="em-menu-button">
-																<img src="<lams:LAMSURL/>/images/icons/bullet_arrow_down.png" alt="dropdown">
-															</em>
-														</a>
-														<ul class="button-menu">
-													</c:when>
-													<c:otherwise>
-														<li>
-															<a href="<c:out value='${childLessonlink.url}'/>" class="${childLessonlink.style}">
-																<span class="${childLessonlink.spanStyle}" title="${tooltip}"><fmt:message key="${childLessonlink.name}" /> &nbsp;</span>
-															</a>
-														</li>
-														<c:if test="${status.last}">
-															</ul>
-														</c:if>
-													</c:otherwise>
-												</c:choose>
-											</c:forEach>
-										</li>
-									</ul>
-			        			</td>
-		   					</c:otherwise>
-						</c:choose>
-					</tr>
-				</c:forEach>
-				
-			</table>
-			</div>
 		</div>
 	</div>
-	</c:forEach>
-	
-</div>
-
-<c:if test="${allowSorting && (hasLessonToSort eq 'true')}">
-<script>
-	jQuery("#sorter-div-${orgBean.id}").show();
-</script>
-</c:if>
\ No newline at end of file
+</c:forEach>
\ No newline at end of file
Fisheye: Tag dc7b67e7677c8cd2289130c67094a62b39177d05 refers to a dead (removed) revision in file `lams_central/web/groupContentsLesson.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/groupHeader.jsp
===================================================================
diff -u -r4f284603a74199f14d9eb0d5e1cc04b89755ba31 -rdc7b67e7677c8cd2289130c67094a62b39177d05
--- lams_central/web/groupHeader.jsp	(.../groupHeader.jsp)	(revision 4f284603a74199f14d9eb0d5e1cc04b89755ba31)
+++ lams_central/web/groupHeader.jsp	(.../groupHeader.jsp)	(revision dc7b67e7677c8cd2289130c67094a62b39177d05)
@@ -1,54 +1,69 @@
 <%@ page contentType="text/html; charset=utf-8" language="java"%>
+
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="row">
-	<div class="mycourses-left-buttons">
-		<h2><span class="j-group-icon" style="vertical-align:middle;"></span>&nbsp;<a class="j-group-header"><c:out value="${orgBean.name}" /></a>
-			<c:if test="${not empty orgBean.archivedDate}"><small>(<fmt:message key="label.archived"/> <lams:Date value="${orgBean.archivedDate}"/>)</small></c:if>
-		</h2>
-	</div>
-
 <!-- Add More menu drop down first (if it contains links) -->
-<c:if test="${not empty orgBean.moreLinks}">
+<c:if test="${not empty org.moreLinks}">
 	<div class="mycourses-right-buttons">
-		<a id="more-actions-button-${orgBean.id}" class="more-actions-button" href="javascript:return false;">
-			<fmt:message key="index.moreActions" />
-		</a>
+		<div class="split-ui-button">
+			<div>
+				<span class="more-actions-button"><fmt:message key="index.moreActions" /></span>
+			</div>
+			<div>&nbsp;</div>
+		</div>
+		<ul>
+			<c:forEach var="link" items="${org.moreLinks}">
+				<li>
+					<a class="${link.style}" href="${link.url}"
+						<c:if test="${not empty link.tooltip}">
+                			title="<fmt:message key='${link.tooltip}'/>"
+                		</c:if>
+                	>
+						<fmt:message key="${link.name}" />
+					</a>
+				</li>
+			</c:forEach>
+		</ul>
 	</div>
 </c:if> 
 
-	<c:forEach var="link" items="${orgBean.links}">
-		<c:set var="tooltip" value="" />
-		<c:if test="${link.tooltip ne null}">
-			<c:set var="tooltip">
-				<fmt:message key="${link.tooltip}" />
-			</c:set>
-		</c:if>
-		
-		<div class="mycourses-right-buttons">
-			<a class="<c:out value='${link.style}'/>" href="<c:out value='${link.url}'/>" title="${tooltip}"> 
-				<fmt:message key="${link.name}" /> 
-			</a>
-		</div>	
-	</c:forEach>
-</div>
-
-<div>
-	<ul id="more-actions-list-${orgBean.id}" class="more-actions-list">
-		<c:forEach var="link" items="${orgBean.moreLinks}">
-			<c:set var="tooltip" value="" />
-			<c:if test="${link.tooltip ne null}">
-				<c:set var="tooltip">
-					<fmt:message key="${link.tooltip}" />
-				</c:set>
-			</c:if>
-			<li>
-				<a class="${link.style}" href="${link.url}" title="${tooltip}">
-					<fmt:message key="${link.name}" />
-				</a>
-			</li>
-		</c:forEach>
-	</ul>
-</div>
+<c:forEach var="link" items="${org.links}">
+	<c:choose>
+		<c:when test="${link.name eq 'index.addlesson.single'}">
+			<div class="mycourses-right-buttons">
+				<div class="split-ui-button">
+					<div onClick="<c:out value='${link.url}'/>"
+						<c:if test="${not empty link.tooltip}">
+		                	title="<fmt:message key='${link.tooltip}'/>"
+		                </c:if>
+		            >
+						<span class="${link.style}"><fmt:message key="index.addlesson" /></span>
+					</div>
+					<div>&nbsp;</div>
+				</div>
+				<ul>
+					<span><fmt:message key="index.single.activity.lesson.desc" /></span>
+					<c:forEach var="tool" items="${tools}">
+						<li>
+							<a href="#" onClick="javascript:showAddSingleActivityLessonDialog(${org.id}, ${tool.toolId})">
+								<c:out value="${tool.toolDisplayName}" />
+							</a>
+						</li>
+					</c:forEach>
+				</ul>
+			</div>
+		</c:when>
+		<c:otherwise>
+			<div class="mycourses-right-buttons">
+				<div class="ui-button" onClick="<c:out value='${link.url}'/>"
+					<c:if test="${not empty link.tooltip}">
+				        title="<fmt:message key='${link.tooltip}'/>"
+				    </c:if>
+				>
+					<span class="${link.style}"><fmt:message key="${link.name}" /></span>
+				</div>
+			</div>
+		</c:otherwise>
+	</c:choose>
+</c:forEach>
\ No newline at end of file
Index: lams_central/web/includes/javascript/groupDisplay.js
===================================================================
diff -u -raf5130ddec364ee2a42e8856d6e66f2650563f7a -rdc7b67e7677c8cd2289130c67094a62b39177d05
--- lams_central/web/includes/javascript/groupDisplay.js	(.../groupDisplay.js)	(revision af5130ddec364ee2a42e8856d6e66f2650563f7a)
+++ lams_central/web/includes/javascript/groupDisplay.js	(.../groupDisplay.js)	(revision dc7b67e7677c8cd2289130c67094a62b39177d05)
@@ -1,15 +1,17 @@
 function initMainPage() {
 	initButtons();
 	
-	$('#orgTabs').tabs({
-		'activate' : function(event, ui){
-			loadOrgTab(ui.newPanel);
-		}
-	}).addClass('ui-tabs-vertical ui-helper-clearfix')
-	  .find('li').removeClass('ui-corner-top').addClass('ui-corner-left');
-
-	loadOrgTab($('.orgTab').first());
+	if ($('#orgTabs').length > 0) {
+		$('#orgTabs').tabs({
+			'activate' : function(event, ui){
+				loadOrgTab(ui.newPanel);
+			}
+		}).addClass('ui-tabs-vertical ui-helper-clearfix')
+		  .find('li').removeClass('ui-corner-top').addClass('ui-corner-left');
 	
+		loadOrgTab($('.orgTab').first());
+	}
+	
 	$("#actionAccord").accordion({
 		'heightStyle' : 'content'
 	});
@@ -19,113 +21,23 @@
 	if (!orgTab) {
 		orgTab = $('div.orgTab[id^=orgTab-' + $('#orgTabs').tabs('option','active') + ']');
 	}
-	if (refresh || !orgTab.text()) {
+	if (orgTab && (refresh || !orgTab.text())) {
 		var orgTabId = orgTab.attr("id");
 		var orgId = orgTabId.split('-')[3];
 		
 		orgTab.load(
 			"displayGroup.do",
 			{
-				display : 'group',
 				stateId : stateId,
 				orgId   : orgId
 			},
 			function() {
-				$("a[class*='thickbox']", orgTab).each(function() {
-					tb_init(this);
-				});
-				
 				initButtons(orgTabId);
 			});
 	}
 }
 
 
-function initLoadGroup(element, stateId, display) {
-	jQuery(element).load(
-			"displayGroup.do",
-			{
-				display : display,
-				stateId : stateId,
-				orgId : jQuery(element).attr("id")
-			},
-			function() {
-				if (display == 'header') {
-					jQuery("span.j-group-icon", element).html(
-							"<img src='images/tree_closed.gif'/>");
-				} else if (display == 'group') {
-					jQuery("span.j-group-icon", element).html(
-							"<img src='images/tree_open.gif'/>");
-				}
-				toggleGroupContents(element, stateId);
-				jQuery(element).css("display", "block");
-				jQuery("a[class*='thickbox']", element).each(function() {
-					tb_init(this);
-				});
-				initMoreActions(element);
-			});
-}
-
-function toggleGroupContents(element, stateId) {
-	jQuery("a.j-group-header, span.j-group-icon", element).click(function() {
-		var row = jQuery("div.row", element);
-		var courseBg = jQuery(row).parent("div.course-bg");
-		var orgId = jQuery(courseBg).attr("id");
-		var course = jQuery(row).nextAll("div.j-course-contents");
-		var groupIcon = jQuery("span.j-group-icon", element);
-		if (jQuery(course).html() == null) {
-			loadGroupContents(courseBg, stateId);
-			saveCollapsed(orgId, "false");
-			jQuery(groupIcon).html("<img src='images/tree_open.gif'/>");
-		} else {
-			var display = course.css("display");
-			if (jQuery.browser.msie && jQuery.browser.version == '6.0') {
-				course.slideToggle("fast");
-			} else {
-				course.toggle("fast");
-			}
-			if (display == "none") {
-				saveCollapsed(orgId, "false");
-				jQuery(groupIcon).html("<img src='images/tree_open.gif'/>");
-			} else if (display == "block") {
-				saveCollapsed(orgId, "true");
-				jQuery(groupIcon).html("<img src='images/tree_closed.gif'/>");
-			}
-		}
-	});
-}
-
-function saveCollapsed(orgId, collapsed) {
-	jQuery.ajax({
-		url : "servlet/updateCollapsedGroup",
-		data : {
-			orgId : orgId,
-			collapsed : collapsed
-		}
-	});
-}
-
-function loadGroupContents(courseBg, stateId) {
-	var orgId = jQuery(courseBg).attr("id");
-	jQuery.ajax({
-		url : "displayGroup.do",
-		data : {
-			orgId : orgId,
-			stateId : stateId,
-			display : 'contents'
-		},
-		success : function(html) {
-			jQuery(courseBg).append(html);
-			// unregister and re-register thickbox for this
-			// group in order to avoid double
-			// registration of thickbox for existing elements
-			// (i.e. group 'add lesson' link)
-			$('a.thickbox' + jQuery(courseBg).attr("id")).unbind("click");
-			tb_init('a.thickbox' + jQuery(courseBg).attr("id"));
-		}
-	});
-}
-
 function initButtons(containerId) {
 	var container = containerId ? $('#' + containerId) : document;
 
@@ -163,59 +75,8 @@
 	});
 }
 
-function initMoreActions(element) {
 
-	var id = jQuery(element).attr("id");
-	var menuSelector = "a#more-actions-button-" + id;
-	var ulSelector = "ul#more-actions-list-" + id;
-
-	$(menuSelector).click(
-			function() {
-				// slide up all other menus
-				$("ul[id^=more-actions-list-]:visible:not(" + ulSelector + ")")
-						.slideUp("fast");
-
-				// show this menu
-				$(ulSelector).css("top",
-						$(this).position().top + this.offsetHeight);
-				$(ulSelector).css("left", $(this).position().left);
-				$(ulSelector).slideToggle("fast");
-				return false;
-			});
-
-	$(window).resize(
-			function() {
-				if ($(menuSelector).length == 0)
-					return;
-
-				$(ulSelector).css(
-						"top",
-						$(menuSelector).position().top
-								+ $(menuSelector).offsetHeight);
-				$(ulSelector).css("left", $(menuSelector).position().left);
-			});
-
-}
-
 function makeOrgSortable(orgId) {
-	var org = jQuery("div.course-bg#" + orgId);
-	if (jQuery("div.j-lessons", org).size() > 0) {
-		var jLessons = jQuery("div.j-lessons#" + orgId + "-lessons");
-		var jLessonsTable = jQuery("table.lesson-table tbody", jLessons);
-		makeSortable(jLessonsTable);
-		jQuery("div.j-subgroup-lessons>table.lesson-table tbody", org).each(
-				function() {
-					makeSortable(jQuery(this));
-				});
-		jQuery("div.mycourses-right-buttons", jLessons).html(
-				"<a class=\"sorting\" onclick=\"makeOrgUnsortable(" + orgId
-						+ ")\" title=\"" + LABELS.SORTING_DISABLE
-						+ "\"><img src=\"images/sorting_enabled.gif\"></a>");
-	}
-}
-
-// for redesigned main.jsp
-function makeOrgSortable2(orgId) {
 	var org = jQuery("div.orgTab[id$='-org-" + orgId + "']");
 	$(".lesson-table", org).each(function() {
 		makeSortable(this);
@@ -225,28 +86,13 @@
 		"onClick" : null,
 		"title"   : LABELS.SORTING_DISABLE
 	}).off('click').click(function(){
-		makeOrgUnsortable2(orgId);
+		makeOrgUnsortable(orgId);
 	}).find("img")
 	  .attr("src", "images/sorting_enabled.gif");
 	
 }
 
 function makeOrgUnsortable(orgId) {
-	var org = jQuery("div.course-bg#" + orgId);
-	var jLessons = jQuery("div.j-lessons#" + orgId + "-lessons");
-	var jLessonsTable = jQuery("table.lesson-table tbody", jLessons);
-	jLessonsTable.sortable("destroy");
-	jQuery("div.j-subgroup-lessons>table.lesson-table tbody", org).each(
-			function() {
-				jQuery(this).sortable("destroy");
-			});
-	jQuery("div.mycourses-right-buttons", jLessons).html(
-			"<a class=\"sorting\" onclick=\"makeOrgSortable(" + orgId
-					+ ")\" title=\"" + LABELS.SORTING_ENABLE
-					+ "\"><img src=\"images/sorting_disabled.gif\"></a>");
-}
-
-function makeOrgUnsortable2(orgId) {
 	var org = jQuery("div.orgTab[id$='-org-" + orgId + "']");
 	$(".lesson-table", org).each(function() {
 		$(this).sortable('destroy');
@@ -256,7 +102,7 @@
 		"onClick" : null,
 		"title"   : LABELS.SORTING_ENABLE
 	}).off('click').click(function(){
-		makeOrgSortable2(orgId);
+		makeOrgSortable(orgId);
 	}).find("img")
 	  .attr("src", "images/sorting_disabled.gif");
 }
@@ -286,9 +132,6 @@
 
 					var jLessonsId = $(this).parents(
 							"div[class$='lessons']").attr("id");
-					if (!jLessonsId) {
-						jLessonsId = $(this).attr("id");
-					}
 					var dashIndex = jLessonsId.indexOf("-");
 					var orgId = (dashIndex > 0 ? jLessonsId.substring(0,
 							dashIndex) : jLessonsId);
@@ -307,6 +150,7 @@
 			}).disableSelection();
 }
 
+
 function showMonitorLessonDialog(lessonID) {
 	var dialog = $('#dialogContainer').dialog({
 		'lessonID' : lessonID,
@@ -639,13 +483,4 @@
 			});
 		}
 	}
-}
-
-function refresh() {
-	document.location.reload();
-}
-
-function closeWizard() {
-	setTimeout(refresh, 1000);
-	tb_remove();
 }
\ No newline at end of file
Index: lams_central/web/main.jsp
===================================================================
diff -u -rc88e27be7f757370c0c6febf1ed98552a978050f -rdc7b67e7677c8cd2289130c67094a62b39177d05
--- lams_central/web/main.jsp	(.../main.jsp)	(revision c88e27be7f757370c0c6febf1ed98552a978050f)
+++ lams_central/web/main.jsp	(.../main.jsp)	(revision dc7b67e7677c8cd2289130c67094a62b39177d05)
@@ -13,7 +13,7 @@
 
 <%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">
+<!DOCTYPE HTML>
 <lams:html>
 <lams:head>
 	<c:choose>
@@ -26,51 +26,41 @@
 	</c:choose>
 	
 	<lams:css style="main" />
-	<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" />
-	<link rel="stylesheet" href="<lams:LAMSURL/>/css/thickbox.css" type="text/css" media="screen">
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-redmond-theme.css" type="text/css" media="screen">
-	<style type="text/css">
-		.dialogContainer {
-			display: none;
-		}
-		
-		.dialogContainer iframe {
-			width: 100%;
-			height: 100%;
-			border: none;
-		}
-	</style>
-	<script language="JavaScript" type="text/javascript" src="includes/javascript/getSysInfo.js"></script>
-	<script language="javascript" type="text/javascript" src="loadVars.jsp"></script>
-	<script language="JavaScript" type="text/javascript" src="includes/javascript/openUrls.js"></script>
-	<script language="JavaScript" type="text/javascript" src="includes/javascript/jquery.js"></script>
-	<script language="JavaScript" type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
-    <script language="JavaScript" type="text/javascript" src="includes/javascript/thickbox.js"></script>
-	<c:if test="${empty tab}">
-		<script language="JavaScript" type="text/javascript" src="includes/javascript/groupDisplay.js"></script>	
-	</c:if>
-	<script language="javascript" type="text/javascript">
-		var LAMS_URL = '<lams:LAMSURL/>';
-		var LABELS = {
-				EMAIL_NOTIFICATIONS_TITLE : '<fmt:message key="index.emailnotifications" />',
-				REMOVE_LESSON_CONFIRM1 : '<fmt:message key="index.remove.lesson.confirm1"/>',
-				REMOVE_LESSON_CONFIRM2 : '<fmt:message key="index.remove.lesson.confirm2"/>',
-				SORTING_ENABLE : '<fmt:message key="label.enable.lesson.sorting"/>',
-				SORTING_DISABLE : '<fmt:message key="label.disable.lesson.sorting"/>'
-		}
-		
-		var orgsStateId = '<c:if test="${empty tab}">1</c:if><c:if test="${tab eq 'profile'}">3</c:if>';
-		
 	
-		<!--
-			jQuery(document).ready(function(){
-				<c:if test="${not empty collapsedOrgDTOs}">
-				jQuery("div.course-bg").each(function(){
-					var display = jQuery.trim(jQuery(this).text());
-					initLoadGroup(this, <c:if test="${empty tab}">1</c:if><c:if test="${tab eq 'profile'}">3</c:if>, display);
-				});
-				</c:if>
+	<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" />
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-redmond-theme.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/index.css" type="text/css" media="screen">
+
+	<script type="text/javascript" src="includes/javascript/getSysInfo.js"></script>
+	<script type="text/javascript" src="loadVars.jsp"></script>
+	<script type="text/javascript" src="includes/javascript/openUrls.js"></script>
+	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="includes/javascript/groupDisplay.js"></script>	
+
+	<script type="text/javascript">
+			var LAMS_URL = '<lams:LAMSURL/>';
+			var LABELS = {
+					EMAIL_NOTIFICATIONS_TITLE : '<fmt:message key="index.emailnotifications" />',
+					REMOVE_LESSON_CONFIRM1 : '<fmt:message key="index.remove.lesson.confirm1"/>',
+					REMOVE_LESSON_CONFIRM2 : '<fmt:message key="index.remove.lesson.confirm2"/>',
+					SORTING_ENABLE : '<fmt:message key="label.enable.lesson.sorting"/>',
+					SORTING_DISABLE : '<fmt:message key="label.disable.lesson.sorting"/>',
+					SINGLE_ACTIVITY_LESSON_TITLE : '<fmt:message key="index.single.activity.lesson.title"/>',
+					GRADEBOOK_COURSE_TITLE : '<fmt:message key="index.gradebook.course.title"/>',
+					GRADEBOOK_LESSON_TITLE : '<fmt:message key="index.gradebook.lesson.title"/>',
+					GRADEBOOK_LEARNER_TITLE : '<fmt:message key="index.gradebook.learner.title"/>',
+					CONDITIONS_TITLE : '<fmt:message key="index.conditions.title"/>',
+					SEARCH_LESSON_TITLE : '<fmt:message key="index.search.lesson.title"/>'
+			}
+			
+			var tabName = '${tab}';
+			var stateId = tabName == 'profile' ? 3 : 1;
+
+			$(document).ready(function(){
+				initMainPage();
+				
 				<%-- If it's the user's first login, display a dialog asking if tutorial videos should be shown --%>
 				<c:if test="${firstLogin}">
 					<c:url var="disableAllTutorialVideosUrl" value="tutorial.do">
@@ -80,134 +70,8 @@
 				 		$.get("${disableAllTutorialVideosUrl}");
 					}
 				</c:if>
-				
-				$(".split-menu-button li em").live("click", function(event) {
-					var hidden = $(this).parents("li").children("ul").is(":hidden");
-					$(this).parents("li").children("ul").hide();
-					$(this).parents("li").children("a").removeClass("zoneCur");
-						
-					if (hidden) {
-						$(this)
-							.parents("li").children("ul").toggle()
-							.parents("li").children("a").addClass("zoneCur");
-						} 
-
-	                event.stopPropagation();
-				   });
-		       $("html").click(function() {
-	                $(".split-menu-button>ul>li>ul").hide();
-	           });
-				
-		       
-		        // initialise lesson dialog
-				$('#addLessonDialog').dialog({
- 					'autoOpen'  : false,
- 					'height'    : 600,
- 					'width'     : 800,
- 					'modal'     : true,
- 					'resizable' : false,
- 					'hide'      : 'fold',
- 					'open'      : function(){
- 						// load contents after opening the dialog
- 						$('#addLessonFrame').attr('src', '<lams:LAMSURL/>home.do?method=addLesson&organisationID='
- 								                         + $(this).dialog('option', 'orgID'));
- 					},
- 					'close' : function() {
- 						// refresh if lesson was added
- 						if($(this).dialog('option', 'refresh')){
- 							refresh();
- 						}
- 					}
- 				// tabs are the title bar, so remove dialog's one
- 				}).closest('.ui-dialog').children('.ui-dialog-titlebar').remove();
-		        
-				// initialise monitor dialog
-				$('#monitorDialog').dialog({
- 					'autoOpen'  : false,
- 					'height'    : 600,
- 					'width'     : 1024,
- 					'modal'     : true,
- 					'resizable' : false,
- 					'hide'      : 'fold',
- 					'open'      : function(){
- 						// load contents after opening the dialog
- 						$('#monitorFrame').attr('src', '<lams:LAMSURL/>home.do?method=monitorLesson&lessonID='
- 								                         + $(this).dialog('option', 'lessonID'));
- 					},
- 					'close' : function() {
- 						// refresh if lesson was added
- 						if($(this).dialog('option', 'refresh')){
- 							refresh();
- 						}
- 					}
- 				}).closest('.ui-dialog').children('.ui-dialog-titlebar').remove();
-				
-				// initialise notifications dialog
-				$('#notificationsDialog').dialog({
- 					'autoOpen'  : false,
- 					'height'    : 600,
- 					'width'     : 850,
- 					'modal'     : true,
- 					'resizable' : false,
- 					'hide'      : 'fold',
- 					'title'     : "<fmt:message key='index.emailnotifications' />",
- 					'open'      : function(){
- 						var lessonID = $(this).dialog('option', 'lessonID');
- 						// if lesson ID is given, use lesson view; otherwise use course view
- 						if (lessonID) {
-	 						// load contents after opening the dialog
-	 						$('#notificationsFrame').attr('src', '<lams:LAMSURL/>monitoring/emailNotifications.do?method=getLessonView&lessonID='
-	 							+ lessonID);
- 						} else {
- 							var orgID = $(this).dialog('option', 'orgID');
- 							$('#notificationsFrame').attr('src', '<lams:LAMSURL/>monitoring/emailNotifications.do?method=getCourseView&organisationID='
-			                	+ orgID);
- 						}
- 					},
- 					'close' : function() {
- 						$('#notificationsFrame').attr('src',null);
- 					}
- 				});
 			});
-		
-			function removeLesson(lessonID) {
-				if (confirm("<fmt:message key="index.remove.lesson.confirm1"/>")) {
-					if (confirm("<fmt:message key="index.remove.lesson.confirm2"/>")) {
-				        $.ajax({
-				        	async: false,
-				            url: "<lams:LAMSURL/>monitoring/monitoring.do",
-				            data: "method=removeLessonJson&lessonID=" + lessonID,
-				            type: "post",
-				            success: function (json) {
-					            if (json.removeLesson == "true") {
-					            	refresh();	
-								} else {
-									alert(json.removeLesson);
-								}
-				            }
-				       	});
-					}
-				}
 
-			}
-			
-			function getEnableSortingText() {
-				return "<fmt:message key="label.enable.lesson.sorting"/>";
-			}
-			
-			function getDisableSortingText() {
-				return "<fmt:message key="label.disable.lesson.sorting"/>";
-			}
-			
-			function refresh(){
-				document.location.reload();
-			}
-
-			function closeWizard() {
-				setTimeout(refresh, 1000);
-				tb_remove();
-			}
-		//-->
 	</script>
 </lams:head>
 <body class="my-courses">
@@ -267,12 +131,12 @@
 				<div class="${tabLeft}"></div>
 				<div class="${tabMiddle}">
 						<c:choose>
-						<c:when test="${fn:startsWith(headerlink.name,'index')}">
-							<lams:TabName url="${headerlink.url}" highlight="${highlight}"><fmt:message key="${headerlink.name}" /></lams:TabName>
-						</c:when>
-						<c:otherwise>
-							<lams:TabName url="${headerlink.url}" highlight="${highlight}"><c:out value="${headerlink.name}" /></lams:TabName>						
-						</c:otherwise>
+							<c:when test="${fn:startsWith(headerlink.name,'index')}">
+								<lams:TabName url="${headerlink.url}" highlight="${highlight}"><fmt:message key="${headerlink.name}" /></lams:TabName>
+							</c:when>
+							<c:otherwise>
+								<lams:TabName url="${headerlink.url}" highlight="${highlight}"><c:out value="${headerlink.name}" /></lams:TabName>						
+							</c:otherwise>
 						</c:choose>
 				</div>
 				<div class="${tabRight}"></div>
@@ -281,85 +145,113 @@
 		</div>
 	</div>
 	<div id="content-main">
-		<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">
-									<span class="user-img">
-									<fmt:message key="index.welcome" /> 
-									<lams:user property="firstName" /></span>
-								</div>
-								<div class="float-right">
-									<c:if test="${not empty adminLinks}">
-										<c:forEach var="adminlink" items="${adminLinks}">
-											<a title="<fmt:message key="${adminlink.name}"/>" href='<c:out value="${adminlink.url}"/>'><fmt:message key="${adminlink.name}"/></a> | 
+		<table>
+			<tr>
+				<c:if test="${not empty portraitUuid}">
+					<td>
+						<img class="img-border" src="download/?uuid=${portraitUuid}&preferDownload=false" />
+					</td>
+				</c:if>
+				<td>
+					<fmt:message key="index.welcome" />
+					<lams:user property="firstName" />
+				</td>
+				
+				<td id="messageCell">
+				<%--
+					<div id="message">Important annoucements might be posted here...</div>
+				--%>
+				</td>
+				
+				<td class="linksCell">
+					<c:if test="${not empty adminLinks}">
+						<c:forEach var="adminlink" items="${adminLinks}">
+							<div class="ui-button" title="<fmt:message key="${adminlink.name}"/>" 
+							     onClick='<c:out value="${adminlink.url}"/>'>
+									<fmt:message key="${adminlink.name}"/>
+							</div> 
+						</c:forEach>
+					</c:if>
+				</td>
+				<td class="linksCell">
+					<c:if test="${not empty orgDTOs}">
+						<div class="ui-button" title="<fmt:message key="index.refresh.hint"/>"
+							 onClick="javascript:loadOrgTab(null, true)">
+								<fmt:message key="index.refresh" />
+						</div>
+					</c:if>
+					<div class="ui-button" onClick="javascript:closeAllChildren();document.location.href='home.do?method=logout'">
+							<fmt:message key="index.logout" />
+					</div>
+				</td>
+			</tr>
+		</table>
+		<c:if test="${empty tab}">
+			<table id="mainContentTable" cellpadding="0" cellspacing="0">
+				<tr>
+					<td>
+						<c:if test="${not empty orgDTOs}">
+							<table id="orgTabs" cellpadding="0" cellspacing="0">
+								<tr>
+									<td>
+										<ul>
+											<c:forEach items="${orgDTOs}" var="dto" varStatus="status">
+												<li class="orgTabsHeader">
+													<a href="#orgTab-${status.index}-org-${dto.orgId}"><c:out value="${dto.orgName}" /></a>
+												</li>
+											</c:forEach>
+										</ul>
+									</td>
+									<td id="orgTabsPanelCell" class="ui-widget-content ui-corner-all">
+										<c:forEach items="${orgDTOs}" var="dto" varStatus="status">
+											<div id="orgTab-${status.index}-org-${dto.orgId}" class="orgTab"></div>
 										</c:forEach>
-									</c:if>
-									<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>
+									</td>
+								</tr>
+							</table>
+						</c:if>
+					</td>
+					<%--
+					<td id="actionAccord">
+							<h3>New lessons</h3>
+							<div>New lessons content panel<br />
+							TEXT TEXT TEXT TEXT<br />
+							TEXT TEXT TEXT TEXT<br />
+							TEXT TEXT TEXT TEXT<br />
+							TEXT TEXT TEXT TEXT<br />
+							TEXT TEXT TEXT TEXT<br />
 							</div>
-							<c:if test="${empty tab}">
-								<c:forEach items="${collapsedOrgDTOs}" var="dto">
-									<div id="<c:out value="${dto.orgId}"/>" style="display:none" class="course-bg">
-										<c:if test="${dto.collapsed}">header</c:if><c:if test="${!dto.collapsed}">group</c:if>
-									</div>
-								</c:forEach>
-								<c:if test="${empty collapsedOrgDTOs}">
-									<c:if test="${not empty showGroups}">
-										<!-- div align="center" style="padding:30px;">
-											<a onclick="document.location.href='index.do?groups=show';"><fmt:message key="label.show.groups"/></a>
-										</div-->
-										<div class="course-bg"><div class="row"><div class="mycourses-right-buttons">
-											<a class="show-all-groups-button" onclick="document.location.href='index.do?groups=show';"><fmt:message key="label.show.groups"/></a>
-										</div></div></div>
-									</c:if>
-									<c:if test="${empty showGroups}">
-										<p class="align-left"><fmt:message key="msg.groups.empty" /></p>
-									</c:if>
-								</c:if>
-							</c:if>
-							<c:if test="${tab eq 'profile'}">
-								<tiles:insert attribute="profile" />
-							</c:if>
-							<c:if test="${tab eq 'community'}">
-								<tiles:insert attribute="community" />
-							</c:if>
-						</td>
-					</tr>
-				</tbody>
+							<h3>Recent activity</h3>
+							<div>Recent activity content panel</div>
+							<h3>Gradebooks</h3>
+							<div>Gradebooks content panel</div>
+							<h3>Announcements</h3>
+							<div>Announcements content panel</div>
+					</td>
+					--%>
+				</tr>
 			</table>
-		</div>
-		
+		</c:if>
+		<c:if test="${tab eq 'profile'}">
+			<tiles:insert attribute="profile" />
+		</c:if>
+		<c:if test="${tab eq 'community'}">
+			<tiles:insert attribute="community" />
+		</c:if>
 	</div>
 	<div id="footer">
 		<p>
-			<a style="color: #999999; text-decoration: none; border: none;" href="index.do?newLayout=true">
-				<fmt:message key="msg.LAMS.version" /> <%=Configuration.get(ConfigurationKeys.VERSION)%>
-			</a>
+			<fmt:message key="msg.LAMS.version" /> <%=Configuration.get(ConfigurationKeys.VERSION)%>
 			<a href="<lams:LAMSURL/>/www/copyright.jsp" target='copyright' onClick="openCopyRight()">
 				&copy; <fmt:message key="msg.LAMS.copyright.short" /> 
 			</a>
 		</p>
 	</div>
 </div>
 
-<div id="addLessonDialog" class="dialogContainer">
-	<iframe id="addLessonFrame"></iframe>
+<div id="dialogContainer">
+	<iframe id="dialogFrame"></iframe>
 </div>
-<div id="monitorDialog" class="dialogContainer">
-	<iframe id="monitorFrame"></iframe>
-</div>
-<div id="notificationsDialog" class="dialogContainer">
-	<iframe id="notificationsFrame"></iframe>
-</div>
 
 </body>
-</lams:html>
+</lams:html>
\ No newline at end of file
Fisheye: Tag dc7b67e7677c8cd2289130c67094a62b39177d05 refers to a dead (removed) revision in file `lams_central/web/main2.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/profile.jsp
===================================================================
diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -rdc7b67e7677c8cd2289130c67094a62b39177d05
--- lams_central/web/profile.jsp	(.../profile.jsp)	(revision 35a0e719d061c08b52e705135bb2f2126079ed21)
+++ lams_central/web/profile.jsp	(.../profile.jsp)	(revision dc7b67e7677c8cd2289130c67094a62b39177d05)
@@ -10,24 +10,14 @@
 		 import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
 		 
 <c:set var="showAllMyLessonLink"><%=Configuration.get(ConfigurationKeys.SHOW_ALL_MY_LESSON_LINK)%></c:set>
-
-<script language="JavaScript" type="text/javascript" src="includes/javascript/jquery.js"></script>
-<c:if test="${not empty collapsedOrgDTOs}">
-<script language="JavaScript" type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
-<script language="JavaScript" type="text/javascript" src="includes/javascript/groupDisplay.js"></script>	
-</c:if>
 	
 <div style="clear:both;"></div>
 
-<h2 class="small-space-top"><fmt:message key="index.myprofile" />
-</h2>
+<h2 class="small-space-top"><fmt:message key="index.myprofile" /></h2>
 
 <div class="shading-bg">
-
 <table>
-
 	<tr>
-
 		<td class="align-right"><span class="field-name"><fmt:message
 			key="label.name" />:</span></td>
 		<td><bean:write name="fullName" /></td>
@@ -67,33 +57,33 @@
 	<tr>
 		<td class="align-right" valign="top"><span class="field-name"><fmt:message
 			key="label.portrait.current" />:</span></td>
-		<td valign="top"><logic:notEqual name="portraitUuid" value="0">
-			<img class="img-border"
-				src="/lams/download/?uuid=<bean:write name="portraitUuid" />&preferDownload=false" />
-		</logic:notEqual> <logic:equal name="portraitUuid" value="0">
-			<c:set var="lams">
-				<lams:LAMSURL />
-			</c:set>
-				<em><fmt:message key="msg.portrait.none" /></em>
-			<div class="small-space-top">
-			<img src="${lams}/images/default_user.gif" alt="User Portrait"
-				class="img-border">
-				</div>
-		</logic:equal></td>
+		<td valign="top">
+			<c:choose>
+				<c:when test="${empty portraitUuid}">
+					<em><fmt:message key="msg.portrait.none" /></em>
+					<div class="small-space-top">
+						<img src="<lams:LAMSURL />images/default_user.gif" alt="User Portrait"
+						class="img-border">
+					</div>
+				</c:when>
+				<c:otherwise>
+					<img class="img-border"	src="/lams/download/?uuid=<bean:write name="portraitUuid" />&preferDownload=false" />
+				</c:otherwise>
+			</c:choose>
+		</td>
 	<tr>
 </table>
 
 </div>
 
 
-<h2 class="space-top"><fmt:message key="title.archived.groups" />
-</h2>
+<h2 class="space-top"><fmt:message key="title.archived.groups" /></h2>
 
-<c:forEach items="${collapsedOrgDTOs}" var="dto">
-	<div id="<c:out value="${dto.orgId}"/>" style="display:none" class="course-bg">
-		<c:if test="${dto.collapsed}">header</c:if><c:if test="${!dto.collapsed}">group</c:if>
-	</div>
-</c:forEach>
-<c:if test="${empty collapsedOrgDTOs}">
-	<p class="align-left"><fmt:message key="msg.groups.empty" /></p>
-</c:if>
+<p class="align-left">
+	<c:forEach items="${orgDTOs}" var="dto">
+		<span><c:out value="${dto.orgName}" /></span><br />
+	</c:forEach>
+	<c:if test="${empty orgDTOs}">
+		<fmt:message key="msg.groups.empty" />
+	</c:if>
+</p>
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/index/IndexLinkBean.java
===================================================================
diff -u -rcb6d628cd53fe3d51e4f67cbaff7390651a048da -rdc7b67e7677c8cd2289130c67094a62b39177d05
--- lams_common/src/java/org/lamsfoundation/lams/index/IndexLinkBean.java	(.../IndexLinkBean.java)	(revision cb6d628cd53fe3d51e4f67cbaff7390651a048da)
+++ lams_common/src/java/org/lamsfoundation/lams/index/IndexLinkBean.java	(.../IndexLinkBean.java)	(revision dc7b67e7677c8cd2289130c67094a62b39177d05)
@@ -24,29 +24,27 @@
 
 /**
  * @version
- *
- * <p>
- * <a href="IndexLinkBean.java.html"><i>View Source</i></a>
- * </p>
- *
+ * 
+ *          <p>
+ *          <a href="IndexLinkBean.java.html"><i>View Source</i></a>
+ *          </p>
+ * 
  * @author <a href="mailto:fyang@melcoe.mq.edu.au">Fei Yang</a>
- *
- * Created at 10:12:09 on 14/06/2006
+ * 
+ *         Created at 10:12:09 on 14/06/2006
  */
 public class IndexLinkBean {
 
     private String name;
     private String url;
     private String style;
-    private String spanStyle;
     private String tooltip;
 
-    public IndexLinkBean(String name, String url, String style, String spanStyle, String tooltip) {
+    public IndexLinkBean(String name, String url, String style, String tooltip) {
 	super();
 	this.name = name;
 	this.url = url;
 	this.style = style;
-	this.spanStyle = spanStyle;
 	this.tooltip = tooltip;
     }
 
@@ -84,7 +82,7 @@
     public void setUrl(String url) {
 	this.url = url;
     }
-    
+
     public String getStyle() {
 	return style;
     }
@@ -93,14 +91,6 @@
 	this.style = style;
     }
 
-    public String getSpanStyle() {
-	return spanStyle;
-    }
-
-    public void setSpanStyle(String spanStyle) {
-	this.spanStyle = spanStyle;
-    }
-
     public String getTooltip() {
 	return tooltip;
     }