Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
===================================================================
diff -u -r694dd2c529990a94c17576dce6c98e5b821532e0 -re64e0e3ca5c8b2f090ffc15cb9c8346f0cbe2ca4
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision 694dd2c529990a94c17576dce6c98e5b821532e0)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision e64e0e3ca5c8b2f090ffc15cb9c8346f0cbe2ca4)
@@ -139,8 +139,6 @@
 
     public static final String PAGE_EDITABLE = "isPageEditable";
 
-    public static final String MODE_AUTHOR_SESSION = "author_session";
-
     public static final String ATTR_REFLECTION_ON = "reflectOn";
 
     public static final String ATTR_REFLECTION_INSTRUCTION = "reflectInstructions";
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/ViewItemController.java
===================================================================
diff -u -r0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10 -re64e0e3ca5c8b2f090ffc15cb9c8346f0cbe2ca4
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/ViewItemController.java	(.../ViewItemController.java)	(revision 0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/ViewItemController.java	(.../ViewItemController.java)	(revision e64e0e3ca5c8b2f090ffc15cb9c8346f0cbe2ca4)
@@ -65,19 +65,28 @@
 	String sessionMapID = WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID, true);
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(sessionMapID);
-	sessionMap.put(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER);
-	ResourceItem item = getResourceItem(request, sessionMap, ToolAccessMode.TEACHER.toString());
+	String mode = request.getParameter(AttributeNames.ATTR_MODE);
+	if (mode.equals(ToolAccessMode.TEACHER.toString())) {
+	    sessionMap.put(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER);
+	} else {
+	    sessionMap.put(AttributeNames.ATTR_MODE, ToolAccessMode.AUTHOR);
+	}
 
+	ResourceItem item = getResourceItem(request, sessionMap, mode);
+
 	if (item == null) {
 	    return "error";
 	}
 
 	Long itemUid = NumberUtils.createLong(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID));
 	request.setAttribute(ResourceConstants.PARAM_RESOURCE_ITEM_UID, itemUid);
+	Integer itemIdx = WebUtil.readIntParam(request, ResourceConstants.PARAM_ITEM_INDEX, true);
+	request.setAttribute(ResourceConstants.PARAM_ITEM_INDEX, itemIdx);
 	String idStr = request.getParameter(ResourceConstants.ATTR_TOOL_SESSION_ID);
 	Long sessionId = NumberUtils.createLong(idStr);
 	request.setAttribute(ResourceConstants.ATTR_TOOL_SESSION_ID, sessionId);
 	request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+	request.setAttribute(ResourceConstants.ATTR_TITLE, item.getTitle());
 
 	return "pages/itemreview/mainframe";
     }
@@ -118,7 +127,6 @@
 	    return "error";
 	}
 
-	Integer itemIdx = WebUtil.readIntParam(request, ResourceConstants.PARAM_ITEM_INDEX, true);
 	String reviewUrl = getReviewUrl(item, sessionMapID);
 	request.setAttribute(ResourceConstants.ATTR_RESOURCE_REVIEW_URL, reviewUrl);
 	if (item.getType() == ResourceConstants.RESOURCE_TYPE_URL) {
@@ -134,8 +142,10 @@
 
 	// these attribute will be use to instruction navigator page
 	request.setAttribute(AttributeNames.ATTR_MODE, mode);
-	request.setAttribute(ResourceConstants.PARAM_ITEM_INDEX, itemIdx);
-	Long itemUid = NumberUtils.createLong(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID));
+	Long itemUid = WebUtil.readLongParam(request, ResourceConstants.PARAM_RESOURCE_ITEM_UID, true);
+	if (itemUid == null) {
+	    itemUid = 0L;
+	}
 	request.setAttribute(ResourceConstants.PARAM_RESOURCE_ITEM_UID, itemUid);
 	request.setAttribute(ResourceConstants.ATTR_TOOL_SESSION_ID, sessionId);
 	request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID, sessionMapID);
