Index: lams_build/lib/lams/lams-gradebook.jar
===================================================================
diff -u -r580d89078524d7f06eccd71feefc7e6f98717538 -r8f4be61ce9ac48ffc767138df8932b7f70427cdd
Binary files differ
Index: lams_build/lib/lams/lams-learning.jar
===================================================================
diff -u -r580d89078524d7f06eccd71feefc7e6f98717538 -r8f4be61ce9ac48ffc767138df8932b7f70427cdd
Binary files differ
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java
===================================================================
diff -u -rbda683376462db8412488237c888f5ff58119d20 -r8f4be61ce9ac48ffc767138df8932b7f70427cdd
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java	(.../NotebookController.java)	(revision bda683376462db8412488237c888f5ff58119d20)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java	(.../NotebookController.java)	(revision 8f4be61ce9ac48ffc767138df8932b7f70427cdd)
@@ -210,6 +210,11 @@
 
 	return "notebook/view";
     }
+    
+    @RequestMapping("/add")
+    public String addNewEntry(@ModelAttribute("notebookForm") NotebookForm notebookForm) {
+	return "notebook/addnew";
+    }
 
     /**
      *
Index: lams_learning/web/grouping/show.jsp
===================================================================
diff -u -rbda683376462db8412488237c888f5ff58119d20 -r8f4be61ce9ac48ffc767138df8932b7f70427cdd
--- lams_learning/web/grouping/show.jsp	(.../show.jsp)	(revision bda683376462db8412488237c888f5ff58119d20)
+++ lams_learning/web/grouping/show.jsp	(.../show.jsp)	(revision 8f4be61ce9ac48ffc767138df8932b7f70427cdd)
@@ -52,7 +52,7 @@
 	<lams:Page type="learner" title="${title}">
 	
 		<form:form
-			action="/lams/learning/CompleteActivity.do?userId=${user.userID}&lessonId=${lessonID}&activityID=${activityID}"
+			action="/lams/learning/grouping/completeActivity.do?userId=${user.userID}&lessonId=${lessonID}&activityID=${activityID}"
 			target="_self" modelAttribute="messageForm" id="messageForm">
 	
 			<c:set var="userId" value="${user.userID}" />
Index: lams_learning/web/notebook/view.jsp
===================================================================
diff -u -rb546f3a46de916721f4d729ac1b0e64cc1eb9cb4 -r8f4be61ce9ac48ffc767138df8932b7f70427cdd
--- lams_learning/web/notebook/view.jsp	(.../view.jsp)	(revision b546f3a46de916721f4d729ac1b0e64cc1eb9cb4)
+++ lams_learning/web/notebook/view.jsp	(.../view.jsp)	(revision 8f4be61ce9ac48ffc767138df8932b7f70427cdd)
@@ -22,6 +22,7 @@
 <!DOCTYPE html>
 
 <%@ include file="/common/taglibs.jsp"%>
+<%@ page import="org.lamsfoundation.lams.notebook.service.CoreNotebookConstants"%>
 
 <lams:html>
 
Index: lams_learning/web/notebook/viewall.jsp
===================================================================
diff -u -r580d89078524d7f06eccd71feefc7e6f98717538 -r8f4be61ce9ac48ffc767138df8932b7f70427cdd
--- lams_learning/web/notebook/viewall.jsp	(.../viewall.jsp)	(revision 580d89078524d7f06eccd71feefc7e6f98717538)
+++ lams_learning/web/notebook/viewall.jsp	(.../viewall.jsp)	(revision 8f4be61ce9ac48ffc767138df8932b7f70427cdd)
@@ -53,7 +53,7 @@
 	
 	<lams:Page type="learner" title="${title}" hideProgressBar="true">
 		<c:set var="addnote">
-			<c:url value="/notebook/addnew.jsp?lessonID=" />
+			<c:url value="/notebook/add.do?lessonID=" />
 			<c:out value="${lessonID}" />
 		</c:set>
 		<div class="pull-right">
@@ -67,7 +67,7 @@
 	
 		<c:forEach var="entryList" items="${entries}" varStatus="list_status">
 			<c:forEach var="entry" items="${entryList}" varStatus="entry_status">
-				<a href="#" linkName="lesson${entry.externalID}" />
+				<a href="#" linkName="lesson${entry.externalID}" ></a>
 	
 				<!-- set sig check flag -->
 				<c:if test="${entry_status.first}">
@@ -78,7 +78,7 @@
 					</c:set>
 	
 					<c:set var="addnote">
-						<c:url value="/notebook/addnew.jsp?currentLessonID=${lessonID}&lessonID=" />
+						<c:url value="/notebook/add.do?currentLessonID=${lessonID}&lessonID=" />
 						<c:out value="${entry.externalID}" />
 					</c:set>
 	
@@ -134,10 +134,12 @@
 								</c:if>
 	
 								<tr>
-									<td class="align-left" width="28%"><c:set var="viewnote">
+									<td class="align-left" width="28%">
+										<c:set var="viewnote">
 											<c:url value="/notebook/viewEntry.do?currentLessonID=${lessonID}&uid=" />
 											<c:out value="${entry.uid}" />
-										</c:set> <a href="${viewnote}">
+										</c:set>
+										 <a href="${viewnote}">
 											<c:choose>
 												<c:when test="${empty entry.title}">
 													<fmt:message key="mynotes.entry.no.title.label" />
@@ -146,7 +148,8 @@
 													<c:out value="${entry.title}" escapeXml="false" />
 												</c:otherwise>
 											</c:choose>
-										</a></td>
+										</a>
+									</td>
 									<td>&nbsp;</td>
 									<td><lams:Date value="${entry.createDate}" timeago="true"/></td>
 									<td><lams:Date value="${entry.lastModified}" timeago="true"/></td>
Index: lams_learning/web/notebook/viewalljournals.jsp
===================================================================
diff -u -rb546f3a46de916721f4d729ac1b0e64cc1eb9cb4 -r8f4be61ce9ac48ffc767138df8932b7f70427cdd
--- lams_learning/web/notebook/viewalljournals.jsp	(.../viewalljournals.jsp)	(revision b546f3a46de916721f4d729ac1b0e64cc1eb9cb4)
+++ lams_learning/web/notebook/viewalljournals.jsp	(.../viewalljournals.jsp)	(revision 8f4be61ce9ac48ffc767138df8932b7f70427cdd)
@@ -83,7 +83,8 @@
 				<td class="align-left" width="28%">
 					<c:set var="viewnote">
 						<c:url value="/notebook/viewEntry.do?mode=teacher&uid=${entry.uid}&currentLessonID=${lessonID}" />
-					</c:set> <a href="${viewnote}">
+					</c:set> 
+					<a href="${viewnote}">
 						<c:choose>
 							<c:when test="${empty entry.title}">
 								<fmt:message key="mynotes.entry.no.title.label" />
@@ -92,7 +93,8 @@
 								<c:out value="${entry.title}" escapeXml="false" />
 							</c:otherwise>
 						</c:choose>
-					</a></td>
+					</a>
+				</td>
 				<td>&nbsp;</td>
 				<td><lams:Date value="${entry.createDate}" /></td>
 				<td><lams:Date value="${entry.lastModified}" /></td>
