diff --git a/includes/controller/users_controller.php b/includes/controller/users_controller.php
index 2bccc609..3a23835c 100644
--- a/includes/controller/users_controller.php
+++ b/includes/controller/users_controller.php
@@ -5,13 +5,13 @@
  */
 function users_controller() {
   global $privileges, $user;
-
+  
   if (! isset($user))
     redirect(page_link_to(''));
-
+  
   if (! isset($_REQUEST['action']))
     $_REQUEST['action'] = 'list';
-
+  
   switch ($_REQUEST['action']) {
     default:
     case 'list':
@@ -27,16 +27,17 @@ function users_controller() {
 
 function user_controller() {
   global $privileges, $user;
-
+  
   if (isset($_REQUEST['user_id'])) {
     $user_source = User($_REQUEST['user_id']);
   } else
     $user_source = $user;
-
+  
   $admin_user_privilege = in_array('admin_user', $privileges);
-
+  
   $shifts = Shifts_by_user($user_source);
   foreach ($shifts as &$shift) {
+    // TODO: Move queries to model
     $shift['needed_angeltypes'] = sql_select("SELECT DISTINCT `AngelTypes`.* FROM `ShiftEntry` JOIN `AngelTypes` ON `ShiftEntry`.`TID`=`AngelTypes`.`id` WHERE `ShiftEntry`.`SID`=" . sql_escape($shift['SID']) . "  ORDER BY `AngelTypes`.`name`");
     foreach ($shift['needed_angeltypes'] as &$needed_angeltype) {
       $needed_angeltype['users'] = sql_select("
@@ -47,13 +48,13 @@ function user_controller() {
           AND `ShiftEntry`.`TID`=" . sql_escape($needed_angeltype['id']));
     }
   }
-
+  
   if ($user_source['api_key'] == "")
     User_reset_api_key($user_source, false);
-
+  
   return array(
       $user_source['Nick'],
-      User_view($user_source, $admin_user_privilege, User_is_freeloader($user_source), User_angeltypes($user_source), User_groups($user_source), $shifts, $user['UID'] == $user_source['UID'])
+      User_view($user_source, $admin_user_privilege, User_is_freeloader($user_source), User_angeltypes($user_source), User_groups($user_source), $shifts, $user['UID'] == $user_source['UID']) 
   );
 }
 
@@ -62,24 +63,24 @@ function user_controller() {
  */
 function users_list_controller() {
   global $privileges;
-
+  
   if (! in_array('admin_user', $privileges))
     redirect(page_link_to(''));
-
+  
   $order_by = 'Nick';
   if (isset($_REQUEST['OrderBy']) && in_array($_REQUEST['OrderBy'], User_sortable_columns()))
     $order_by = $_REQUEST['OrderBy'];
-
+  
   $users = Users($order_by);
   if ($users === false)
     engelsystem_error('Unable to load users.');
-
+  
   foreach ($users as &$user)
     $user['freeloads'] = count(ShiftEntries_freeloaded_by_user($user));
-
+  
   return array(
       _('All users'),
-      Users_view($users, $order_by, User_arrived_count(), User_active_count(), User_force_active_count(), ShiftEntries_freeleaded_count(), User_tshirts_count())
+      Users_view($users, $order_by, User_arrived_count(), User_active_count(), User_force_active_count(), ShiftEntries_freeleaded_count(), User_tshirts_count()) 
   );
 }
 
@@ -96,10 +97,10 @@ function user_password_recovery_controller() {
       error(_("Token is not correct."));
       redirect(page_link_to('login'));
     }
-
+    
     if (isset($_REQUEST['submit'])) {
       $ok = true;
-
+      
       if (isset($_REQUEST['password']) && strlen($_REQUEST['password']) >= MIN_PASSWORD_LENGTH) {
         if ($_REQUEST['password'] != $_REQUEST['password2']) {
           $ok = false;
@@ -109,22 +110,22 @@ function user_password_recovery_controller() {
         $ok = false;
         error(_("Your password is to short (please use at least 6 characters)."));
       }
-
+      
       if ($ok) {
         $result = set_password($user_source['UID'], $_REQUEST['password']);
         if ($result === false)
           engelsystem_error(_("Password could not be updated."));
-
+        
         success(_("Password saved."));
         redirect(page_link_to('login'));
       }
     }
-
+    
     return User_password_set_view();
   } else {
     if (isset($_REQUEST['submit'])) {
       $ok = true;
-
+      
       if (isset($_REQUEST['email']) && strlen(strip_request_item('email')) > 0) {
         $email = strip_request_item('email');
         if (check_email($email)) {
@@ -143,7 +144,7 @@ function user_password_recovery_controller() {
         $ok = false;
         error(_("Please enter your e-mail."));
       }
-
+      
       if ($ok) {
         $token = User_generate_password_recovery_token($user_source);
         if ($token === false)
@@ -151,12 +152,12 @@ function user_password_recovery_controller() {
         $result = engelsystem_email_to_user($user_source, _("Password recovery"), sprintf(_("Please visit %s to recover your password."), page_link_to_absolute('user_password_recovery') . '&token=' . $token));
         if ($result === false)
           engelsystem_error("Unable to send password recovery email.");
-
+        
         success(_("We sent an email containing your password recovery link."));
         redirect(page_link_to('login'));
       }
     }
-
+    
     return User_password_recovery_view();
   }
 }
diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php
index 3d8b5381..fc375092 100644
--- a/includes/pages/guest_login.php
+++ b/includes/pages/guest_login.php
@@ -293,9 +293,9 @@ function guest_login() {
           form_text('nick', _("Nick"), $nick),
           form_password('password', _("Password")),
           form_submit('submit', _("Login")),
-          form_info("", buttons(array(
+          buttons(array(
               button(page_link_to('user_password_recovery'), _("I forgot my password")) 
-          ))),
+          )),
           info(_("Please note: You have to activate cookies!"), true) 
       )),
       '</div>',
diff --git a/includes/sys_template.php b/includes/sys_template.php
index 7ffe1529..d3f7a24e 100644
--- a/includes/sys_template.php
+++ b/includes/sys_template.php
@@ -87,7 +87,7 @@ function toolbar_popover($glyphicon, $label, $content, $class = '') {
   return '<li class="dropdown messages ' . $class . '">
           <a id="' . $id . '" href="#" tabindex="0">' . ($glyphicon != '' ? '<span class="glyphicon glyphicon-' . $glyphicon . '"></span> ' : '') . $label . ' <span class="caret"></span></a>
           <script type="text/javascript">
-          $(document).ready(function(){$("#' . $id . '").popover({trigger: "focus", html: true, content: "' . addslashes(join('', $content)) . '", placement: "bottom", container: "body"})});
+          $(document).ready(function(){$("#' . $id . '").popover({trigger: "click focus", html: true, content: "' . addslashes(join('', $content)) . '", placement: "bottom", container: "#navbar-collapse-1"})});
           </script></li>';
 }
 
diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index 59456946..a7d77b19 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -99,6 +99,8 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel
   $timesum = 0;
   foreach ($shifts as $shift) {
     $shift_info = '<a href="' . shift_link($shift) . '">' . $shift['name'] . '</a>';
+    if ($shift['title'])
+      $shift_info .= '<br /><a href="' . shift_link($shift) . '">' . $shift['title'] . '</a>';
     foreach ($shift['needed_angeltypes'] as $needed_angel_type) {
       $shift_info .= '<br><b>' . $needed_angel_type['name'] . ':</b> ';