Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java
===================================================================
diff -u -rbd376d76233dad7d0a0775762385918fcbb96f4c -r0eff987dabffcb85157c77e5ec92072fb26a038a
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java	(.../NbAuthoringAction.java)	(revision bd376d76233dad7d0a0775762385918fcbb96f4c)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java	(.../NbAuthoringAction.java)	(revision 0eff987dabffcb85157c77e5ec92072fb26a038a)
@@ -26,10 +26,8 @@
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -58,7 +56,7 @@
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.FileValidatorUtil;
 import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.web.action.LamsLookupDispatchAction;
+import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
@@ -89,7 +87,7 @@
  * ----------------XDoclet Tags--------------------
  */
 
-public class NbAuthoringAction extends LamsLookupDispatchAction {
+public class NbAuthoringAction extends LamsDispatchAction {
     static Logger logger = Logger.getLogger(NbAuthoringAction.class.getName());
     public final static String FORM="NbAuthoringForm";
     
@@ -108,16 +106,6 @@
 		return user;
 	}
 
-    protected Map getKeyMethodMap()
-	{
-		Map map = new HashMap();
-		map.put(NoticeboardConstants.BUTTON_SAVE, "save");
-		map.put(NoticeboardConstants.BUTTON_UPLOAD, "upload");
-		map.put(NoticeboardConstants.LINK_DELETE, "deleteAttachment");
-		
-		return map;
-	}
-
     
     public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws NbApplicationException {
         
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java
===================================================================
diff -u -rd07409f014674f056d1bd67d865ba77f0f8298e9 -r0eff987dabffcb85157c77e5ec92072fb26a038a
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java	(.../NbLearnerAction.java)	(revision d07409f014674f056d1bd67d865ba77f0f8298e9)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java	(.../NbLearnerAction.java)	(revision 0eff987dabffcb85157c77e5ec92072fb26a038a)
@@ -56,7 +56,7 @@
 import org.lamsfoundation.lams.tool.noticeboard.util.NbWebUtil;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.web.action.LamsLookupDispatchAction;
+import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 
@@ -80,19 +80,10 @@
  * @struts:action-forward name="reflectOnActivity" path=".reflectOnActivity"
  * ----------------XDoclet Tags--------------------
  */
-public class NbLearnerAction extends LamsLookupDispatchAction {
+public class NbLearnerAction extends LamsDispatchAction {
 
     static Logger logger = Logger.getLogger(NbLearnerAction.class.getName());
-    
-    protected Map getKeyMethodMap()
-	{
-		Map map = new HashMap();
-		map.put(NoticeboardConstants.BUTTON_FINISH, "finish");
-		map.put(NoticeboardConstants.BUTTON_CONTINUE, "reflect");
-		map.put(NoticeboardConstants.BUTTON_EDIT, "reflect");
-		return map;
-	}
-    
+
     /** Get the user id from the shared session */
 	public Long getUserID(HttpServletRequest request) {
 		// set up the user details
Index: lams_tool_nb/web/authoring/authoring.jsp
===================================================================
diff -u -rbd376d76233dad7d0a0775762385918fcbb96f4c -r0eff987dabffcb85157c77e5ec92072fb26a038a
--- lams_tool_nb/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision bd376d76233dad7d0a0775762385918fcbb96f4c)
+++ lams_tool_nb/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 0eff987dabffcb85157c77e5ec92072fb26a038a)
@@ -42,13 +42,13 @@
         }
         
 		function deleteAttachment(uuid) {
-			document.NbAuthoringForm.method.value = '<fmt:message key="link.delete"/>';
+			document.NbAuthoringForm.method.value = 'deleteAttachment';
 			document.NbAuthoringForm.deleteFileUuid.value = uuid;
 			document.NbAuthoringForm.submit();
 		}        
 		
 		function doUpload() {
-			document.NbAuthoringForm.method.value = '<fmt:message key="button.upload" />';
+			document.NbAuthoringForm.method.value = 'upload';
 			document.NbAuthoringForm.submit();
 		}        
      </script>
@@ -111,10 +111,7 @@
 				</c:if>
 
 				<!-- Button Row -->
-				<c:set var="dispatchMethodName">
-					<fmt:message key="button.save" />
-				</c:set>
-				<html:hidden property="method" value="${dispatchMethodName}" />
+				<html:hidden property="method" value="save" />
 				<lams:AuthoringButton formID="authoringForm"
 					clearSessionActionUrl="/clearsession.do" toolSignature="lanb11"
 					toolContentID="${formBean.toolContentID}"
Index: lams_tool_nb/web/learnerContent.jsp
===================================================================
diff -u -r8f643b21383569338f324928a110d03c1c1bc3ac -r0eff987dabffcb85157c77e5ec92072fb26a038a
--- lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision 8f643b21383569338f324928a110d03c1c1bc3ac)
+++ lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision 0eff987dabffcb85157c77e5ec92072fb26a038a)
@@ -8,6 +8,12 @@
 			finishButton.disabled = true;
 		}
 	}
