Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
===================================================================
diff -u -r331f6f481ec1c886ced250c898e7be589e1e5b8d -ra780ca2abc108cb1fc24396a2429461b7973f16a
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision 331f6f481ec1c886ced250c898e7be589e1e5b8d)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision a780ca2abc108cb1fc24396a2429461b7973f16a)
@@ -81,5 +81,6 @@
 	
 	
 	public static final String PAGE_EDITABLE = "isPageEditable";
+	public static final String MODE_AUTHOR_SESSION = "author_session";
 
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java
===================================================================
diff -u -r331f6f481ec1c886ced250c898e7be589e1e5b8d -ra780ca2abc108cb1fc24396a2429461b7973f16a
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java	(.../ViewItemAction.java)	(revision 331f6f481ec1c886ced250c898e7be589e1e5b8d)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java	(.../ViewItemAction.java)	(revision a780ca2abc108cb1fc24396a2429461b7973f16a)
@@ -194,12 +194,12 @@
 	 */
 	private ResourceItem getResourceItem(HttpServletRequest request, String mode) {
 		ResourceItem item = null;		
-		if(ToolAccessMode.AUTHOR.toString().equals(mode)){
+		if(ResourceConstants.MODE_AUTHOR_SESSION.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 = getResourceItemList(request);
 			item = resourceList.get(itemIdx);
-		}else if(ToolAccessMode.LEARNER.toString().equals(mode) || ToolAccessMode.TEACHER.toString().equals(mode)){
+		}else{
 			Long itemUid = NumberUtils.createLong(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID));
 //			get back the resource and item list and display them on page
 			IResourceService service = getResourceService();			
Index: lams_tool_larsrc/web/pages/authoring/basic.jsp
===================================================================
diff -u -r4b2f70cacb14957b460cb9bad28c45ebad7b3f85 -ra780ca2abc108cb1fc24396a2429461b7973f16a
--- lams_tool_larsrc/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 4b2f70cacb14957b460cb9bad28c45ebad7b3f85)
+++ lams_tool_larsrc/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision a780ca2abc108cb1fc24396a2429461b7973f16a)
@@ -22,7 +22,8 @@
 
 	function previewItem(type,idx){
 		//1:url, 2:file, 3:website,4:learning object
-		var myUrl = "<c:url value='/reviewItem.do?mode=author&itemIndex='/>"+idx;
+		//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;
 		launchPopup(myUrl,"Review");
 	}
 	
Index: lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp
===================================================================
diff -u -r4b2f70cacb14957b460cb9bad28c45ebad7b3f85 -ra780ca2abc108cb1fc24396a2429461b7973f16a
--- lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	(.../instructionsnav.jsp)	(revision 4b2f70cacb14957b460cb9bad28c45ebad7b3f85)
+++ lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	(.../instructionsnav.jsp)	(revision a780ca2abc108cb1fc24396a2429461b7973f16a)
@@ -9,7 +9,8 @@
 		<script language="JavaScript" type="text/JavaScript">
 		<!--
 				function finishIns(){
-					if(${param.mode == "learner"}){
+				//learner and author(preview mode) will mark the finish
+					if(${param.mode == "learner"} || ${param.mode == "author"}){
 					   var reqIDVar = new Date();
 					   //if auto run mode, the opener will be null
 					   if(window.parent.opener != null)