Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
===================================================================
diff -u -rc25a2c783e51d05045d1fb61981c169357cd3e98 -r92e8b8d1454cfbd9ae8a20934a677340dac3b507
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision 92e8b8d1454cfbd9ae8a20934a677340dac3b507)
@@ -70,9 +70,10 @@
 	public static final String ATTR_SUMMARY_LIST = "summaryList";
 	public static final String ATTR_USER_LIST = "userList";
 	public static final String ATTR_RESOURCE_INSTRUCTION = "instructions";
-	public static final String ATTR_FINISH_LOCK = "finishLock";
+	public static final String ATTR_FINISH_LOCK = "finishedLock";
 	public static final String ATTR_SESSION_MAP_ID = "sessionMapID";
 	public static final Object ATTR_RESOURCE_FORM = "resourceForm";
+	public static final String ATTR_ADD_RESOURCE_TYPE = "addType";
 	
 	//error message keys
 	public static final String ERROR_MSG_TITLE_BLANK = "error.resource.item.title.blank";
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java
===================================================================
diff -u -rc25a2c783e51d05045d1fb61981c169357cd3e98 -r92e8b8d1454cfbd9ae8a20934a677340dac3b507
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java	(.../Resource.java)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java	(.../Resource.java)	(revision 92e8b8d1454cfbd9ae8a20934a677340dac3b507)
@@ -398,7 +398,7 @@
 	/**
      *
      * @hibernate.set   lazy="true"
-     * 					cascade="all-delete-orphan"
+     * 					cascade="all"
      * 					inverse="false"
      * 					order-by="create_date desc"
      * @hibernate.collection-key column="resource_uid"
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.hbm.xml
===================================================================
diff -u -rc25a2c783e51d05045d1fb61981c169357cd3e98 -r92e8b8d1454cfbd9ae8a20934a677340dac3b507
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.hbm.xml	(.../ResourceUser.hbm.xml)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.hbm.xml	(.../ResourceUser.hbm.xml)	(revision 92e8b8d1454cfbd9ae8a20934a677340dac3b507)
@@ -71,13 +71,13 @@
         />
 
         <many-to-one
-            name="content"
+            name="resource"
             class="org.lamsfoundation.lams.tool.rsrc.model.Resource"
             cascade="none"
             outer-join="auto"
             update="true"
             insert="true"
-            column="content_uid"
+            column="resource_uid"
         />
 
         <property
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
diff -u -rc25a2c783e51d05045d1fb61981c169357cd3e98 -r92e8b8d1454cfbd9ae8a20934a677340dac3b507
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 92e8b8d1454cfbd9ae8a20934a677340dac3b507)
@@ -811,7 +811,6 @@
 	}
 	
 	
-	
 	/**
 	 * Get resource items instruction from <code>HttpRequest</code>
 	 * @param request
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
===================================================================
diff -u -rc25a2c783e51d05045d1fb61981c169357cd3e98 -r92e8b8d1454cfbd9ae8a20934a677340dac3b507
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	(.../LearningAction.java)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	(.../LearningAction.java)	(revision 92e8b8d1454cfbd9ae8a20934a677340dac3b507)
@@ -58,6 +58,7 @@
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.lamsfoundation.lams.web.util.SessionMap;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 /**
@@ -90,20 +91,137 @@
         }
 		return  mapping.findForward(ResourceConstants.ERROR);
 	}
-	
+	/**
+	 * Read resource data from database and put them into HttpSession. It will redirect to init.do directly after this
+	 * method run successfully. 
+	 *  
+	 * This method will avoid read database again and lost un-saved resouce item lost when user "refresh page",
+	 * 
+	 */
+	private ActionForward start(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+		
+		//initial Session Map 
+		SessionMap sessionMap = new SessionMap();
+		request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+		
+		//save toolContentID into HTTPSession
+		String mode = request.getParameter(AttributeNames.ATTR_MODE);
+		
+		Long sessionId =  new Long(request.getParameter(ResourceConstants.PARAM_TOOL_SESSION_ID));
+		sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID,sessionId);
+		
+		request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+		request.setAttribute(AttributeNames.ATTR_MODE,mode);
+		request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionId);
+		
+//		get back the resource and item list and display them on page
+		IResourceService service = getResourceService();
+		ResourceUser resourceUser = getCurrentUser(service,sessionId);
+
+		List<ResourceItem> items = null;
+		Resource resource;
+		items = service.getResourceItemsBySessionId(sessionId);
+		resource = service.getResourceBySessionId(sessionId);
+		
+		
+		//add define later support
+		if(resource.isDefineLater()){
+			return mapping.findForward("defineLater");
+		}
+		//add run offline support
+		if(resource.getRunOffline()){
+			return mapping.findForward("runOffline");
+		}
+				
+		//init resource item list
+		List<ResourceItem> resourceItemList = getResourceItemList(sessionMap);
+		resourceItemList.clear();
+		if(items != null){
+			//remove hidden items.
+			for(ResourceItem item : items){
+				if(!item.isHide()){
+					resourceItemList.add(item);
+				}
+			}
+		}
+		
+		//set complete flag for display purpose
+		service.retrieveComplete(resourceItemList, resourceUser);
+		
+		sessionMap.put(ResourceConstants.ATTR_RESOURCE,resource);
+		
+		//check whether there is only one resource item and run auto flag is true or not.
+		boolean runAuto = false;
+		int itemsNumber = 0;
+		if(resource.getResourceItems() != null){
+			itemsNumber = resource.getResourceItems().size();
+			if(resource.isRunAuto() && itemsNumber == 1){
+				ResourceItem item = (ResourceItem) resource.getResourceItems().iterator().next();
+				//only visible item can be run auto.
+				if(!item.isHide()){
+					runAuto = true;
+					request.setAttribute(ResourceConstants.ATTR_RESOURCE_ITEM_UID,item.getUid());
+				}
+			}
+		}
+		request.setAttribute(ResourceConstants.ATTR_RUN_AUTO,new Boolean(runAuto));
+		
+		//check whehter finish lock is on/off
+		boolean lock = resource.getLockWhenFinished() && resourceUser.isSessionFinished();
+		sessionMap.put(ResourceConstants.ATTR_FINISH_LOCK,lock);
+		
+		//set contentInUse flag to true!
+		resource.setContentInUse(true);
+		resource.setDefineLater(false);
+		service.saveOrUpdateResource(resource);
+
+		
+		return mapping.findForward(ResourceConstants.SUCCESS);
+	}
+	/**
+	 * Mark resource item as complete status. 
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	private ActionForward complete(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+		String mode = request.getParameter(AttributeNames.ATTR_MODE);
+		String sessionMapID = request.getParameter(ResourceConstants.ATTR_SESSION_MAP_ID);
+		
+		doComplete(request);
+		
+		request.setAttribute(AttributeNames.ATTR_MODE,mode);
+		request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID,sessionMapID);
+		return  mapping.findForward(ResourceConstants.SUCCESS);
+	}
+	/**
+	 * Finish learning session. 
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
 	private ActionForward finish(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
 		//auto run mode, when use finish the only one resource item, mark it as complete then finish this activity as well.
 		String mode = request.getParameter(AttributeNames.ATTR_MODE);
 		String resourceItemUid = request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID);
 		String runOffline = request.getParameter(ResourceConstants.PARAM_RUN_OFFLINE);
+		
+		//get back SessionMap
+		String sessionMapID = request.getParameter(ResourceConstants.ATTR_SESSION_MAP_ID);
+		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+		
+		Long sessionId =  (Long) sessionMap.get(ResourceConstants.ATTR_TOOL_SESSION_ID);
+		
 		if(resourceItemUid != null){
 			doComplete(request);
 			request.setAttribute(ResourceConstants.ATTR_RUN_AUTO,true);
 		}else
 			request.setAttribute(ResourceConstants.ATTR_RUN_AUTO,false);
 		
-		Long sessionId = (Long) request.getSession().getAttribute(
-				AttributeNames.PARAM_TOOL_SESSION_ID);
 		HttpSession ss = SessionManager.getSession();
 		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 		Long userID = new Long(user.getUserID().longValue());
@@ -132,13 +250,6 @@
 		return mapping.findForward("finish");
 	}
 
-	private ActionForward complete(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
-		String mode = request.getParameter(AttributeNames.ATTR_MODE);
-		doComplete(request);
-		request.setAttribute(AttributeNames.ATTR_MODE,mode);
-		return  mapping.findForward(ResourceConstants.SUCCESS);
-	}
-
 	
 	/**
 	 * Save file or url resource item into database.
@@ -150,8 +261,13 @@
 	 */
 	private ActionForward saveOrUpdateItem(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
+		//get back SessionMap
+		String sessionMapID = request.getParameter(ResourceConstants.ATTR_SESSION_MAP_ID);
+		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+		request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 		
-		Long sessionId = (Long) request.getSession().getAttribute(ResourceConstants.ATTR_TOOL_SESSION_ID);
+		Long sessionId = (Long) sessionMap.get(ResourceConstants.ATTR_TOOL_SESSION_ID);
+		
 		String mode = request.getParameter(AttributeNames.ATTR_MODE);
 		ResourceItemForm itemForm = (ResourceItemForm)form;
 		ActionErrors errors = validateResourceItem(itemForm);
@@ -201,98 +317,15 @@
 		service.saveOrUpdateResourceSession(resSession);
 		
 		//update session value
-		List<ResourceItem> resourceItemList = getResourceItemList(request);
+		List<ResourceItem> resourceItemList = getResourceItemList(sessionMap);
 		resourceItemList.add(item);
 		
 		//URL or file upload
-		request.setAttribute("addType",new Short(type));
+		request.setAttribute(ResourceConstants.ATTR_ADD_RESOURCE_TYPE,new Short(type));
 		request.setAttribute(AttributeNames.ATTR_MODE,mode);
 		return  mapping.findForward(ResourceConstants.SUCCESS);
 	}
