diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 6956b8d18..d1c8865a9 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -200,11 +200,14 @@ class UserController extends Controller
         });
 
         $user = $this->userRepo->getById($id);
+
         if ($this->userRepo->isOnlyAdmin($user)) {
             session()->flash('error', 'You cannot delete the only admin');
             return redirect($user->getEditUrl());
         }
+
         $this->userRepo->destroy($user);
+        session()->flash('success', 'User successfully removed');
 
         return redirect('/settings/users');
     }
diff --git a/resources/views/settings/navbar.blade.php b/resources/views/settings/navbar.blade.php
index 4b084a3bf..b656f5b36 100644
--- a/resources/views/settings/navbar.blade.php
+++ b/resources/views/settings/navbar.blade.php
@@ -3,9 +3,15 @@
     <div class="container">
         <div class="row">
             <div class="col-md-12 setting-nav nav-tabs">
-                <a href="/settings" @if($selected == 'settings') class="selected text-button" @endif><i class="zmdi zmdi-settings"></i>Settings</a>
-                <a href="/settings/users" @if($selected == 'users') class="selected text-button" @endif><i class="zmdi zmdi-accounts"></i>Users</a>
-                <a href="/settings/roles" @if($selected == 'roles') class="selected text-button" @endif><i class="zmdi zmdi-lock-open"></i>Roles</a>
+                @if($currentUser->can('settings-manage'))
+                    <a href="/settings" @if($selected == 'settings') class="selected text-button" @endif><i class="zmdi zmdi-settings"></i>Settings</a>
+                @endif
+                @if($currentUser->can('users-manage'))
+                    <a href="/settings/users" @if($selected == 'users') class="selected text-button" @endif><i class="zmdi zmdi-accounts"></i>Users</a>
+                @endif
+                @if($currentUser->can('user-roles-manage'))
+                    <a href="/settings/roles" @if($selected == 'roles') class="selected text-button" @endif><i class="zmdi zmdi-lock-open"></i>Roles</a>
+                @endif
             </div>
         </div>
     </div>
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 6d18c12f0..16fc1bfa2 100644
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -3,33 +3,29 @@
 
 @section('content')
 
-    <div class="faded-small toolbar">
-        <div class="container">
-            <div class="row">
-                <div class="col-sm-6"></div>
-                <div class="col-sm-6 faded">
-                    <div class="action-buttons">
-                        <a href="/settings/users/{{$user->id}}/delete" class="text-neg text-button"><i class="zmdi zmdi-delete"></i>Delete User</a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
+    @include('settings/navbar', ['selected' => 'users'])
 
 
 
     <div class="container small">
         <form action="/settings/users/{{$user->id}}" method="post">
-        <div class="row">
+            <div class="row">
+                <div class="col-sm-8">
+                    <h1>Edit {{ $user->id === $currentUser->id ? 'Profile' : 'User' }}</h1>
+                </div>
+                <div class="col-sm-4">
+                    <p></p>
+                    <a href="/settings/users/{{$user->id}}/delete" class="neg button float right">Delete User</a>
+                </div>
+            </div>
+            <div class="row">
             <div class="col-md-6" ng-non-bindable>
-                <h1>Edit {{ $user->id === $currentUser->id ? 'Profile' : 'User' }}</h1>
                 {!! csrf_field() !!}
                 <input type="hidden" name="_method" value="put">
                 @include('users.forms.' . $authMethod, ['model' => $user])
 
             </div>
             <div class="col-md-6">
-                <h1>&nbsp;</h1>
                 <div class="form-group" id="logo-control">
                     <label for="user-avatar">User Avatar</label>
                     <p class="small">This image should be approx 256px square.</p>