Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java
===================================================================
diff -u -r214e4972a0db93d9932b226f96b424849c8aacea -rf0e43a945b290c73971b75babd77d0b4a2fac1d5
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java	(.../NotebookAction.java)	(revision 214e4972a0db93d9932b226f96b424849c8aacea)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java	(.../NotebookAction.java)	(revision f0e43a945b290c73971b75babd77d0b4a2fac1d5)
@@ -21,7 +21,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.learning.web.action;
 
 import java.io.IOException;
@@ -32,7 +31,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
@@ -47,7 +45,6 @@
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.exception.UserAccessDeniedException;
 import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.web.context.WebApplicationContext;
@@ -60,13 +57,9 @@
     // ---------------------------------------------------------------------
     // Instance variables
     // ---------------------------------------------------------------------
-    private static Logger log = Logger.getLogger(NotebookAction.class);
-
     private static final String VIEW_ALL = "viewAll";
     private static final String VIEW_SINGLE = "viewSingle";
     private static final String VIEW_JOURNALS = "viewJournals";
-    private static final String ADD_NEW = "addNew";
-    private static final String SAVE_SUCCESS = "saveSuccess";
 
     public ICoreNotebookService getNotebookService() {
 	WebApplicationContext webContext = WebApplicationContextUtils
@@ -89,7 +82,10 @@
 	Integer learnerID = LearningWebUtil.getUserId();
 
 	// lessonID
-	Long lessonID = (Long) notebookForm.get(AttributeNames.PARAM_LESSON_ID);
+	Long lessonID = (Long) notebookForm.get("currentLessonID");
+	if (lessonID == null || lessonID == 0) {
+	    lessonID = (Long) notebookForm.get(AttributeNames.PARAM_LESSON_ID);
+	}
 
 	// get all notebook entries for the learner
 
@@ -140,7 +136,7 @@
 	}
 
 	request.getSession().setAttribute("journals", journals);
-	request.setAttribute("lessonID", lessonID);
+	request.setAttribute(AttributeNames.PARAM_LESSON_ID, lessonID);
 
 	return mapping.findForward(NotebookAction.VIEW_JOURNALS);
     }
@@ -174,6 +170,7 @@
 
 	DynaActionForm notebookForm = (DynaActionForm) actionForm;
 	Long uid = (Long) notebookForm.get("uid");
+	Long currentLessonID = (Long) notebookForm.get("currentLessonID");
 	String mode = WebUtil.readStrParam(request, "mode", true);
 
 	NotebookEntry entry = notebookService.getEntry(uid);
@@ -186,6 +183,10 @@
 	    request.setAttribute("entry", entry);
 	}
 
+	if (currentLessonID != null) {
+	    request.setAttribute("currentLessonID", currentLessonID);
+	}
+
 	return mapping.findForward(NotebookAction.VIEW_SINGLE);
     }
 
@@ -208,7 +209,7 @@
 	notebookService.createNotebookEntry(id, CoreNotebookConstants.SCRATCH_PAD, signature, userID, title, entry);
 
 	boolean skipViewAll = WebUtil.readBooleanParam(request, "skipViewAll", false);
