diff --git a/app/Http/Controllers/Admin/UserManagement.php b/app/Http/Controllers/Admin/CreateNewUser.php
similarity index 83%
rename from app/Http/Controllers/Admin/UserManagement.php
rename to app/Http/Controllers/Admin/CreateNewUser.php
index 685801ba..ef7cc86c 100644
--- a/app/Http/Controllers/Admin/UserManagement.php
+++ b/app/Http/Controllers/Admin/CreateNewUser.php
@@ -9,8 +9,13 @@ use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 
-class UserManagement extends Controller
+class CreateNewUser extends Controller
 {
+    /**
+     * Show the form for creating new user
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
     public function getNewUser()
     {
         // define list of roles, this list will be used in template for selecting proper role for user
@@ -24,20 +29,6 @@ class UserManagement extends Controller
         return $this->view('admin.userManagement.new', ['roles' => $roles]);
     }
 
-    public function getEditExistingUser($id)
-    {
-        // try to find user
-        $user = User::findOrFail($id);
-
-        // render view
-        return $this->view('admin.userManagement.edit', ['user' => $user]);
-    }
-
-    public function getOverview($state = null)
-    {
-        echo $state;
-    }
-
     /**
      * Create new user
      *
diff --git a/app/Http/Controllers/Admin/EditUser.php b/app/Http/Controllers/Admin/EditUser.php
new file mode 100644
index 00000000..041a5f63
--- /dev/null
+++ b/app/Http/Controllers/Admin/EditUser.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests;
+use App\Http\Requests\CreateNewUserRequest;
+use App\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Hash;
+
+class EditUser extends Controller {
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Admin/UserDetail.php b/app/Http/Controllers/Admin/UserDetail.php
new file mode 100644
index 00000000..e7ffc736
--- /dev/null
+++ b/app/Http/Controllers/Admin/UserDetail.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests;
+
+class UserDetail extends Controller
+{
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Admin/UserProfile.php b/app/Http/Controllers/Admin/UserProfile.php
new file mode 100644
index 00000000..83a4948c
--- /dev/null
+++ b/app/Http/Controllers/Admin/UserProfile.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests;
+use App\Http\Requests\CreateNewUserRequest;
+use App\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Hash;
+
+class UserProfile extends Controller {
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Admin/UsersOverview.php b/app/Http/Controllers/Admin/UsersOverview.php
new file mode 100644
index 00000000..b4251daf
--- /dev/null
+++ b/app/Http/Controllers/Admin/UsersOverview.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests;
+use App\Http\Requests\CreateNewUserRequest;
+use App\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Hash;
+
+class UsersOverview extends Controller {
+    public function getOverview() {
+        return view('admin.userManagement.overview');
+    }
+}
\ No newline at end of file
diff --git a/app/Http/routes.php b/app/Http/routes.php
index cd1a4407..ec8faf7a 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -33,19 +33,19 @@ Route::group([
          ->name('admin.dashboard');
 
     // display form for creating new user
-    Route::get('users/new', 'UserManagement@getNewUser')
+    Route::get('users/new', 'CreateNewUser@getNewUser')
          ->name('users.new');
 
     // display form for edit of existing user
-    Route::get('users/edit/{id}', 'UserManagement@getEditExistingUser')
+    Route::get('users/edit/{id}', 'EditUser@getEditExistingUser')
          ->name('users.edit');
 
     // display user detail in admin
-    Route::get('users/{id}', 'UserManagement@getDetail')
+    Route::get('users/detail/{id}', 'UserDetail@getDetail')
          ->name('users.detail');
 
     // display list of all users registered into our system
-    Route::get('users/overview/{state?}', 'UserManagement@getOverview')
+    Route::get('users/overview/{state?}', 'UsersOverview@getOverview')
          ->name('users.overview');
 
     // logout method
@@ -62,6 +62,6 @@ Route::group([
 
     // POST methods
     // display form for creating new user
-    Route::post('users/new', 'UserManagement@postRegistration')
+    Route::post('users/new', 'CreateNewUser@postRegistration')
          ->name('users.newPost');
 });
diff --git a/app/Providers/AdminMenusProvider.php b/app/Providers/AdminMenusProvider.php
index 246b5cb7..558a9375 100644
--- a/app/Providers/AdminMenusProvider.php
+++ b/app/Providers/AdminMenusProvider.php
@@ -25,10 +25,10 @@ class AdminMenusProvider extends ServiceProvider
              * WARNING: MenuBuilder::route() does not seem to work,
              * nor route() helper function. We need to use action() helper instaed.
             */
-            $menu->url(action('Admin\Dashboard@getIndex'), trans('admin/mainMenu.dashboard'), 1, ['icon' => 'fa fa-dashboard']);
+            $menu->route('admin.dashboard', trans('admin/mainMenu.dashboard'), [], 1, ['icon' => 'fa fa-dashboard']);
             $menu->dropdown(trans('admin/mainMenu.userManagement'), function($sub) {
-                $sub->url(action('Admin\UserManagement@getNewUser'), trans('admin/mainMenu.newUser'), 1, ['icon' => 'fa fa-user-plus']);
-                $sub->url(action('Admin\UserManagement@getOverview'), trans('admin/mainMenu.usersOverview'), 2, ['icon' => 'fa fa-users']);
+                $sub->route('users.new', trans('admin/mainMenu.newUser'), [], 1, ['icon' => 'fa fa-user-plus']);
+                $sub->route('users.overview', trans('admin/mainMenu.usersOverview'), [], 2, ['icon' => 'fa fa-users']);
 
             }, ['icon' => 'fa fa-users']);
             $menu->url('#', trans('admin/mainMenu.customFields'), 30, ['icon' => 'fa fa-code']);
diff --git a/resources/lang/en/admin/userManagement.php b/resources/lang/en/admin/userManagement.php
index 9bd63b9e..16001365 100644
--- a/resources/lang/en/admin/userManagement.php
+++ b/resources/lang/en/admin/userManagement.php
@@ -11,6 +11,8 @@ return [
     'role_visitor' => 'Visitor',
     'register' => 'Create user',
     'registrationSuccessfull' => 'New user successfully added.',
-    'profile' => 'Your profile'
+    'profile' => 'Your profile',
+    'overview' => 'List of all users',
+    'detail' => 'User\'s detail'
 
 ];
\ No newline at end of file
diff --git a/resources/views/admin/userManagement/detail.blade.php b/resources/views/admin/userManagement/detail.blade.php
index e69de29b..dcf91b97 100644
--- a/resources/views/admin/userManagement/detail.blade.php
+++ b/resources/views/admin/userManagement/detail.blade.php
@@ -0,0 +1,7 @@
+@extends('admin.layout')
+
+@section('pageName', @trans('admin/userManagement.detail'))
+
+@section('content')
+
+@stop
\ No newline at end of file
diff --git a/resources/views/admin/userManagement/edit.blade.php b/resources/views/admin/userManagement/edit.blade.php
index 9fbfee07..6bb26fbe 100644
--- a/resources/views/admin/userManagement/edit.blade.php
+++ b/resources/views/admin/userManagement/edit.blade.php
@@ -1 +1,7 @@
-edituji uzivatele {{$id}}.
\ No newline at end of file
+@extends('admin.layout')
+
+@section('pageName', @trans('admin/userManagement.editUser'))
+
+@section('content')
+
+@stop
\ No newline at end of file
diff --git a/resources/views/admin/userManagement/list.blade.php b/resources/views/admin/userManagement/list.blade.php
deleted file mode 100644
index e69de29b..00000000
diff --git a/resources/views/admin/userManagement/new.blade.php b/resources/views/admin/userManagement/new.blade.php
index 18eae7f9..c707ec8d 100644
--- a/resources/views/admin/userManagement/new.blade.php
+++ b/resources/views/admin/userManagement/new.blade.php
@@ -4,6 +4,8 @@
 
 @section('content')
 
+    <h1>@lang('admin/userManagement.addNewUser')</h1>
+
     @if (session('success'))
         <div class="callout success">
             {{ session('success') }}
diff --git a/resources/views/admin/userManagement/overview.blade.php b/resources/views/admin/userManagement/overview.blade.php
new file mode 100644
index 00000000..eb36523c
--- /dev/null
+++ b/resources/views/admin/userManagement/overview.blade.php
@@ -0,0 +1,7 @@
+@extends('admin.layout')
+
+@section('pageName', @trans('admin/userManagement.overview'))
+
+@section('content')
+
+@stop
\ No newline at end of file