@@ -177,12 +187,12 @@
     private ResourceItem getResourceItem(HttpServletRequest request, SessionMap<String, Object> sessionMap,
 	    String mode) {
 	ResourceItem item = null;
-	if (ResourceConstants.MODE_AUTHOR_SESSION.equals(mode)) {
+	if (ToolAccessMode.AUTHOR.toString().equals(mode)) {
 	    int itemIdx = NumberUtils.stringToInt(request.getParameter(ResourceConstants.PARAM_ITEM_INDEX), 0);
 	    // authoring: does not save item yet, so only has ItemList from session and identity by Index
 	    List<ResourceItem> resourceList = new ArrayList<>(getResourceItemList(sessionMap));
 	    item = resourceList.get(itemIdx);
-	} else if ("teacher".equals(mode)) {
+	} else if (ToolAccessMode.TEACHER.toString().equals(mode)) {
 	    Long itemUid = NumberUtils.createLong(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID));
 	    // get back the resource and item list and display them on page
 	    item = resourceService.getResourceItemByUid(itemUid);
Index: lams_tool_larsrc/web/pages/authoring/basic.jsp
===================================================================
diff -u -r326782acda142b33013dcb8a4b57ef62a5669914 -re64e0e3ca5c8b2f090ffc15cb9c8346f0cbe2ca4
--- lams_tool_larsrc/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 326782acda142b33013dcb8a4b57ef62a5669914)
+++ lams_tool_larsrc/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision e64e0e3ca5c8b2f090ffc15cb9c8346f0cbe2ca4)
@@ -21,7 +21,7 @@
 	function previewItem(type,idx,sessionMapID){
 		//1:url, 2:file
 		//This mode is special for unsaved author page. It is different with the author mode in preview 
-		var myUrl = "<c:url value='/reviewItem.do?mode=author_session&itemIndex='/>"+idx+"&sessionMapID="+sessionMapID;
+		var myUrl = "<c:url value='/reviewItem.do?mode=author&itemIndex='/>"+idx+"&sessionMapID="+sessionMapID;
 		launchPopup(myUrl,"Review");
 	}
 	
Index: lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r326782acda142b33013dcb8a4b57ef62a5669914 -re64e0e3ca5c8b2f090ffc15cb9c8346f0cbe2ca4
--- lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 326782acda142b33013dcb8a4b57ef62a5669914)
+++ lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision e64e0e3ca5c8b2f090ffc15cb9c8346f0cbe2ca4)
@@ -14,7 +14,7 @@
 		<c:forEach var="resource" items="${sessionMap.resourceList}"
 			varStatus="status">
 			<tr>
-				<%-- Resource Type:1=URL,2=File,3=Website,4=Learning Object --%>
+				<%-- Resource Type:1=URL,2=File--%>
 				<c:if test="${resource.type == 1}">
 					<td>
 						<span class="field-name"> <fmt:message
@@ -24,7 +24,7 @@
 					<td width="10%">
 						<a href="#"
 							onclick="previewItem(1,${status.index},'${sessionMapID}')"> <fmt:message
-								key="label.authoring.basic.resource.verify.url" /> </a>
+								key="label.authoring.basic.resource.preview" /> </a>
 					</td>
 				</c:if>
 
@@ -34,7 +34,7 @@
 								key="label.authoring.basic.resource.file" /> : </span>
 						<c:out value="${resource.title}" escapeXml="true"/>
 					</td>
-					<td>
+					<td width="10%">
 						<a href="#"
 							onclick="previewItem(2,${status.index},'${sessionMapID}')"> <fmt:message
 								key="label.authoring.basic.resource.preview" /> </a>
Index: lams_tool_larsrc/web/pages/itemreview/mainframe.jsp
===================================================================
diff -u -r0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10 -re64e0e3ca5c8b2f090ffc15cb9c8346f0cbe2ca4
--- lams_tool_larsrc/web/pages/itemreview/mainframe.jsp	(.../mainframe.jsp)	(revision 0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10)
+++ lams_tool_larsrc/web/pages/itemreview/mainframe.jsp	(.../mainframe.jsp)	(revision e64e0e3ca5c8b2f090ffc15cb9c8346f0cbe2ca4)
@@ -24,7 +24,7 @@
 	
 	<script>
 		$(document).ready(function(){
-			$('.item-panel').load("<c:url value="/itemReviewContent.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}&itemUid=${itemUid}");
+			$('.item-panel').load("<c:url value="/itemReviewContent.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}&itemIndex=${itemIndex}&itemUid=${itemUid}");
  		});
 
 		function setIframeHeight(panel) {
@@ -64,7 +64,6 @@
 </lams:head>
 
 <body class="stripes">
-	<c:set var="title"><fmt:message key="export.label.resource" /></c:set>
 	<lams:Page title="${title}" type="learner" hideProgressBar="true">
 		<div class="item-panel"></div>
 	</lams:Page>