diff --git a/includes/view/Questions_view.php b/includes/view/Questions_view.php
new file mode 100644
index 00000000..02cec393
--- /dev/null
+++ b/includes/view/Questions_view.php
@@ -0,0 +1,37 @@
+<?php
+
+function Questions_view($open_questions, $answered_questions, $ask_action) {
+  foreach ($open_questions as &$question) {
+    $question['actions'] = '<a href="' . page_link_to("user_questions") . '&action=delete&id=' . $question['QID'] . '">Löschen</a>';
+    $question['Question'] = str_replace("\n", '<br />', $question['Question']);
+  }
+  
+  foreach ($answered_questions as &$question) {
+    $question['Question'] = str_replace("\n", '<br />', $question['Question']);
+    $question['Answer'] = str_replace("\n", '<br />', $question['Answer']);
+    $question['actions'] = '<a href="' . page_link_to("user_questions") . '&action=delete&id=' . $question['QID'] . '">Löschen</a>';
+  }
+  
+  return page(array(
+      msg(),
+      '<h2>' . _("Open questions") . '</h2>',
+      table(array(
+          'Question' => _("Question"),
+          'actions' => "" 
+      ), $open_questions),
+      '<h2>' . _("Answered questions") . '</h2>',
+      table(array(
+          'Question' => _("Question"),
+          'answer_user' => _("Answered by"),
+          'Answer' => _("Answer"),
+          'actions' => "" 
+      ), $answered_questions),
+      '<h2>' . _("Ask an archangel") . '</h2>',
+      form(array(
+          form_textarea('question', _("Your Question:"), ""),
+          form_submit('submit', _("Save")) 
+      ), $ask_action) 
+  ));
+}
+
+?>
\ No newline at end of file
diff --git a/includes/view/ShiftEntry_view.php b/includes/view/ShiftEntry_view.php
new file mode 100644
index 00000000..1080c4bc
--- /dev/null
+++ b/includes/view/ShiftEntry_view.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Display form for adding/editing a shift entry.
+ * @param string $angel
+ * @param string $date
+ * @param string $location
+ * @param string $title
+ * @param string $type
+ * @param string $comment
+ * 
+ * @return string
+ */
+function ShiftEntry_edit_view($angel, $date, $location, $title, $type, $comment) {
+  return page(array(
+      form(array(
+          form_info(_("Angel:"), $angel),
+          form_info(_("Date, Duration:"), $date),
+          form_info(_("Location:"), $location),
+          form_info(_("Title:"), $title),
+          form_info(_("Type:"), $type),
+          form_textarea('comment', _("Comment (for your eyes only):"), $comment),
+          form_submit('submit', _("Save")) 
+      )) 
+  ));
+}
+
+?>
\ No newline at end of file