diff --git a/src/com/yourcompany/babydatenbank/actions/SaveAndShowListAction.java b/src/com/yourcompany/babydatenbank/actions/SaveAndShowListAction.java
new file mode 100644
index 0000000..0394ed6
--- /dev/null
+++ b/src/com/yourcompany/babydatenbank/actions/SaveAndShowListAction.java
@@ -0,0 +1,14 @@
+package com.yourcompany.babydatenbank.actions;
+
+import org.openxava.actions.*;
+
+public class SaveAndShowListAction extends SaveAction {
+	
+	public void execute() throws Exception {
+        super.execute();
+        if (!getErrors().contains()) {
+            setNextMode(LIST);
+        }
+    }
+
+}
diff --git a/web/WEB-INF/lib/addons.jar b/web/WEB-INF/lib/addons.jar
index 61f81da..6f97993 100644
Binary files a/web/WEB-INF/lib/addons.jar and b/web/WEB-INF/lib/addons.jar differ
diff --git a/web/WEB-INF/lib/openxava.jar b/web/WEB-INF/lib/openxava.jar
index f189a9d..b11e849 100644
Binary files a/web/WEB-INF/lib/openxava.jar and b/web/WEB-INF/lib/openxava.jar differ
diff --git a/xava/application.xml b/xava/application.xml
index 8580c07..fd4460d 100644
--- a/xava/application.xml
+++ b/xava/application.xml
@@ -1 +1 @@
-<?xml version = "1.0" encoding = "ISO-8859-1"?>

<!DOCTYPE application SYSTEM "dtds/application.dtd">

<application name="Babydatenbank"> 
	
	<!-- 
	A default module for each entity is assumed with the
	controllers on <default-module/>
	-->
	<default-module>		  
		<controller name="Typical"/>		
	</default-module>
	
	<!-- 
	You can define additional modules, for example:	  
	<module name="OnlyReadTeacher">
		<model name="Teacher"/>
		<controller name="Print"/>
	</module>		
	-->
	
</application>
\ No newline at end of file
+<?xml version = "1.0" encoding = "ISO-8859-1"?>

<!DOCTYPE application SYSTEM "dtds/application.dtd">

<application name="Babydatenbank"> 
	
	<!-- 
	A default module for each entity is assumed with the
	controllers on <default-module/>
	-->
	<default-module>		  
		<controller name="BabydatenbankDefaultController"/>		
	</default-module>
	
	<!-- 
	You can define additional modules, for example:	  
	<module name="OnlyReadTeacher">
		<model name="Teacher"/>
		<controller name="Print"/>
	</module>		
	-->
	
</application>
\ No newline at end of file
diff --git a/xava/controllers.xml b/xava/controllers.xml
index 7f58226..ad78281 100644
--- a/xava/controllers.xml
+++ b/xava/controllers.xml
@@ -21,5 +21,38 @@
     	</action>
 	</controller>    
     -->
+    <controller name="BabydatenbankDefaultController">
+    	<extends controller="Typical" excluded-actions="new, save, refresh, delete" />
+    	
+    	<action  name="new" 
+			class="org.openxava.actions.NewAction"
+			image="new.gif"
+			icon="library-plus"
+			keystroke="Control N"
+			loses-changed-data="true">
+			<set property="restoreModel" value="true"/>			
+		</action>
+
+		<action 
+    		name="save" mode="detail"
+      		class="com.yourcompany.babydatenbank.actions.SaveAndShowListAction" 
+      		by-default="if-possible"
+      		image="save.gif"
+      		icon="content-save"
+      		keystroke="Control S"/>
+		
+		<action name="refresh" mode="detail"			
+			class="org.openxava.actions.SearchAction"
+			image="refresh.gif"
+			icon="refresh"
+			keystroke="control B"/>
+		
+		<action name="delete" mode="detail" confirm="true"
+			class="org.openxava.actions.DeleteAction"
+			image="delete.gif"
+			icon="delete"
+			available-on-new="false"
+			keystroke="Control D"/>		
+    </controller>
     
 </controllers>
\ No newline at end of file