-	return skipViewAll ? null : mapping.findForward("viewAllRedirect");
+	return skipViewAll ? null : viewAll(mapping, actionForm, request, response);
     }
 
     /**
@@ -223,7 +224,6 @@
 	// get form data
 	DynaActionForm notebookForm = (DynaActionForm) actionForm;
 	Long uid = (Long) notebookForm.get("uid");
-	Long id = (Long) notebookForm.get(AttributeNames.PARAM_LESSON_ID);
 	String title = (String) notebookForm.get("title");
 	String entry = (String) notebookForm.get("entry");
 	String signature = (String) notebookForm.get("signature");
@@ -244,7 +244,7 @@
 
 	notebookService.updateEntry(entryObj);
 
-	return mapping.findForward("viewAllRedirect");
+	return viewAll(mapping, actionForm, request, response);
 
     }
 
Index: lams_learning/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r75496fa1baab1302fe097cce2183029e19285ebf -rf0e43a945b290c73971b75babd77d0b4a2fac1d5
--- lams_learning/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 75496fa1baab1302fe097cce2183029e19285ebf)
+++ lams_learning/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision f0e43a945b290c73971b75babd77d0b4a2fac1d5)
@@ -55,6 +55,7 @@
 	<form-property name="title" type="java.lang.String" />
 	<form-property name="entry" type="java.lang.String" />
 	<form-property name="lessonID" type="java.lang.Long" />
+	<form-property name="currentLessonID" type="java.lang.Long" />
 	<form-property name="signature" type="java.lang.String" />
 </form-bean>
 
@@ -117,11 +118,6 @@
         redirect="false"
       />
       <forward
-        name="viewAllRedirect"
-        path="/notebook.do?method=viewAll"
-        redirect="true"
-      />
-      <forward
         name="viewSingle"
         path=".notebookViewSingle"
         redirect="false"
Index: lams_learning/web/notebook/addnew.jsp
===================================================================
diff -u -r0ddeb3a1dcf29cbbba6ed0fccbd139f9c31c347f -rf0e43a945b290c73971b75babd77d0b4a2fac1d5
--- lams_learning/web/notebook/addnew.jsp	(.../addnew.jsp)	(revision 0ddeb3a1dcf29cbbba6ed0fccbd139f9c31c347f)
+++ lams_learning/web/notebook/addnew.jsp	(.../addnew.jsp)	(revision f0e43a945b290c73971b75babd77d0b4a2fac1d5)
@@ -48,6 +48,7 @@
 	<html:form action="/notebook.do?method=processNewEntry" styleId="notebookForm" method="post">
 
 		<html:hidden property="signature" />
+		<html:hidden property="currentLessonID" value="${param.currentLessonID}" />
 		<html:hidden property="lessonID" value="${param.lessonID}" />
 
 		<div class="lead">
Index: lams_learning/web/notebook/view.jsp
===================================================================
diff -u -r5d5ceb96e20cf8669cb5f59151e172f912221f26 -rf0e43a945b290c73971b75babd77d0b4a2fac1d5
--- lams_learning/web/notebook/view.jsp	(.../view.jsp)	(revision 5d5ceb96e20cf8669cb5f59151e172f912221f26)
+++ lams_learning/web/notebook/view.jsp	(.../view.jsp)	(revision f0e43a945b290c73971b75babd77d0b4a2fac1d5)
@@ -58,7 +58,8 @@
 		<html:hidden property="uid" value="${entry.uid}" />
 		<html:hidden property="signature" />
 		<html:hidden property="lessonID" value="${entry.externalID}" />
-
+		<html:hidden property="currentLessonID" value="${empty currentLessonID ? param.currentLessonID : currentLessonID}" />
+		
 		<!-- set title -->
 		<c:set var="title">
 			<c:choose>
@@ -139,15 +140,18 @@
 						</c:when>
 						<c:otherwise>
 							<c:set var="editnote">
-								<html:rewrite page="/notebook.do?method=viewEntry&mode=edit&uid=" />
+								<html:rewrite page="/notebook.do?method=viewEntry&mode=edit&currentLessonID=${param.currentLessonID}&uid=" />
 								<c:out value="${entry.uid}" />
 							</c:set>
 							<c:if test="${entry.externalSignature != scratchJournalSig}">
 								<a href="${editnote}" class="btn btn-default" id="saveBtn">
 									<fmt:message key="label.edit.button" />
 								</a>
 							</c:if>
-							<a href="javascript: history.back();" class="btn btn-default" id="viewAllBtn">
+							<c:set var="viewAll">
+								<html:rewrite page="/notebook.do?method=viewAll&currentLessonID=${param.currentLessonID}" />
+							</c:set>
+							<a href="${viewAll}" class="btn btn-default" id="viewAllBtn">
 								<fmt:message key="mynotes.view.all.button" />
 							</a>
 						</c:otherwise>
Index: lams_learning/web/notebook/viewall.jsp
===================================================================
diff -u -r6f033f32d8bbde1303782d75a2ad8679536a7d1b -rf0e43a945b290c73971b75babd77d0b4a2fac1d5
--- lams_learning/web/notebook/viewall.jsp	(.../viewall.jsp)	(revision 6f033f32d8bbde1303782d75a2ad8679536a7d1b)
+++ lams_learning/web/notebook/viewall.jsp	(.../viewall.jsp)	(revision f0e43a945b290c73971b75babd77d0b4a2fac1d5)
@@ -35,16 +35,14 @@
 </c:set>
 
 <lams:Page type="learner" title="${title}" hideProgressBar="true">
-	<c:if test="${empty entries}">
-		<c:set var="addnote">
-			<html:rewrite page="/notebook/add.do?lessonID=" />
-			<c:out value="${lessonID}" />
-		</c:set>
-		<div class="pull-right">
-			<a href="${addnote}" class="btn btn-default pull-right" id="addNewBtn"><fmt:message
-					key="mynotes.add.new.current.lesson.button" /></a>
-		</div>
-	</c:if>
+	<c:set var="addnote">
+		<html:rewrite page="/notebook/add.do?lessonID=" />
+		<c:out value="${lessonID}" />
+	</c:set>
+	<div class="pull-right">
+		<a href="${addnote}" class="btn btn-default pull-right" id="addNewBtn"><fmt:message
+				key="mynotes.add.new.current.lesson.button" /></a>
+	</div>
 	
 	<div class="lead">
 		<fmt:message key="mynotes.view.all.button" />
@@ -63,7 +61,7 @@
 				</c:set>
 
 				<c:set var="addnote">
-					<html:rewrite page="/notebook/add.do?lessonID=" />
+					<html:rewrite page="/notebook/add.do?currentLessonID=${lessonID}&lessonID=" />
 					<c:out value="${entry.externalID}" />
 				</c:set>
 
@@ -120,7 +118,7 @@
 
 							<tr>
 								<td class="align-left" width="28%"><c:set var="viewnote">
-										<html:rewrite page="/notebook.do?method=viewEntry&uid=" />
+										<html:rewrite page="/notebook.do?method=viewEntry&currentLessonID=${lessonID}&uid=" />
 										<c:out value="${entry.uid}" />
 									</c:set> <html:link href="${viewnote}">
 										<c:choose>