-	/**
-	 * Read resource data from database and put them into HttpSession. It will redirect to init.do directly after this
-	 * method run successfully. 
-	 *  
-	 * This method will avoid read database again and lost un-saved resouce item lost when user "refresh page",
-	 * 
-	 */
-	private ActionForward start(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
-		//save toolContentID into HTTPSession
-		String mode = request.getParameter(AttributeNames.ATTR_MODE);
-		
-		Long sessionId =  new Long(request.getParameter(ResourceConstants.PARAM_TOOL_SESSION_ID));
-		request.getSession().setAttribute(ResourceConstants.ATTR_TOOL_SESSION_ID,sessionId);
-		
-//		get back the resource and item list and display them on page
-		IResourceService service = getResourceService();
-		ResourceUser resourceUser = getCurrentUser(service,sessionId);
-
-		List<ResourceItem> items = null;
-		Resource resource;
-		try {
-			items = service.getResourceItemsBySessionId(sessionId);
-			resource = service.getResourceBySessionId(sessionId);
-		} catch (Exception e) {
-			log.error(e);
-			return mapping.findForward(ResourceConstants.ERROR);
-		}
-		
-		
-		//add define later support
-		if(resource.isDefineLater()){
-			return mapping.findForward("defineLater");
-		}
-		//add run offline support
-		if(resource.getRunOffline()){
-			return mapping.findForward("runOffline");
-		}
-				
-		//init resource item list
-		List<ResourceItem> resourceItemList = getResourceItemList(request);
-		resourceItemList.clear();
-		if(items != null){
-			//remove hidden items.
-			for(ResourceItem item : items){
-				if(!item.isHide()){
-					resourceItemList.add(item);
-				}
-			}
-		}
-		
-		//set complete flag for display purpose
-		service.retrieveComplete(resourceItemList, resourceUser);
-		
-		request.getSession().setAttribute(ResourceConstants.ATTR_RESOURCE,resource);
-		
-		//check whether there is only one resource item and run auto flag is true or not.
-		boolean runAuto = false;
-		int itemsNumber = 0;
-		if(resource.getResourceItems() != null){
-			itemsNumber = resource.getResourceItems().size();
-			if(resource.isRunAuto() && itemsNumber == 1){
-				ResourceItem item = (ResourceItem) resource.getResourceItems().iterator().next();
-				//only visible item can be run auto.
-				if(!item.isHide()){
-					runAuto = true;
-					request.setAttribute(ResourceConstants.ATTR_RESOURCE_ITEM_UID,item.getUid());
-				}
-			}
-		}
-		request.setAttribute(ResourceConstants.ATTR_RUN_AUTO,new Boolean(runAuto));
-		
-		//check whehter finish lock is on/off
-		boolean lock = resource.getLockWhenFinished() && resourceUser.isSessionFinished();
-		request.getSession().setAttribute(ResourceConstants.ATTR_FINISH_LOCK,lock);
-		
-		//set contentInUse flag to true!
-		resource.setContentInUse(true);
-		resource.setDefineLater(false);
-		service.saveOrUpdateResource(resource);
-		
-		request.setAttribute(AttributeNames.ATTR_MODE,mode);
-		return mapping.findForward(ResourceConstants.SUCCESS);
-	}
-
+	
 	//*************************************************************************************
 	// Private method 
 	//*************************************************************************************
