diff --git a/includes/pages/admin_shifts.php b/includes/pages/admin_shifts.php
index b6239f17..45c17591 100644
--- a/includes/pages/admin_shifts.php
+++ b/includes/pages/admin_shifts.php
@@ -6,31 +6,37 @@ function admin_shifts() {
 	$msg = "";
 	$ok = true;
 
-	// Name/Bezeichnung der Schicht, darf nicht leer sein
-	if (isset ($_REQUEST['name']) && strlen($_REQUEST['name']) > 0)
-		$name = strip_request_item('name');
-	else {
-		$ok = false;
-		$name = "";
-		$msg .= error("Gib bitte einen Namen für die Schicht(en) an.");
-	}
+	$name = "";
+	$rid = 0;
+	$start = date('Y-m-d 00:00');
+	$end = date('Y-m-d 00:00', time() + 24 * 60 * 60);
 
-	// Auswahl der sichtbaren Locations für die Schichten
+	// Locations laden
 	$rooms = sql_select("SELECT * FROM `Room` WHERE `show`='Y' ORDER BY `Name`");
 	$room_array = array ();
 	foreach ($rooms as $room)
 		$room_array[$room['RID']] = $room['Name'];
 
-	if (isset ($_REQUEST['rid']) && preg_match("/^[0-9]+$/") && isset ($room_array[$_REQUEST['rid']]))
-		$rid = $_REQUEST['rid'];
-	else {
-		$ok = false;
-		$rid = 0;
-		$msg .= error("Wähle bitte einen Raum aus.");
-	}
-	
-	
+	if (isset ($_REQUEST['preview'])) {
+		// Name/Bezeichnung der Schicht, darf nicht leer sein
+		if (isset ($_REQUEST['name']) && strlen($_REQUEST['name']) > 0)
+			$name = strip_request_item('name');
+		else {
+			$ok = false;
+			$name = "";
+			$msg .= error("Gib bitte einen Namen für die Schicht(en) an.");
+		}
 
+		// Auswahl der sichtbaren Locations für die Schichten
+
+		if (isset ($_REQUEST['rid']) && preg_match("/^[0-9]+$/", $_REQUEST['rid']) && isset ($room_array[$_REQUEST['rid']]))
+			$rid = $_REQUEST['rid'];
+		else {
+			$ok = false;
+			$rid = $rooms[0]['RID'];
+			$msg .= error("Wähle bitte einen Raum aus.");
+		}
+	}
 	$room_select = html_select_key('rid', $room_array, '');
 
 	$types = sql_select("SELECT * FROM `AngelTypes` ORDER BY `Name`");
@@ -44,7 +50,11 @@ function admin_shifts() {
 	}
 	return template_render('../templates/admin_shifts.html', array (
 		'angel_types' => $angel_types,
-		'room_select' => $room_select
+		'room_select' => $room_select,
+		'msg' => $msg,
+		'name' => $name,
+		'start' => $start,
+		'end' => $end
 	));
 }
 ?>
\ No newline at end of file
diff --git a/templates/admin_shifts.html b/templates/admin_shifts.html
index 3c8da90c..45663956 100644
--- a/templates/admin_shifts.html
+++ b/templates/admin_shifts.html
@@ -1,5 +1,9 @@
+<noscript>
+    Diese Seite ist mit aktiviertem JavaScript sehr viel komfortabler.
+</noscript>
 <form action="" method="post">
     <fieldset>
+        %msg%
         <p>
             <label>
                 Name/Beschreibung:
@@ -15,13 +19,13 @@
             <label>
                 Beginn:
             </label>
-            <input type="text" value="" />
+            <input type="text" name="start" value="%start%" />
         </p>
         <p>
             <label>
                 Ende:
             </label>
-            <input type="text" value="" />
+            <input type="text" name="end" value="%end%" />
         </p><h2>Modus:</h2>
         <p>
             <label>
diff --git a/templates/admin_shifts_angel_types.html b/templates/admin_shifts_angel_types.html
index 49f60ce1..5ac1f8e6 100644
--- a/templates/admin_shifts_angel_types.html
+++ b/templates/admin_shifts_angel_types.html
@@ -5,10 +5,10 @@
     <span class="spinner"><a id="type_%id%_down" href="#">-</a><input type="text" id="type_%id%" name="type_%id%" value="%value%" /><a id="type_%id%_up" href="#">+</a></span>
     <script type="text/javascript">
         document.getElementById("type_%id%_up").onclick = function(e){
-            document.getElementById("type_%id%").value = parseInt(document.getElementById("type_%id%").value) + 1;
+            document.getElementById("type_%id%").value = (parseInt(document.getElementById("type_%id%").value) + 101) % 100;
         };
-        var down = document.getElementById("type_%id%_down").onclick = function(e){
-            document.getElementById("type_%id%").value = parseInt(document.getElementById("type_%id%").value) - 1;
+        document.getElementById("type_%id%_down").onclick = function(e){
+            document.getElementById("type_%id%").value = (parseInt(document.getElementById("type_%id%").value) +99) % 100;
         };
     </script>
 </p>