+	function submitForm(methodName){
+		var f = document.getElementById('learnerForm');
+		var m = document.getElementById('methodVar');
+		m.value=methodName
+		f.submit();
+	}
 </script>
 
 <div id="content">
@@ -18,9 +24,10 @@
 		<c:out value="${NbLearnerForm.content}" escapeXml="false" />
 	</p>
   	 
- 	<html:form action="/learner" target="_self" onsubmit="disableFinishButton();"> 
+ 	<html:form action="/learner" target="_self" onsubmit="disableFinishButton();" styleId="learnerForm"> 
 		<html:hidden property="toolSessionID" />
 		<html:hidden property="mode" />
+		<input type="hidden" id="methodVar" name="method"">
   	 
 		<c:if test="${userFinished and reflectOnActivity}">
 			<div class="small-space-top">
@@ -41,27 +48,23 @@
 					</c:otherwise>
 		            
 				</c:choose>
-		 
-				<html:submit property="method" styleClass="button">
-					<fmt:message key="button.edit" />
-				</html:submit>
+
 		    </div>
 		</c:if>
 	
 		<div class="space-bottom-top align-right">
 			<c:choose>
 				<c:when test="${reflectOnActivity}">
-					<html:submit property="method" styleClass="button">
+					<html:button property="continueButton" styleClass="button" onclick="submitForm('reflect')">
 						<fmt:message key="button.continue" />
-					</html:submit>
+					</html:button>
 				</c:when>
 				<c:otherwise>
 					
-					<input type="hidden" name="method" value="<fmt:message key="button.finish" />">
 						
-					<html:submit styleClass="button" styleId="finishButton">
+					<html:button property="finishButton" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
 						<fmt:message key="button.finish" />
-					</html:submit>
+					</html:button>
 				</c:otherwise>
 			</c:choose>
 		</div>
Index: lams_tool_nb/web/reflect.jsp
===================================================================
diff -u -r63965284231a49ac1e8bbd263c2109f11df2992a -r0eff987dabffcb85157c77e5ec92072fb26a038a
--- lams_tool_nb/web/reflect.jsp	(.../reflect.jsp)	(revision 63965284231a49ac1e8bbd263c2109f11df2992a)
+++ lams_tool_nb/web/reflect.jsp	(.../reflect.jsp)	(revision 0eff987dabffcb85157c77e5ec92072fb26a038a)
@@ -20,7 +20,7 @@
 		<div align="right" class="space-bottom-top">
 			<html:hidden property="toolSessionID" />
 			<html:hidden property="mode" />
-			<html:hidden property="method" value="Finish"/>
+			<html:hidden property="method" value="finish"/>
 			<html:submit styleClass="button" styleId="finishButton">
 				<fmt:message key="button.finish" />
 			</html:submit>