Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/AuthoringController.java
===================================================================
diff -u -rf6959ef7792273a7ff3f05439513533678f9cc1f -r035729f521079cf3b9696f60b6b715261af17767
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision f6959ef7792273a7ff3f05439513533678f9cc1f)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 035729f521079cf3b9696f60b6b715261af17767)
@@ -196,9 +196,8 @@
 
     @RequestMapping("/changePage")
     public String changePage(@ModelAttribute AuthoringForm authoringForm, HttpServletRequest request) throws Exception {
-	super.changePage(authoringForm, request);
-	Long currentWikiPageId = WebUtil.readLongParam(request, WikiConstants.ATTR_CURRENT_WIKI);
-	return this.returnToWiki(authoringForm, request, currentWikiPageId);
+	Long pageUid = super.changePage(authoringForm, request);
+	return this.returnToWiki(authoringForm, request, pageUid);
     }
 
     @RequestMapping("/addPage")
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/LearningController.java
===================================================================
diff -u -rf6959ef7792273a7ff3f05439513533678f9cc1f -r035729f521079cf3b9696f60b6b715261af17767
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/LearningController.java	(.../LearningController.java)	(revision f6959ef7792273a7ff3f05439513533678f9cc1f)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/LearningController.java	(.../LearningController.java)	(revision 035729f521079cf3b9696f60b6b715261af17767)
@@ -276,9 +276,8 @@
 
     @RequestMapping("/changePage")
     public String changePage(@ModelAttribute LearningForm learningForm, HttpServletRequest request) throws Exception {
-	super.changePage(learningForm, request);
-	Long currentWikiPageId = WebUtil.readLongParam(request, WikiConstants.ATTR_CURRENT_WIKI);
-	return this.returnToWiki(learningForm, request, currentWikiPageId);
+	Long pageUid = super.changePage(learningForm, request);
+	return this.returnToWiki(learningForm, request, pageUid);
     }
 
     @RequestMapping("/addPage")
@@ -290,7 +289,6 @@
 
     @RequestMapping("/removePage")
     public String removePage(@ModelAttribute LearningForm learningForm, HttpServletRequest request) throws Exception {
-
 	Long currentPageUid = WebUtil.readLongParam(request, WikiConstants.ATTR_CURRENT_WIKI);
 	super.removePage(learningForm, request);
 	// return to the main page, by setting the current page to null
@@ -312,6 +310,7 @@
 	return this.returnToWiki(learningForm, request, currentWikiPageId);
     }
 
+    @Override
     @RequestMapping("/notifyWikiChange")
     public void notifyWikiChange(Long toolSessionID, String subjectLangKey, String bodyLangKey, WikiUser wikiUser,
 	    HttpServletRequest request) throws Exception {
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/MonitoringController.java
===================================================================
diff -u -rf6959ef7792273a7ff3f05439513533678f9cc1f -r035729f521079cf3b9696f60b6b715261af17767
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision f6959ef7792273a7ff3f05439513533678f9cc1f)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 035729f521079cf3b9696f60b6b715261af17767)
@@ -168,9 +168,8 @@
     @RequestMapping("/changePage")
     public String changePage(@ModelAttribute MonitoringForm monitoringForm, HttpServletRequest request)
 	    throws Exception {
-	super.changePage(monitoringForm, request);
-	Long currentWikiPageId = WebUtil.readLongParam(request, WikiConstants.ATTR_CURRENT_WIKI);
-	return this.returnToWiki(monitoringForm, request, currentWikiPageId);
+	Long pageUid = super.changePage(monitoringForm, request);
+	return this.returnToWiki(monitoringForm, request, pageUid);
     }
 
     @RequestMapping("/addPage")
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/WikiPageController.java
===================================================================
diff -u -rf6959ef7792273a7ff3f05439513533678f9cc1f -r035729f521079cf3b9696f60b6b715261af17767
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/WikiPageController.java	(.../WikiPageController.java)	(revision f6959ef7792273a7ff3f05439513533678f9cc1f)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/WikiPageController.java	(.../WikiPageController.java)	(revision 035729f521079cf3b9696f60b6b715261af17767)
@@ -218,7 +218,7 @@
     /**
      * Change the active page of the wiki form
      */
