Index: lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rad2a44cf5737f17483ecb2a732b0d6adcaad8078
--- lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java	(.../CoreNotebookService.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java	(.../CoreNotebookService.java)	(revision ad2a44cf5737f17483ecb2a732b0d6adcaad8078)
@@ -61,27 +61,28 @@
     }
 
     @Override
-    public TreeMap<Long, List<NotebookEntry>> getEntryByLesson(Integer userID, Integer idType) {
-	TreeMap<Long, List<NotebookEntry>> entryMap = new TreeMap<Long, List<NotebookEntry>>();
-	List<NotebookEntry> list = getEntry(userID, idType);
+    public TreeMap<Long, List<NotebookEntry>> getEntriesGroupedByLesson(Integer userID) {
+	TreeMap<Long, List<NotebookEntry>> lessonIdToEntriesMap = new TreeMap<Long, List<NotebookEntry>>();
+	List<NotebookEntry> entries = getEntry(userID, CoreNotebookConstants.SCRATCH_PAD);
 
-	for (NotebookEntry entry : list) {
-	    if (entryMap.containsKey(entry.getExternalID())) {
-		String lessonName = entryMap.get(entry.getExternalID()).get(0).getLessonName();
+	for (NotebookEntry entry : entries) {
+	    if (lessonIdToEntriesMap.containsKey(entry.getExternalID())) {
+		String lessonName = lessonIdToEntriesMap.get(entry.getExternalID()).get(0).getLessonName();
 		entry.setLessonName(lessonName);
-		entryMap.get(entry.getExternalID()).add(entry);
+		lessonIdToEntriesMap.get(entry.getExternalID()).add(entry);
+		
 	    } else {
 		Lesson lesson = (Lesson) baseDAO.find(Lesson.class, entry.getExternalID());
 		List<NotebookEntry> newEntryList = new ArrayList<NotebookEntry>();
 
 		entry.setLessonName(lesson.getLessonName());
 		newEntryList.add(entry);
 
-		entryMap.put(entry.getExternalID(), newEntryList);
+		lessonIdToEntriesMap.put(entry.getExternalID(), newEntryList);
 	    }
 	}
 
-	return entryMap;
+	return lessonIdToEntriesMap;
     }
 
     @Override
Index: lams_common/src/java/org/lamsfoundation/lams/notebook/service/ICoreNotebookService.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rad2a44cf5737f17483ecb2a732b0d6adcaad8078
--- lams_common/src/java/org/lamsfoundation/lams/notebook/service/ICoreNotebookService.java	(.../ICoreNotebookService.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_common/src/java/org/lamsfoundation/lams/notebook/service/ICoreNotebookService.java	(.../ICoreNotebookService.java)	(revision ad2a44cf5737f17483ecb2a732b0d6adcaad8078)
@@ -36,7 +36,7 @@
 
     Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String title, String entry);
 
-    TreeMap<Long, List<NotebookEntry>> getEntryByLesson(Integer userID, Integer idType);
+    TreeMap<Long, List<NotebookEntry>> getEntriesGroupedByLesson(Integer userID);
 
     List<NotebookEntry> getEntry(Long id, Integer idType, String signature, Integer userID);
 
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java
===================================================================
diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -rad2a44cf5737f17483ecb2a732b0d6adcaad8078
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java	(.../NotebookController.java)	(revision f2ad75cef0c507a64877942631fee13efbc6ed50)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java	(.../NotebookController.java)	(revision ad2a44cf5737f17483ecb2a732b0d6adcaad8078)
@@ -66,7 +66,6 @@
     @RequestMapping("/viewAll")
     public String viewAll(@ModelAttribute NotebookForm notebookForm, HttpServletRequest request)
 	    throws IOException, ServletException {
-
 	// getting requested object according to coming parameters
 	Integer learnerID = LearningWebUtil.getUserId();
 
@@ -77,15 +76,11 @@
 	}
 
 	// get all notebook entries for the learner
-
-	TreeMap<Long, List<NotebookEntry>> entries = coreNotebookService.getEntryByLesson(learnerID,
-		CoreNotebookConstants.SCRATCH_PAD);
-
+	TreeMap<Long, List<NotebookEntry>> entries = coreNotebookService.getEntriesGroupedByLesson(learnerID);
 	request.getSession().setAttribute("entries", entries.values());
 	request.setAttribute("lessonID", lessonID);
 
 	return "notebook/viewall";
-
     }
 
     /**
@@ -109,7 +104,8 @@
 	}
 
 	// List of Journal entries
-	List<NotebookEntry> journals = getJournals(lesson.getLessonId());
+	List<NotebookEntry> journals = coreNotebookService.getEntry(lesson.getLessonId(), CoreNotebookConstants.SCRATCH_PAD,
+		CoreNotebookConstants.JOURNAL_SIG);
 	request.getSession().setAttribute("journals", journals);
 	request.setAttribute(AttributeNames.PARAM_LESSON_ID, lessonID);
 
@@ -118,7 +114,6 @@
 
     // check user has permission to access all the journals for a lesson
     private boolean hasStaffAccessToJournals(User user, Lesson lesson) {
-
 	if (lesson == null) {
 	    return false;
 	}
@@ -137,23 +132,6 @@
     }
 
     /**
-     *
-     * @param lessonID
-     *            Lesson to get the journals from.
-     * @return List of Journal entries
-     */
-    private List<NotebookEntry> getJournals(Long lessonID) {
-	// initialize service object
-
-	if (lessonID == null) {
-	    return null;
-	}
-
-	return coreNotebookService.getEntry(lessonID, CoreNotebookConstants.SCRATCH_PAD, CoreNotebookConstants.JOURNAL_SIG);
-
-    }
-
-    /**
      * View single notebook entry
      */
     @RequestMapping("/viewEntry")
@@ -199,9 +177,6 @@
 	return "notebook/addnew";
     }
 
-    /**
-     *
-     */
     @RequestMapping("/processNewEntry")
     public String processNewEntry(@ModelAttribute("notebookForm") NotebookForm notebookForm, HttpServletRequest request)
 	    throws IOException, ServletException {
@@ -218,9 +193,6 @@
 	return skipViewAll ? null : viewAll(notebookForm, request);
     }
 
-    /**
-     *
-     */
     @RequestMapping(path = "/updateEntry")
     public String updateEntry(@ModelAttribute("notebookForm") NotebookForm notebookForm, HttpServletRequest request)
 	    throws IOException, ServletException {
@@ -247,7 +219,6 @@
 	coreNotebookService.updateEntry(entryObj);
 
 	return viewAll(notebookForm, request);
-
     }
 
 }
