Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java
===================================================================
diff -u -r580d89078524d7f06eccd71feefc7e6f98717538 -rbda683376462db8412488237c888f5ff58119d20
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java	(.../NotebookController.java)	(revision 580d89078524d7f06eccd71feefc7e6f98717538)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java	(.../NotebookController.java)	(revision bda683376462db8412488237c888f5ff58119d20)
@@ -215,7 +215,7 @@
      *
      */
     @RequestMapping("/processNewEntry")
-    public String processNewEntry(@ModelAttribute NotebookForm notebookForm, HttpServletRequest request)
+    public String processNewEntry(@ModelAttribute("notebookForm") NotebookForm notebookForm, HttpServletRequest request)
 	    throws IOException, ServletException {
 
 	Long id = notebookForm.getLessonID();
@@ -234,7 +234,7 @@
      *
      */
     @RequestMapping(path="/updateEntry")
-    public String updateEntry(@ModelAttribute NotebookForm notebookForm, HttpServletRequest request)
+    public String updateEntry(@ModelAttribute ("notebookForm") NotebookForm notebookForm, HttpServletRequest request)
 	    throws IOException, ServletException {
 
 	Long uid = notebookForm.getUid();
Index: lams_learning/web/grouping/show.jsp
===================================================================
diff -u -r580d89078524d7f06eccd71feefc7e6f98717538 -rbda683376462db8412488237c888f5ff58119d20
--- lams_learning/web/grouping/show.jsp	(.../show.jsp)	(revision 580d89078524d7f06eccd71feefc7e6f98717538)
+++ lams_learning/web/grouping/show.jsp	(.../show.jsp)	(revision bda683376462db8412488237c888f5ff58119d20)
@@ -52,7 +52,7 @@
 	<lams:Page type="learner" title="${title}">
 	
 		<form:form
-			action="/completeActivity.do?userId=${user.userID}&lessonId=${lessonID}&activityID=${activityID}"
+			action="/lams/learning/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/optionsActivity.jsp
===================================================================
diff -u -rb546f3a46de916721f4d729ac1b0e64cc1eb9cb4 -rbda683376462db8412488237c888f5ff58119d20
--- lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision b546f3a46de916721f4d729ac1b0e64cc1eb9cb4)
+++ lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision bda683376462db8412488237c888f5ff58119d20)
@@ -175,7 +175,7 @@
 				//-->
 				</script>
 		
-				<form:form action="CompleteActivity.do" modelAttribute="messageForm" method="post" id="messageForm">
+				<form:form action="/lams/learning/CompleteActivity.do" modelAttribute="messageForm" method="post" id="messageForm">
 					<input type="hidden" name="lams_token" value="<c:out value='${lams_token}' />">
 					<input type="hidden" name="activityID" value="<c:out value='${optionsActivityForm.activityID}' />">
 					<input type="hidden" name="lessonID" value="<c:out value='${optionsActivityForm.lessonID}' />">