@@ -305,8 +338,8 @@
 	 * @param request
 	 * @return
 	 */
-	private List getResourceItemList(HttpServletRequest request) {
-		return getListFromSession(request,ResourceConstants.ATTR_RESOURCE_ITEM_LIST);
+	private List getResourceItemList(SessionMap sessionMap) {
+		return getListFromSession(sessionMap,ResourceConstants.ATTR_RESOURCE_ITEM_LIST);
 	}	
 	/**
 	 * Get <code>java.util.List</code> from HttpSession by given name.
@@ -315,14 +348,15 @@
 	 * @param name
 	 * @return
 	 */
-	private List getListFromSession(HttpServletRequest request,String name) {
-		List list = (List) request.getSession().getAttribute(name);
+	private List getListFromSession(SessionMap sessionMap,String name) {
+		List list = (List) sessionMap.get(name);
 		if(list == null){
 			list = new ArrayList();
-			request.getSession().setAttribute(name,list);
+			sessionMap.put(name,list);
 		}
 		return list;
 	}
+
 	/**
 	 * Return <code>ActionForward</code> according to resource item type.
 	 * @param type
@@ -400,18 +434,24 @@
 	/**
 	 * Set complete flag for given resource item.
 	 * @param request
+	 * @param sessionId 
 	 */
 	private void doComplete(HttpServletRequest request) {
+		//get back sessionMap
+		String sessionMapID = request.getParameter(ResourceConstants.ATTR_SESSION_MAP_ID);
+		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+		
 		Long resourceItemUid = new Long(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID));
 		IResourceService service = getResourceService();
 		HttpSession ss = SessionManager.getSession();
 		//get back login user DTO
 		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-		Long sessionId =  (Long) request.getSession().getAttribute(ResourceConstants.ATTR_TOOL_SESSION_ID);
+		
+		Long sessionId =  (Long) sessionMap.get(ResourceConstants.ATTR_TOOL_SESSION_ID);
 		service.setItemComplete(resourceItemUid,new Long(user.getUserID().intValue()),sessionId);
 		
 		//set resource item complete tag
-		List<ResourceItem> resourceItemList = getResourceItemList(request);
+		List<ResourceItem> resourceItemList = getResourceItemList(sessionMap);
 		for(ResourceItem item:resourceItemList){
 			if(item.getUid().equals(resourceItemUid)){
 				item.setComplete(true);
Index: lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp
===================================================================
diff -u -rc25a2c783e51d05045d1fb61981c169357cd3e98 -r92e8b8d1454cfbd9ae8a20934a677340dac3b507
--- lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	(.../instructionsnav.jsp)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
+++ lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	(.../instructionsnav.jsp)	(revision 92e8b8d1454cfbd9ae8a20934a677340dac3b507)
@@ -19,10 +19,10 @@
 					   var reqIDVar = new Date();
 					   //if auto run mode, the opener will be null. 
 					   if(window.parent.opener != null) 
-						    window.parent.opener.location.href="<c:url value="/learning/completeItem.do"/>?mode=${mode}&itemUid=${param.itemUid}&reqID="+reqIDVar.getTime();
+						    window.parent.opener.location.href="<c:url value="/learning/completeItem.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&itemUid=${param.itemUid}&reqID="+reqIDVar.getTime();
 					   else{
 					  		//set complete flag and finish this activity as well.
-					        window.parent.location.href='<c:url value="/learning/finish.do?mode=${mode}&toolSessionID=${param.toolSessionID}&itemUid=${param.itemUid}"/>';
+					        window.parent.location.href='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${param.toolSessionID}&itemUid=${param.itemUid}"/>';
 					   }
 					}
 				   if(window.parent.opener != null) {
Index: lams_tool_larsrc/web/pages/learning/addfile.jsp
===================================================================
diff -u -ra04659fabae48ed06bc29ffed6af69bbd05717b3 -r92e8b8d1454cfbd9ae8a20934a677340dac3b507
--- lams_tool_larsrc/web/pages/learning/addfile.jsp	(.../addfile.jsp)	(revision a04659fabae48ed06bc29ffed6af69bbd05717b3)
+++ lams_tool_larsrc/web/pages/learning/addfile.jsp	(.../addfile.jsp)	(revision 92e8b8d1454cfbd9ae8a20934a677340dac3b507)
@@ -7,6 +7,7 @@
 		<html:form action="/learning/saveOrUpdateItem" method="post" styleId="resourceItemForm" enctype="multipart/form-data">
 			<input type="hidden" name="itemType" id="itemType" value="2" />
 			<input type="hidden" name="mode" value="${param.mode}" />
+			<input type="hidden" name="sessionMapID" value="${param.sessionMapID}" />
 			<table width="100%" border="0" align="left" cellpadding="0" cellspacing="0">
 				<tr>
 					<td colspan="2">
Index: lams_tool_larsrc/web/pages/learning/addurl.jsp
===================================================================
diff -u -ra04659fabae48ed06bc29ffed6af69bbd05717b3 -r92e8b8d1454cfbd9ae8a20934a677340dac3b507
--- lams_tool_larsrc/web/pages/learning/addurl.jsp	(.../addurl.jsp)	(revision a04659fabae48ed06bc29ffed6af69bbd05717b3)
+++ lams_tool_larsrc/web/pages/learning/addurl.jsp	(.../addurl.jsp)	(revision 92e8b8d1454cfbd9ae8a20934a677340dac3b507)
@@ -9,6 +9,7 @@
 		<html:form action="/learning/saveOrUpdateItem" method="post" styleId="resourceItemForm">
 			<input type="hidden" name="itemType" id="itemType" value="1" />
 			<input type="hidden" name="mode" value="${param.mode}" />
+			<input type="hidden" name="sessionMapID" value="${param.sessionMapID}" />
 			<table width="100%" border="0" align="left" cellpadding="0" cellspacing="0">
 				<tr>
 					<td  colspan="2">
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -rc25a2c783e51d05045d1fb61981c169357cd3e98 -r92e8b8d1454cfbd9ae8a20934a677340dac3b507
--- lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 92e8b8d1454cfbd9ae8a20934a677340dac3b507)
@@ -11,36 +11,44 @@
 	<c:if test="${not empty param.mode}">
 		<c:set var="mode" value="${param.mode}" />
 	</c:if>
+	<c:if test="${not empty param.sessionMapID}">
+		<c:set var="sessionMapID" value="${param.sessionMapID}" />
+	</c:if>
 
+	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+	<c:set var="toolSessionID" value="${sessionMap.toolSessionID}"/>
+	<c:set var="resource" value="${sessionMap.resource}"/>
+	<c:set var="finishedLock" value="${sessionMap.finishedLock}"/>
+	
 	<script type="text/javascript">
 	<!--
 		function gotoURL(){
  		    var reqIDVar = new Date();
-			var gurl = "<c:url value="/pages/learning/addurl.jsp"/>?mode=${mode}&reqID="+reqIDVar.getTime();
+			var gurl = "<c:url value="/pages/learning/addurl.jsp"/>?sessionMapID=${sessionMapID}&mode=${mode}&reqID="+reqIDVar.getTime();
 	      	showMessage(gurl);
 	      	return false;
 		}
 		function gotoFile(){
  		    var reqIDVar = new Date();
- 		    var gurl = "<c:url value="/pages/learning/addfile.jsp"/>?mode=${mode}&reqID="+reqIDVar.getTime();
+ 		    var gurl = "<c:url value="/pages/learning/addfile.jsp"/>?sessionMapID=${sessionMapID}&mode=${mode}&reqID="+reqIDVar.getTime();
 	      	showMessage(gurl);
 	      	return false;
 		}
 		function checkNew(){
  		    var reqIDVar = new Date();
-			document.location.href = "<c:url value="/learning/start.do"/>?mode=${mode}&toolSessionID=${toolSessionID}&reqID="+reqIDVar.getTime();
+			document.location.href = "<c:url value="/learning/start.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}&reqID="+reqIDVar.getTime();
  		    return false;
 		}
 		function viewItem(itemUid){
-			var myUrl = "<c:url value="/reviewItem.do"/>?mode=${mode}&toolSessionID=${toolSessionID}&itemUid=" + itemUid;
+			var myUrl = "<c:url value="/reviewItem.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}&itemUid=" + itemUid;
 			launchPopup(myUrl,"LearnerView");
 		}
 		function completeItem(itemUid){
-			document.location.href = "<c:url value="/learning/completeItem.do"/>?mode=${mode}&itemUid=" + itemUid;
+			document.location.href = "<c:url value="/learning/completeItem.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&itemUid=" + itemUid;
 			return false;
 		}
 		function finishSession(){
-			document.location.href ='<c:url value="/learning/finish.do?mode=${mode}&toolSessionID=${toolSessionID}"/>';
+			document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}"/>';
 			return false;
 		}
 		function showMessage(url) {
@@ -80,7 +88,7 @@
 
 					</th>
 				</tr>
-				<c:forEach var="item" items="${resourceList}">
+				<c:forEach var="item" items="${sessionMap.resourceList}">
 					<tr>
 						<td align="center">
 							${item.title}
@@ -96,10 +104,17 @@
 						</td>
 
 						<td>
-							<c:if test="${mode != 'teacher'}">
-								<a href="#" class="button" onclick="return completeItem(${item.uid})"><fmt:message key="label.completed" disabled="${finishedLock}"/></a>
+							<c:if test="${mode != 'teacher' && (not finishedLock)}">
+								<a href="javascript:;" onclick="return completeItem(${item.uid})" class="button">
+									<fmt:message key="label.completed"/>
+								</a>
 							</c:if>
-							<a href="javascript:;" class="button" onclick="viewItem(${item.uid})"><fmt:message key="label.view"  disabled="${finishedLock}"/></a>
+							&nbsp;
+							<c:if test="${not finishedLock}">
+								<a href="javascript:;"  onclick="viewItem(${item.uid})" class="button">
+									<fmt:message key="label.view"/>
+								</a>
+							</c:if>
 						</td>
 					</tr>
 				</c:forEach>
@@ -112,33 +127,37 @@
 				</c:if>
 			</table>
 			<div class="left-buttons">
-				<a href="#" class="button" onclick="return checkNew()"><fmt:message key="label.check.for.new" /></a>
+				<html:button property="checkNewButton" onclick="return checkNew()" disabled="${finishedLock}" styleClass="button">
+					<fmt:message key="label.check.for.new" />
+				</html:button>
 			</div>
 			<c:if test="${mode != 'teacher'}">
 				<div class="right-buttons">
-					<a href="#" class="button space-left" onclick="return finishSession()"> <fmt:message key="label.finished" /> </a>
+					<html:button property="FinishButton"  onclick="return finishSession()" disabled="${finishedLock}"  styleClass="button">
+						<fmt:message key="label.finished" />
+					</html:button>
 				</div>
 			</c:if>
 			<P>&nbsp;</P>
-			<c:if test="${mode != 'teacher'}">
+			<c:if test="${mode != 'teacher' && (not finishedLock)}">
 				<c:if test="${resource.allowAddFiles || resource.allowAddUrls}">
 					<table border="0" align="center" width="100%">
 						<tr>
 							<td style="align:left">
 								<fmt:message key="label.suggest.new" />
 								<c:choose>
 									<c:when test="${resource.allowAddFiles && resource.allowAddUrls}">
-										<input type="radio" name="suggest" value="url" checked="true" onclick="gotoURL()" disabled="${finishedLock}">
+										<input type="radio" name="suggest" value="url" checked="true" onclick="gotoURL()" >
 										<fmt:message key="label.authoring.basic.resource.url.input" /> |
-								<input type="radio" name="suggest" value="file" onclick="gotoFile()">
+										<input type="radio" name="suggest" value="file" onclick="gotoFile()">
 										<fmt:message key="label.authoring.basic.resource.file.input" />
 									</c:when>
 									<c:when test="${resource.allowAddFiles && !resource.allowAddUrls}">
-										<input type="radio" name="suggest" value="file" checked="true" onclick="gotoFile()" disabled="${finishedLock}">
+										<input type="radio" name="suggest" value="file" checked="true" onclick="gotoFile()">
 										<fmt:message key="label.authoring.basic.resource.file.input" />
 									</c:when>
 									<c:when test="${!resource.allowAddFiles && resource.allowAddUrls}">
-										<input type="radio" name="suggest" value="url" checked="true" onclick="gotoURL()" disabled="${finishedLock}">
+										<input type="radio" name="suggest" value="url" checked="true" onclick="gotoURL()">
 										<fmt:message key="label.authoring.basic.resource.url.input" />
 									</c:when>
 								</c:choose>
@@ -156,21 +175,21 @@
 					<c:when test="${resource.allowAddFiles && resource.allowAddUrls}">
 						<script type="text/javascript">
 					<!--
-						showMessage("<c:url value='/pages/learning/addurl.jsp'/>?mode=${mode}");
+						showMessage("<c:url value='/pages/learning/addurl.jsp'/>?sessionMapID=${sessionMapID}&mode=${mode}");
 					-->
 				</script>
 					</c:when>
 					<c:when test="${resource.allowAddFiles && !resource.allowAddUrls}">
 						<script type="text/javascript">
 					<!--
-						showMessage("<c:url value='/pages/learning/addfile.jsp'/>?mode=${mode}");
+						showMessage("<c:url value='/pages/learning/addfile.jsp'/>?sessionMapID=${sessionMapID}&mode=${mode}");
 					-->
 				</script>
 					</c:when>
 					<c:when test="${!resource.allowAddFiles && resource.allowAddUrls}">
 						<script type="text/javascript">
 					<!--
-						showMessage("<c:url value='/pages/learning/addurl.jsp'/>?mode=${mode}");
+						showMessage("<c:url value='/pages/learning/addurl.jsp'/>?sessionMapID=${sessionMapID}&mode=${mode}");
 					-->
 				</script>
 					</c:when>
Index: lams_tool_larsrc/web/pages/learning/start.jsp
===================================================================
diff -u -r0323e71ffd563ef7cd2bc6560e0fc5428f998268 -r92e8b8d1454cfbd9ae8a20934a677340dac3b507
--- lams_tool_larsrc/web/pages/learning/start.jsp	(.../start.jsp)	(revision 0323e71ffd563ef7cd2bc6560e0fc5428f998268)
+++ lams_tool_larsrc/web/pages/learning/start.jsp	(.../start.jsp)	(revision 92e8b8d1454cfbd9ae8a20934a677340dac3b507)
@@ -5,12 +5,12 @@
 		<c:choose>
 			<c:when test="${runAuto}">
 				<script type="text/javascript">
-					document.location = "<c:url value="/reviewItem.do"/>?mode=${mode}&toolSessionID=${toolSessionID}&itemUid=${itemUid}";
+					document.location = "<c:url value="/reviewItem.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}&itemUid=${itemUid}";
 				</script>
 			</c:when>
 			<c:otherwise>
 				<script type="text/javascript">
