12 files changed, 29 insertions, 26 deletions
diff --git a/templates/pages/cats.jinja b/templates/categories/manage.jinja
index 1a3d88e..efa91b6 100644
--- a/templates/pages/cats.jinja
+++ b/templates/categories/manage.jinja
@@ -1,4 +1,4 @@
-{% extends "page.jinja" %}
+{% extends "layout.jinja" %}
 
 {% block heading %} Kategorien {% endblock %}
 
diff --git a/templates/pages/constadd.jinja b/templates/consts/add.jinja
index 8f878b4..1ddad4a 100644
--- a/templates/pages/constadd.jinja
+++ b/templates/consts/add.jinja
@@ -1,4 +1,5 @@
-{% extends "page.jinja" %}
+{% extends "layout.jinja" %}
+{% from "macros.jinja" import render_form %}
 
 {% block heading %}
     Füge neue konstante Ausgabe hinzu
diff --git a/templates/pages/constedit.jinja b/templates/consts/edit.jinja
index c440ecb..b313704 100644
--- a/templates/pages/constedit.jinja
+++ b/templates/consts/edit.jinja
@@ -1,4 +1,5 @@
-{% extends "page.jinja" %}
+{% extends "layout.jinja" %}
+{% from "macros.jinja" import render_form %}
 
 {% block heading %}
     Konstante Ausgabe bearbeiten
diff --git a/templates/pages/constlist.jinja b/templates/consts/list.jinja
index ffe121f..68fa1e1 100644
--- a/templates/pages/constlist.jinja
+++ b/templates/consts/list.jinja
@@ -1,4 +1,4 @@
-{% extends "page.jinja" %}
+{% extends "layout.jinja" %}
 
 {% block heading %}
     Konstante Kosten
diff --git a/templates/pages/const.jinja b/templates/consts/show.jinja
index 13e8008..c09fc3b 100644
--- a/templates/pages/const.jinja
+++ b/templates/consts/show.jinja
@@ -1,5 +1,5 @@
-{% extends "page.jinja" %}
-
+{% extends "layout.jinja" %}
+{% from "macros.jinja" import left_arrow, right_arrow %}
 {% set fmt="%m.%Y" %}
 
 {% block heading %}
diff --git a/templates/pages/add.jinja b/templates/expenses/add.jinja
index 4728e99..de54de3 100644
--- a/templates/pages/add.jinja
+++ b/templates/expenses/add.jinja
@@ -1,4 +1,5 @@
-{% extends "page.jinja" %}
+{% extends "layout.jinja" %}
+{% from "macros.jinja" import render_form %}
 
 {% block heading %}
     Neue Ausgabe hinzufügen
@@ -18,8 +19,6 @@
 {% block content %}
     <form name="add_expense" method="post">
         {{ render_form(form) }}
-        {% block form_buttons %}
-            <input type="submit" name="changeB">
-        {% endblock %}
+        <input type="submit" name="changeB">
     </form>
 {% endblock %}
diff --git a/templates/expenses/edit.jinja b/templates/expenses/edit.jinja
new file mode 100644
index 0000000..c871eb1
--- /dev/null
+++ b/templates/expenses/edit.jinja
@@ -0,0 +1,14 @@
+{% extends "expenses/add.jinja" %}
+{% from "macros.jinja" import render_form %}
+
+{% block heading %}
+    Bearbeite Kosteneintrag
+{% endblock %}
+
+{% block content %}
+    <form name="edit_expense" method="post">
+        {{ render_form(form) }}
+        <input type="submit" name="changeB">
+        <input type="submit" name="deleteB" value="Eintrag löschen" />
+    </form>
+{% endblock %}
diff --git a/templates/pages/show.jinja b/templates/expenses/show.jinja
index 4b5170f..2643ac4 100644
--- a/templates/pages/show.jinja
+++ b/templates/expenses/show.jinja
@@ -1,4 +1,5 @@
-{% extends "page.jinja" %}
+{% extends "layout.jinja" %}
+{% from "macros.jinja" import left_arrow, right_arrow, colorize %}
 
 {% block heading %}
     {% if exps | length > 1 %}
@@ -59,4 +60,3 @@
         </div>
     </div>
 {% endmacro %}
-
diff --git a/templates/root.jinja b/templates/layout.jinja
index dcddc33..dcddc33 100644
--- a/templates/root.jinja
+++ b/templates/layout.jinja
diff --git a/templates/page.jinja b/templates/macros.jinja
index c09dcde..9a9f9af 100644
--- a/templates/page.jinja
+++ b/templates/macros.jinja
@@ -1,5 +1,3 @@
-{% extends "root.jinja" %}
-
 {# functions #}
 {% macro left_arrow(target,label) %}
     <a id="left" href="{{target}}">
diff --git a/templates/menu.jinja b/templates/menu.jinja
index bf7045a..9950c96 100644
--- a/templates/menu.jinja
+++ b/templates/menu.jinja
@@ -1,7 +1,7 @@
 {% set menu = [
         ("index", "Kosten"),
         ("expenses.add", "Neu"),
-        ("consts.all", "Konstante Kosten"),
-        ("categories.all", "Kategorien")
+        ("consts.list", "Konstante Kosten"),
+        ("categories.manage", "Kategorien")
         ]
 %}
diff --git a/templates/pages/edit.jinja b/templates/pages/edit.jinja
deleted file mode 100644
index c1f4d5b..0000000
--- a/templates/pages/edit.jinja
+++ /dev/null
@@ -1,10 +0,0 @@
-{% extends "pages/add.jinja" %}
-
-{% block heading %}
-    Bearbeite Kosteneintrag
-{% endblock %}
-
-{% block form_buttons %}
-    <input type="submit" name="changeB" />
-    <input type="submit" name="deleteB" value="Eintrag löschen" />
-{% endblock %}