diff --git a/.DS_Store b/.DS_Store
index c5ac295..600fb9b 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/AJAX/src/main/java/de/beyondjava/bootsfaces/examples/AJAXBean.java b/AJAX/src/main/java/de/beyondjava/bootsfaces/examples/AJAXBean.java
index b2c410c..f35e468 100644
--- a/AJAX/src/main/java/de/beyondjava/bootsfaces/examples/AJAXBean.java
+++ b/AJAX/src/main/java/de/beyondjava/bootsfaces/examples/AJAXBean.java
@@ -123,7 +123,7 @@ public void setMessages(List<String> messages) {
 	public String onBlur() {
 		String event = " blur";
 		report(event);
-		return "Hallo";
+		return null;
 	}
 
 	private void report(String event) {
@@ -141,85 +141,91 @@ private void report(String event) {
 	public String onChange() {
 		String event = " change";
 		report(event);
-		return "Hallo";
+		return null;
 	}
 
 	public String onValueChange() {
 		String event = " valueChange";
 		report(event);
-		return "Hallo";
+		return null;
 	}
 
 	public String onClick() {
 		String event = " click";
 		report(event);
-		return "Hallo";
+		return null;
+	}
+
+	public String onClickNavigate() {
+		String event = " click";
+		report(event);
+		return "landingPage.xhtml";
 	}
 
 	public String onDblClick() {
 		String event = " dblclick";
 		report(event);
-		return "Hallo";
+		return null;
 	}
 
 	public String onFocus() {
 		String event = " focus";
 		report(event);
-		return "Hallo";
+		return null;
 	}
 
 	public String onKeyDown() {
 		String event = " keydown";
 		report(event);
-		return "Hallo";
+		return null;
 	}
 
 	public String onKeyPress() {
 		String event = " keypress";
 		report(event);
-		return "Hallo";
+		return null;
 	}
 
 	public String onKeyUp() {
 		String event = " keyup";
 		report(event);
-		return "Hallo";
+		return null;
 	}
 
 	public String onMouseDown() {
 		String event = " mousedown";
 		report(event);
-		return "Hallo";
+		return null;
 	}
 
 	public String onMouseMove() {
 		String event = " mousemove";
 		report(event);
-		return "Hallo";
+		return null;
 	}
 
 	public String onMouseOut() {
 		String event = " mouseout";
 		report(event);
-		return "Hallo";
+		return null;
 	}
 
 	public String onMouseOver() {
 		String event = " mouseover";
 		report(event);
-		return "Hallo";
+		return null;
 	}
 
 	public String onMouseUp() {
 		String event = " mouseup";
 		report(event);
-		return "Hallo";
+		return null;
 	}
 
 	public String onSelect() {
 		String event = " select";
 		report(event);
-		return "Hallo";
+		return null;
 	}
 
 	public boolean isBool() {
@@ -240,7 +246,11 @@ public void setInput(String input) {
 
 	public String standardJSFAction() {
 		report("Standard JSF action called");
-		return null; // "landingPage.jsf";
+		return null; 
+	}
+	public String navigationAction() {
+		report("Navigation action called");
+		return "landingPage.jsf";
 	}
 	
 	public void facetListener(javax.faces.event.AjaxBehaviorEvent event) throws javax.faces.event.AbortProcessingException {
diff --git a/AJAX/src/main/webapp/commandbutton3.xhtml b/AJAX/src/main/webapp/commandbutton3.xhtml
new file mode 100644
index 0000000..e705d45
--- /dev/null
+++ b/AJAX/src/main/webapp/commandbutton3.xhtml
@@ -0,0 +1,37 @@
+<ui:fragment xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:h="http://java.sun.com/jsf/html"
+  xmlns:ui="http://java.sun.com/jsf/facelets"
+  xmlns:b="http://bootsfaces.net/ui"
+  xmlns:f="http://java.sun.com/jsf/core"
+  xmlns:p="http://primefaces.org/ui">
+
+
+  <h:form id="navigation_form">
+    <b:row>
+      <b:column col-sm="6">
+        <b:panelGrid colSpans="12">
+          <b:commandButton value="Navigate (AJAX - action)"
+            ajax="true" onclick="ajax:AJAXBean.onClick()"
+            action="#{AJAXBean.navigationAction}"
+            update="@form:**:messages" />
+          <b:commandButton value="Navigate (AJAX - onclick)"
+            ajax="true" onclick="ajax:AJAXBean.onClickNavigate()"
+            
+            update="@form:**:messages" />
+          <b:commandButton value="Navigate (Non-AJAX)"
+            action="#{AJAXBean.navigationAction}" />
+        </b:panelGrid>
+      </b:column>
+      <b:column col-sm="6">
+        <b:well id="messages">
+	      Last action:
+	      <ul>
+            <ui:repeat var="message" value="#{AJAXBean.messages}">
+              <li>#{message}</li>
+            </ui:repeat>
+          </ul>
+        </b:well>
+      </b:column>
+    </b:row>
+  </h:form>
+</ui:fragment>
\ No newline at end of file
diff --git a/AJAX/src/main/webapp/index.xhtml b/AJAX/src/main/webapp/index.xhtml
index 7bffce6..43a3019 100644
--- a/AJAX/src/main/webapp/index.xhtml
+++ b/AJAX/src/main/webapp/index.xhtml
@@ -26,11 +26,16 @@
 
 		<b:container id="content">
 			<b:tabView id="tabViewID">
-				<b:tab title="command button"
+				<b:tab title="Navigation"
 					onclick="ajax:AJAXBean.clearMessages()" update="**:*messages">
 					<div style="height: 10px" />
-					<ui:include src="commandbutton.xhtml" />
+					<ui:include src="commandbutton3.xhtml" />
 				</b:tab>
+                <b:tab title="command button"
+                  onclick="ajax:AJAXBean.clearMessages()" update="**:*messages">
+                  <div style="height: 10px" />
+                  <ui:include src="commandbutton.xhtml" />
+                </b:tab>
 				<b:tab title="command button 2" update="**:*messages"
 					onclick="ajax:AJAXBean.clearMessages()">
 					<div style="height: 10px" />