-    protected void changePage(WikiPageForm wikiForm, HttpServletRequest request) throws Exception {
+    protected Long changePage(WikiPageForm wikiForm, HttpServletRequest request) throws Exception {
 
 	Wiki wiki = null;
 	WikiSession session = null;
@@ -246,6 +246,7 @@
 	if (wikiPage == null) {
 	    // TODO: Error handling page does not exist
 	}
+	return wikiPage.getUid();
     }
 
     /**
Index: lams_tool_wiki/web/includes/javascript/wikiCommon.js
===================================================================
diff -u -rf6959ef7792273a7ff3f05439513533678f9cc1f -r035729f521079cf3b9696f60b6b715261af17767
--- lams_tool_wiki/web/includes/javascript/wikiCommon.js	(.../wikiCommon.js)	(revision f6959ef7792273a7ff3f05439513533678f9cc1f)
+++ lams_tool_wiki/web/includes/javascript/wikiCommon.js	(.../wikiCommon.js)	(revision 035729f521079cf3b9696f60b6b715261af17767)
@@ -52,11 +52,12 @@
 	var remove = confirm(confirmMessage);
 	if (remove)
 	{
-		submitWiki('removePage');
+		submitWiki("removePage");
 	}
 }
 
 var compareWindow = null;
+
 function doCompareOrView(webAppUrl, historyId, currentPageId, actionMethod)
 {
 	var url = webAppUrl + "/learning/"+ actionMethod +".do?";
Index: lams_tool_wiki/web/pages/authoring/authoring.jsp
===================================================================
diff -u -rf6959ef7792273a7ff3f05439513533678f9cc1f -r035729f521079cf3b9696f60b6b715261af17767
--- lams_tool_wiki/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision f6959ef7792273a7ff3f05439513533678f9cc1f)
+++ lams_tool_wiki/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 035729f521079cf3b9696f60b6b715261af17767)
@@ -16,6 +16,7 @@
 
 		<script type="text/javascript" src="${tool}includes/javascript/authoring.js"></script>
 		<script type="text/javascript" src="${tool}includes/javascript/wikiCommon.js"></script>
+		<script type="text/javascript" src="${tool}includes/javascript/validation.js"></script>
 		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 		<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
 		<script type="text/javascript" src="${lams}includes/javascript/jquery.timeago.js"></script>
Index: lams_tool_wiki/web/pages/authoring/basic.jsp
===================================================================
diff -u -rf6959ef7792273a7ff3f05439513533678f9cc1f -r035729f521079cf3b9696f60b6b715261af17767
--- lams_tool_wiki/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision f6959ef7792273a7ff3f05439513533678f9cc1f)
+++ lams_tool_wiki/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 035729f521079cf3b9696f60b6b715261af17767)
@@ -1,7 +1,5 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<script language="JavaScript" type="text/javascript" src="includes/javascript/validation.js"></script>
-
 <!-- ========== Basic Tab ========== -->
 
 <div id="wikimenu" class="panel panel-default">
Index: lams_tool_wiki/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -rf6959ef7792273a7ff3f05439513533678f9cc1f -r035729f521079cf3b9696f60b6b715261af17767
--- lams_tool_wiki/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision f6959ef7792273a7ff3f05439513533678f9cc1f)
+++ lams_tool_wiki/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 035729f521079cf3b9696f60b6b715261af17767)
@@ -8,13 +8,13 @@
     }
 
     function continueOrFinish(action) {
-      document.getElementById("learningButtonForm").action;
+      document.getElementById("learningButtonForm").action += action + ".do";
       document.getElementById("learningButtonForm").submit();
     }
   </script>
 
   <c:if test="${userDTO.finishedActivity and wikiDTO.reflectOnActivity}">
-    <form:form action="openNotebook.do" method="get" id="learningForm" modelAttribute="learningForm">
+    <form:form action="learning.do" method="get" id="learningButtonForm" modelAttribute="learningForm">
       <form:hidden path="mode" value="${mode}" />	
       <form:hidden path="toolSessionID" id="toolSessionID"/>
       <div class="panel panel-default voffset10">
Index: lams_tool_wiki/web/pages/learning/wiki.jsp
===================================================================
diff -u -rf6959ef7792273a7ff3f05439513533678f9cc1f -r035729f521079cf3b9696f60b6b715261af17767
--- lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision f6959ef7792273a7ff3f05439513533678f9cc1f)
+++ lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision 035729f521079cf3b9696f60b6b715261af17767)
@@ -21,7 +21,7 @@
 		
 		<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	    <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
-	    <script language="JavaScript" type="text/javascript" src="includes/javascript/validation.js"></script>
+	    <script language="JavaScript" type="text/javascript" src="${tool}includes/javascript/validation.js"></script>
 	    <script type="text/javascript" src="<lams:LAMSURL />/includes/javascript/jquery.timeago.js"></script>
 	    <c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
 	    <script type="text/javascript" src="<lams:LAMSURL />/includes/javascript/timeagoi18n/jquery.timeago.${fn:toLowerCase(localeLanguage)}.js"></script>