\ No newline at end of file
Index: lams_learning/web/notebook/addnew.jsp
===================================================================
diff -u -r37456eedc8b0580b57b6fcb255323c5c49943119 -rad2a44cf5737f17483ecb2a732b0d6adcaad8078
--- lams_learning/web/notebook/addnew.jsp	(.../addnew.jsp)	(revision 37456eedc8b0580b57b6fcb255323c5c49943119)
+++ lams_learning/web/notebook/addnew.jsp	(.../addnew.jsp)	(revision ad2a44cf5737f17483ecb2a732b0d6adcaad8078)
@@ -22,21 +22,15 @@
 <!DOCTYPE html>
 <%@ page import="org.lamsfoundation.lams.notebook.service.CoreNotebookConstants"%>
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="scratchPadSig">
-	<%=CoreNotebookConstants.SCRATCH_PAD_SIG%>
-</c:set>
-<c:set var="scratchJournalSig">
-	<%=CoreNotebookConstants.JOURNAL_SIG%>
-</c:set>
+<c:set var="scratchPadSig"><%=CoreNotebookConstants.SCRATCH_PAD_SIG%></c:set>
+<c:set var="scratchJournalSig"><%=CoreNotebookConstants.JOURNAL_SIG%></c:set>
+<c:set var="lams"><lams:LAMSURL /></c:set>
 	
 <lams:html>
 <lams:head>
 	<title><fmt:message key="mynotes.title" /></title>
 
 	<lams:css />
-	<c:set var="lams">
-		<lams:LAMSURL />
-	</c:set>
 
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
@@ -69,16 +63,22 @@
 				<label for="title"><fmt:message key="mynotes.entry.title.label"></fmt:message></label>
 				<form:input path="title" id="title" cssClass="form-control"/>
 			</div> 
+			
 			<div class="form-group">
 				<label for="entry"><fmt:message key="mynotes.entry.entry.label"></fmt:message></label>
 				<form:textarea path="entry" id="entry" cssClass="form-control" rows="8" />
-			</div> 
+			</div>
+			
 			<div class="voffset10 pull-right">
-				<a href="#" class="btn btn-default" id="saveInNotebookBtn"
-					onClick="doSubmit('${scratchPadSig}')"><fmt:message
-						key="mynotes.notebook.save.button" /></a> <a href="#" class="btn btn-default" id="saveInJournalBtn"
-					onClick="doSubmit('${scratchJournalSig}')"><fmt:message key="mynotes.journal.save.button" /></a>
-				<a href="javascript: history.back();" class="btn btn-default" id="cancelBtn"><fmt:message key="label.cancel.button" /></a>
+				<a href="#" class="btn btn-default" id="saveInNotebookBtn" onClick="doSubmit('${scratchPadSig}')">
+					<fmt:message key="mynotes.notebook.save.button" />
+				</a> 
+				<a href="#" class="btn btn-default" id="saveInJournalBtn" onClick="doSubmit('${scratchJournalSig}')">
+					<fmt:message key="mynotes.journal.save.button" />
+				</a>
+				<a href="javascript: history.back();" class="btn btn-default" id="cancelBtn">
+					<fmt:message key="label.cancel.button" />
+				</a>
 			</div>
 		</form:form>
 	</lams:Page>
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
diff -u -rbaeb14be8e4c423b2e9ebe3a253c73499051f765 -rad2a44cf5737f17483ecb2a732b0d6adcaad8078
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision baeb14be8e4c423b2e9ebe3a253c73499051f765)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision ad2a44cf5737f17483ecb2a732b0d6adcaad8078)
@@ -1157,7 +1157,7 @@
 	lessonDAO.deleteByProperty(ToolSession.class, "lesson.lessonId", lessonId);
 	Map<String, Object> notebookProperties = new TreeMap<>();
 	notebookProperties.put("externalID", lessonId);
-	notebookProperties.put("externalSignature", CoreNotebookConstants.SCRATCH_PAD_SIG);
+	notebookProperties.put("externalIDType", CoreNotebookConstants.SCRATCH_PAD);
 	lessonDAO.deleteByProperties(NotebookEntry.class, notebookProperties);
 	lessonDAO.deleteLesson(lesson);