diff --git a/database.sqlite b/database.sqlite
index 42b7695..9ff324c 100644
Binary files a/database.sqlite and b/database.sqlite differ
diff --git a/src/main.rs b/src/main.rs
index 4773406..4e8a89f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -127,12 +127,23 @@ fn klasse_view(conn: DbConn, class_id: i32) -> Template {
 
 #[derive(Serialize)]
 struct AddKlasseContext<'a> {
+    klassen: Vec<Klasse>,
     parent: &'a str,
 }
 
 #[get("/add/klasse")]
-fn get_klasse_form() -> Template {
-    Template::render("add_klasse_form", AddKlasseContext { parent: "base" })
+fn get_klasse_form(conn: DbConn) -> Template {
+    let klassen = klassen::table
+        .order(klassen::ordnung.asc())
+        .load::<Klasse>(&*conn)
+        .expect("could not load stunden");
+    Template::render(
+        "add_klasse_form",
+        AddKlasseContext {
+            klassen,
+            parent: "base",
+        },
+    )
 }
 
 #[derive(FromForm, Insertable)]
@@ -155,9 +166,25 @@ fn post_klasse_form(klasse: Form<KlasseForm>, conn: DbConn) -> Result<Redirect,
     }
 }
 
+#[derive(Serialize)]
+struct AddStundeContext<'a> {
+    stunden: Vec<Stunde>,
+    parent: &'a str,
+}
+
 #[get("/add/stunde")]
-fn get_stunde_form() -> Template {
-    Template::render("add_stunde_form", AddKlasseContext { parent: "base" })
+fn get_stunde_form(conn: DbConn) -> Template {
+    let stunden = stunden::table
+        .order(stunden::ordinal.asc())
+        .load::<Stunde>(&*conn)
+        .expect("could not load stunden");
+    Template::render(
+        "add_stunde_form",
+        AddStundeContext {
+            stunden,
+            parent: "base",
+        },
+    )
 }
 
 #[derive(FromForm, Insertable)]
diff --git a/templates/add_klasse_form.hbs b/templates/add_klasse_form.hbs
index d66f18b..15927a5 100644
--- a/templates/add_klasse_form.hbs
+++ b/templates/add_klasse_form.hbs
@@ -1,29 +1,44 @@
 {{#* inline "page"}}
-  <h1>Klasse hinzu fügen</h1>
-  <form action="/admin/add/klasse" method="post" accept-charset="utf-8">
-    <table>
-      <tr>
-        <th>Stufe:</th>
-        <td><input type="number" name="stufe"></td>
-      </tr>
-      <tr>
-        <th>Teil:</th>
-        <td><input type="text" name="gruppe"></td>
-      </tr>
-      <tr>
-        <th>Titel:</th>
-        <td><input type="text" name="titel"></td>
-      </tr>
-      <tr>
-        <th>Ordnung:</th>
-        <td><input type="number" name="ordnung"></td>
-      </tr>
-      <tr>
-        <th></th>
-        <td><input type="submit" value="Klasse Erstellen"></td>
-      </tr>
-    </table>
-  </form>
-  {{/inline}}
-  {{! remove whitespaces with ~ }}
-  {{~> (parent)~}}
+<h1>Klassen</h1>
+<table>
+  <tr>
+    <th>Klasse</th>
+    <th>Titel</th>
+    <th>Priorität</th>
+  </tr>
+  {{#each klassen}}
+  <tr>
+    <td>{{ this.stufe }}{{this.gruppe}}</td>
+    <td>{{this.titel}}</td>
+    <td>{{this.ordnung}}</td>
+  </tr>
+  {{/each}}
+</table>
+<h1>Klasse hinzu fügen</h1>
+<form action="/admin/add/klasse" method="post" accept-charset="utf-8">
+  <table>
+    <tr>
+      <th>Stufe:</th>
+      <td><input type="number" name="stufe"></td>
+    </tr>
+    <tr>
+      <th>Teil:</th>
+      <td><input type="text" name="gruppe"></td>
+    </tr>
+    <tr>
+      <th>Titel:</th>
+      <td><input type="text" name="titel"></td>
+    </tr>
+    <tr>
+      <th>Ordnung:</th>
+      <td><input type="number" name="ordnung"></td>
+    </tr>
+    <tr>
+      <th></th>
+      <td><input type="submit" value="Klasse Erstellen"></td>
+    </tr>
+  </table>
+</form>
+{{/inline}}
+{{! remove whitespaces with ~ }}
+{{~> (parent)~}}
\ No newline at end of file
diff --git a/templates/add_stunde_form.hbs b/templates/add_stunde_form.hbs
index fbf14f8..a83d62a 100644
--- a/templates/add_stunde_form.hbs
+++ b/templates/add_stunde_form.hbs
@@ -1,9 +1,24 @@
 {{#* inline "page"}}
+<h1>Stunden</h1>
+<table>
+    <tr>
+        <th>Name</th>
+        <th>Abkürzung</th>
+        <th>Priorität</th>
+    </tr>
+    {{#each stunden}}
+    <tr>
+        <td>{{ this.title }}</td>
+        <td>{{this.short}}</td>
+        <td>{{this.ordinal}}</td>
+    </tr>
+    {{/each}}
+</table>
 <h1>Stunde hinzu fügen</h1>
 <form action="/admin/add/stunde" method="post" accept-charset="utf-8">
     <table>
         <tr>
-            <th>Titel:</th>
+            <th>Name:</th>
             <td><input type="text" name="title"></td>
         </tr>
         <tr>
@@ -11,7 +26,7 @@
             <td><input type="text" name="short"></td>
         </tr>
         <tr>
-            <th>Ordnung:</th>
+            <th>Priorität:</th>
             <td><input type="number" name="ordinal"></td>
         </tr>
         <tr>