-					document.location = "<c:url value="/pages/learning/learning.jsp?mode=${mode}"/>"
+					document.location = "<c:url value="/pages/learning/learning.jsp?sessionMapID=${sessionMapID}&mode=${mode}"/>"
 				</script>
 			</c:otherwise>
 		</c:choose>
Index: lams_tool_larsrc/web/pages/learning/success.jsp
===================================================================
diff -u -r1e633dd70ea6f5461605ec545fd608e876354db0 -r92e8b8d1454cfbd9ae8a20934a677340dac3b507
--- lams_tool_larsrc/web/pages/learning/success.jsp	(.../success.jsp)	(revision 1e633dd70ea6f5461605ec545fd608e876354db0)
+++ lams_tool_larsrc/web/pages/learning/success.jsp	(.../success.jsp)	(revision 92e8b8d1454cfbd9ae8a20934a677340dac3b507)
@@ -8,14 +8,14 @@
 	<body>
 		<script type="text/javascript">
 			var reqIDVar = new Date();
-			window.parent.location.href  = "${tool}/pages/learning/learning.jsp?mode=${mode}&reqID="+reqIDVar.getTime();
+			window.parent.location.href  = "${tool}/pages/learning/learning.jsp?sessionMapID=${sessionMapID}&mode=${mode}&reqID="+reqIDVar.getTime();
 		</script>
 		<div style="align:center">
 			<c:if test="${addType == 1}">
-				Add URL success, <a href="<c:url value='/pages/learning/addurl.jsp'/>?mode=${mode}" target="newResourceFrame">click here to return</a>.
+				Add URL success, <a href="<c:url value='/pages/learning/addurl.jsp'/>?sessionMapID=${sessionMapID}&mode=${mode}" target="newResourceFrame">click here to return</a>.
 			</c:if>
 			<c:if test="${addType == 2}">
-				Add File success, <a href="<c:url value='/pages/learning/addfile.jsp'/>?mode=${mode}" target="newResourceFrame">click here to return</a>.
+				Add File success, <a href="<c:url value='/pages/learning/addfile.jsp'/>?sessionMapID=${sessionMapID}&mode=${mode}" target="newResourceFrame">click here to return</a>.
 			</c:if>
 		</div>
 	</body>