diff --git a/app/Entities/Users/UsersRepository.php b/app/Entities/Users/UsersRepository.php
index 5051264..8a05668 100755
--- a/app/Entities/Users/UsersRepository.php
+++ b/app/Entities/Users/UsersRepository.php
@@ -18,11 +18,11 @@ class UsersRepository extends BaseRepository
         parent::__construct($model);
     }
 
-    public function getUsers($q, $rolesString)
+    public function getUsers($q)
     {
         return $this->model->latest()
             ->where('name', 'like', '%'.$q.'%')
-            ->paginate($this->_paginate);
+            ->get();
     }
 
     public function create($userData)
diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php
index 678a950..884e614 100755
--- a/app/Http/Controllers/Users/UsersController.php
+++ b/app/Http/Controllers/Users/UsersController.php
@@ -21,7 +21,7 @@ class UsersController extends Controller
 
     public function index(Request $req)
     {
-        $users = $this->repo->getUsers($req->get('q'), $req->get('role'));
+        $users = $this->repo->getUsers($req->get('q'));
         return view('users.index', compact('users'));
     }
 
diff --git a/resources/lang/id/user.php b/resources/lang/id/user.php
index 6860c42..88549ad 100644
--- a/resources/lang/id/user.php
+++ b/resources/lang/id/user.php
@@ -2,33 +2,31 @@
 
 return [
     // Label
-    'user'            => 'User',
-    'users'           => 'Daftar User',
-    'user_id'         => 'User ID',
-    'profile'         => 'Profil User',
-    'search'          => 'Cari User: ketik nama',
-    'role'            => 'Grup',
-    'roles'           => 'Grup',
-    'search'          => 'Ketik nama user lalu tekan Enter..',
-    'found'           => 'User ditemukan',
-    'not_found'       => 'User tidak ditemukan',
-    'empty'           => 'Belum ada User',
-    'back_to_index'   => 'Kembali ke Daftar User',
+    'user'          => 'User',
+    'list'          => 'Daftar User',
+    'user_id'       => 'User ID',
+    'profile'       => 'Profil User',
+    'search'        => 'Cari User: ketik nama',
+    'search'        => 'Ketik nama user lalu tekan Enter..',
+    'found'         => 'User ditemukan',
+    'not_found'     => 'User tidak ditemukan',
+    'empty'         => 'Belum ada User',
+    'back_to_index' => 'Kembali ke Daftar User',
 
     // Actions
-    'create'          => 'Input User Baru',
-    'created'         => 'Input User baru telah berhasil.',
-    'show'            => 'Detail User',
-    'edit'            => 'Edit Data User',
-    'update'          => 'Update Data User',
-    'updated'         => 'Update data User telah berhasil.',
-    'delete'          => 'Hapus Data User',
-    'deleted'         => 'Hapus data User telah berhasil.',
-    'undeleted'       => 'Data User gagal dihapus.',
+    'create'        => 'Input User Baru',
+    'created'       => 'Input User baru telah berhasil.',
+    'show'          => 'Detail User',
+    'edit'          => 'Edit Data User',
+    'update'        => 'Update Data User',
+    'updated'       => 'Update data User telah berhasil.',
+    'delete'        => 'Hapus Data User',
+    'deleted'       => 'Hapus data User telah berhasil.',
+    'undeleted'     => 'Data User gagal dihapus.',
 
     // Attributes
-    'name'            => 'Nama User',
-    'registered_at'   => 'Terdaftar sejak',
-    'email'           => 'Alamat Email',
-    'api_token'       => 'API Token',
-];
\ No newline at end of file
+    'name'          => 'Nama User',
+    'email'         => 'Alamat Email',
+    'api_token'     => 'API Token',
+    'registered_at' => 'Terdaftar sejak',
+];
diff --git a/resources/views/layouts/partials/sidebar.blade.php b/resources/views/layouts/partials/sidebar.blade.php
index d50e549..d146a6a 100755
--- a/resources/views/layouts/partials/sidebar.blade.php
+++ b/resources/views/layouts/partials/sidebar.blade.php
@@ -27,7 +27,6 @@
             <li>{!! html_link_to_route('subscriptions.index', trans('subscription.subscription'), [], ['icon' => 'retweet']) !!}</li>
             <li>{!! html_link_to_route('payments.index', trans('payment.payments'), [], ['icon' => 'money']) !!}</li>
             <li>{!! html_link_to_route('customers.index', trans('customer.list'), [], ['icon' => 'users']) !!}</li>
-            <li>{!! html_link_to_route('users.index', trans('user.users'), [], ['icon' => 'users']) !!}</li>
             <li>
                 <a href="{{ route('options.index') }}"><i class="fa fa-gears fa-fw"></i> Options <span class="fa arrow"></span></a>
                 <ul class="nav nav-second-level">
diff --git a/resources/views/pages/partials/dashboard-nav-tabs.blade.php b/resources/views/pages/partials/dashboard-nav-tabs.blade.php
index f30e8b9..84cb440 100644
--- a/resources/views/pages/partials/dashboard-nav-tabs.blade.php
+++ b/resources/views/pages/partials/dashboard-nav-tabs.blade.php
@@ -10,6 +10,9 @@
         <li class="{{ Request::segment(1) == 'agency' ? 'active' : '' }}">
             {!! link_to_route('users.agency.show', trans('auth.agency')) !!}
         </li>
+        <li class="{{ Request::segment(1) == 'users' ? 'active' : '' }}">
+            {!! link_to_route('users.index', trans('user.list')) !!}
+        </li>
     @endcan
 </ul>
 <br>
diff --git a/resources/views/users/create.blade.php b/resources/views/users/create.blade.php
index 4740f65..b0e1479 100755
--- a/resources/views/users/create.blade.php
+++ b/resources/views/users/create.blade.php
@@ -1,14 +1,13 @@
-@extends('layouts.app')
+@extends('layouts.dashboard')
 
 @section('title', trans('user.create'))
 
-@section('content')
-<h1 class="page-header">{{ trans('user.create') }}</h1>
+@section('content-dashboard')
 <div class="row">
     <div class="col-md-6">
         {!! Form::open(['route'=>'users.store']) !!}
         <div class="panel panel-default">
-            <div class="panel-heading"><h3 class="panel-title">User Data</h3></div>
+            <div class="panel-heading"><h3 class="panel-title">{{ trans('user.create') }}</h3></div>
             <div class="panel-body">
                 {!! FormField::text('name', ['label' => trans('app.name')]) !!}
                 {!! FormField::email('email', ['label' => trans('user.email')]) !!}
diff --git a/resources/views/users/delete.blade.php b/resources/views/users/delete.blade.php
index d543ee6..9723ff9 100755
--- a/resources/views/users/delete.blade.php
+++ b/resources/views/users/delete.blade.php
@@ -1,33 +1,29 @@
-@extends('layouts.app')
+@extends('layouts.dashboard')
 
 @section('title', trans('user.delete'))
 
-@section('content')
-<h1 class="page-header">
-    <div class="pull-right">
-        {!! FormField::delete(['route'=>['users.destroy',$user->id]], trans('app.delete_confirm_button'), ['class'=>'btn btn-danger'], ['user_id'=>$user->id]) !!}
-    </div>
-    {{ trans('app.delete_confirm') }}
-    {!! link_to_route('users.show', trans('app.cancel'), [$user->id], ['class' => 'btn btn-default']) !!}
-</h1>
+@section('content-dashboard')
 <div class="row">
-    <div class="col-md-4">
-        <div class="panel panel-info">
-            <div class="panel-heading"><h3 class="panel-title">{{ trans('user.user') }} Detail</h3></div>
+    <div class="col-md-4 col-lg-offset-3">
+        <div class="panel panel-danger">
+            <div class="panel-heading"><h3 class="panel-title">{{ trans('user.delete') }}</h3></div>
+            <table class="table table-condensed">
+                <tbody>
+                    <tr><th>{{ trans('app.name') }}</th><td>{{ $user->name }}</td></tr>
+                    <tr><th>{{ trans('user.email') }}</th><td>{{ $user->email }}</td></tr>
+                    <tr><th>{{ trans('user.registered_at') }}</th><td>{{ $user->created_at }}</td></tr>
+                </tbody>
+            </table>
             <div class="panel-body">
-                <table class="table table-condensed">
-                    <tbody>
-                        <tr><th>{{ trans('app.name') }}</th><td>{{ $user->name }}</td></tr>
-                        <tr><th>{{ trans('user.email') }}</th><td>{{ $user->email }}</td></tr>
-                        <tr>
-                            <th>{{ trans('user.role') }}</th>
-                            <td>{{ $user->present()->displayRoles }}</td>
-                        </tr>
-                        <tr><th>{{ trans('user.registered_at') }}</th><td>{{ $user->created_at }}</td></tr>
-                    </tbody>
-                </table>
+                {{ trans('app.delete_confirm') }}
+            </div>
+            <div class="panel-footer">
+                {!! link_to_route('users.show', trans('app.cancel'), [$user->id], ['class' => 'btn btn-default']) !!}
+                <div class="pull-right">
+                    {!! FormField::delete(['route'=>['users.destroy',$user->id]], trans('app.delete_confirm_button'), ['class'=>'btn btn-danger'], ['user_id'=>$user->id]) !!}
+                </div>
             </div>
         </div>
     </div>
 </div>
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 5b39b71..7a0915d 100755
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -1,14 +1,13 @@
-@extends('layouts.app')
+@extends('layouts.dashboard')
 
 @section('title', trans('user.edit'))
 
-@section('content')
-<h1 class="page-header">{{ $user->name }} <small>Edit {{ trans('user.user') }}</small></h1>
+@section('content-dashboard')
 {!! Form::model($user, ['route'=>['users.update', $user->id], 'method' => 'patch']) !!}
 <div class="row">
     <div class="col-md-6">
         <div class="panel panel-default">
-            <div class="panel-heading"><h3 class="panel-title">{{ trans('user.show') }}</h3></div>
+            <div class="panel-heading"><h3 class="panel-title">{{ $user->name }} - {{ trans('user.edit') }}</h3></div>
             <div class="panel-body">
                 {!! FormField::text('name', ['label' => trans('app.name')]) !!}
                 {!! FormField::email('email', ['label' => trans('user.email')]) !!}
@@ -25,14 +24,14 @@
                     'label' => trans('auth.password_confirmation')
                 ]) !!}
             </div>
+            <div class="panel-footer">
+                {!! Form::submit(trans('user.update'), ['class'=>'btn btn-warning']) !!}
+                {!! link_to_route('users.show', trans('app.show'), [$user->id], ['class' => 'btn btn-info']) !!}
+                {!! link_to_route('users.index', trans('user.back_to_index'), [], ['class' => 'btn btn-default']) !!}
+                {!! link_to_route('users.delete', trans('app.delete'), [$user->id], ['class'=>'btn btn-danger pull-right']) !!}
+            </div>
         </div>
     </div>
 </div>
-<div class="panel-footer">
-    {!! Form::submit(trans('user.update'), ['class'=>'btn btn-warning']) !!}
-    {!! link_to_route('users.show', trans('app.show'), [$user->id], ['class' => 'btn btn-info']) !!}
-    {!! link_to_route('users.index', trans('user.back_to_index'), [], ['class' => 'btn btn-default']) !!}
-    {!! link_to_route('users.delete', trans('app.delete'), [$user->id], ['class'=>'btn btn-danger pull-right']) !!}
-</div>
 {!! Form::close() !!}
 @endsection
diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index 9ee66f9..22d5ea6 100755
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -1,48 +1,41 @@
-@extends('layouts.app')
+@extends('layouts.dashboard')
 
-@section('title', trans('user.users'))
+@section('title', trans('user.list'))
 
-@section('content')
-<h1 class="page-header">
-    {!! link_to_route('users.create', trans('user.create'), [], ['class'=>'btn btn-success pull-right']) !!}
-    {{ trans('user.users') }} <small>{{ $users->total() }} {{ trans('user.found') }}</small>
-</h1>
-<div class="well well-sm">
-    {!! Form::open(['method'=>'get','class'=>'form-inline']) !!}
-    @if (Request::has('role'))
-    {!! Form::hidden('role', Request::get('role')) !!}
-    @endif
-    {!! Form::text('q', Request::get('q'), ['class'=>'form-control','placeholder'=>trans('user.search'),'style' => 'width:350px']) !!}
-    {!! Form::submit('Cari Member', ['class' => 'btn btn-info btn-sm']) !!}
-    {!! link_to_route('users.index','Reset',['role' => Request::get('role')],['class' => 'btn btn-default btn-sm']) !!}
-    {!! Form::close() !!}
-</div>
+@section('content-dashboard')
 
-<table class="table table-condensed">
-    <thead>
-        <th>{{ trans('app.table_no') }}</th>
-        <th>{{ trans('app.name') }}</th>
-        <th>{{ trans('user.email') }}</th>
-        <th>{{ trans('user.roles') }}</th>
-        <th>{{ trans('app.action') }}</th>
-    </thead>
-    <tbody>
-        @forelse($users as $key => $user)
-        <tr>
-            <td>{{ $users->firstItem() + $key }}</td>
-            <td>{{ $user->name }}</td>
-            <td>{{ $user->email }}</td>
-            <td>{!! $user->present()->roleslink !!}</td>
-            <td>
-                {!! link_to_route('users.show',trans('user.show'),[$user->id],['class'=>'btn btn-info btn-xs']) !!}
-            </td>
-        </tr>
-        @empty
-        <tr>
-            <td colspan="5">{{ trans('user.not_found') }}</td>
-        </tr>
-        @endforelse
-    </tbody>
-</table>
-    {!! str_replace('/?', '?', $users->appends(Request::except('page'))->render()) !!}
+<div class="panel panel-default">
+    <div class="panel-heading">
+        {!! html_link_to_route('users.create', trans('user.create'), [], [
+            'class'=>'btn btn-success btn-xs pull-right',
+            'style' => 'margin:-2px 0',
+            'icon' => 'plus'
+        ]) !!}
+        <h3 class="panel-title">@lang('user.list')</h3>
+    </div>
+    <table class="table table-condensed">
+        <thead>
+            <th>{{ trans('app.table_no') }}</th>
+            <th>{{ trans('app.name') }}</th>
+            <th>{{ trans('user.email') }}</th>
+            <th>{{ trans('app.action') }}</th>
+        </thead>
+        <tbody>
+            @forelse($users as $key => $user)
+            <tr>
+                <td>{{ 1 + $key }}</td>
+                <td>{{ $user->name }}</td>
+                <td>{{ $user->email }}</td>
+                <td>
+                    {!! link_to_route('users.show',trans('user.show'),[$user->id],['class'=>'btn btn-info btn-xs']) !!}
+                </td>
+            </tr>
+            @empty
+            <tr>
+                <td colspan="5">{{ trans('user.not_found') }}</td>
+            </tr>
+            @endforelse
+        </tbody>
+    </table>
+</div>
 @endsection
diff --git a/resources/views/users/roles.blade.php b/resources/views/users/roles.blade.php
deleted file mode 100755
index 0c961ab..0000000
--- a/resources/views/users/roles.blade.php
+++ /dev/null
@@ -1,109 +0,0 @@
-@extends('layouts.app')
-
-@section('title', trans('user.roles'))
-
-@section('content')
-<h1 class="page-header">
-    @if (Request::get('act') != 'add')
-    {!! link_to_route('roles.index', trans('role.create'), ['act' => 'add'], ['class'=>'btn btn-success pull-right']) !!}
-    @endif
-    {{ trans('role.roles') }}
-</h1>
-
-<div class="row">
-    <div class="col-md-4 col-md-push-8">
-        @if (Request::get('act') == 'add')
-        <div class="panel panel-success">
-            <div class="panel-heading"><h3 class="panel-title">{{ trans('role.create') }}</h3></div>
-            <div class="panel-body">
-                {!! Form::open(['route'=>'roles.store']) !!}
-                {!! FormField::text('name') !!}
-                {!! FormField::text('label') !!}
-                {!! Form::submit(trans('role.create'), ['class' => 'btn btn-success']) !!}
-                {!! link_to_route('roles.index', trans('app.cancel'), [], ['class'=>'btn btn-default pull-right']) !!}
-                {!! Form::close() !!}
-            </div>
-        </div>
-        @elseif (Request::get('act') == 'edit' && !is_null($role))
-        <div class="panel panel-warning">
-            <div class="panel-heading"><h3 class="panel-title">{{ trans('role.edit') }}</h3></div>
-            <div class="panel-body">
-                {!! Form::model($role, ['route'=>['roles.update', $role->id],'method'=>'patch']) !!}
-                {!! FormField::text('name') !!}
-                {!! FormField::text('label') !!}
-                {!! Form::submit(trans('role.update'), ['class' => 'btn btn-warning']) !!}
-                {!! link_to_route('roles.index', trans('app.cancel'), [], ['class'=>'btn btn-default pull-right']) !!}
-                {!! Form::close() !!}
-            </div>
-        </div>
-        @elseif (Request::get('act') == 'del' && !is_null($role))
-        <div class="panel panel-danger">
-            <div class="panel-heading"><h3 class="panel-title">{{ trans('role.delete') }}</h3></div>
-            <div class="panel-body">
-                {{ trans('app.delete_confirm') }}
-            </div>
-            <table class="table table-condensed">
-                <tbody>
-                    <tr><th>{{ trans('app.name') }}</th><td>{{ $role->name }}</td></tr>
-                    <tr><th>{{ trans('app.label') }}</th><td>{{ $role->label }}</td></tr>
-                    <tr><th>{{ trans('role.users_count') }}</th><td>{{ $role->users()->count() }}</td></tr>
-                </tbody>
-            </table>
-            <div class="panel-footer">
-                {!! link_to_route('roles.index', trans('app.cancel'), [], ['class' => 'btn btn-default']) !!}
-                @if ($role->users()->count() < 1)
-                {!! FormField::delete(['route'=>['roles.destroy',$role->id]], trans('app.delete_confirm_button'), ['class'=>'btn btn-danger pull-right'], ['role_id'=>$role->id]) !!}
-                @endif
-            </div>
-        </div>
-        @elseif (Request::get('act') == 'show' && !is_null($role))
-        <div class="panel panel-info">
-            <div class="panel-heading"><h3 class="panel-title">{{ trans('role.show') }}</h3></div>
-            <table class="table table-condensed">
-                <tbody>
-                    <tr><th>{{ trans('app.name') }}</th><td>{{ $role->name }}</td></tr>
-                    <tr><th>{{ trans('app.label') }}</th><td>{{ $role->label }}</td></tr>
-                    <tr><th>{{ trans('role.users_count') }}</th><td>{{ $role->users()->count() }}</td></tr>
-                </tbody>
-            </table>
-            <div class="panel-footer">
-                {!! link_to_route('roles.index', trans('app.edit'), ['act'=>'edit','id'=>$role->id], ['class' => 'btn btn-warning']) !!}
-                {!! link_to_route('roles.index', trans('app.cancel'), [], ['class' => 'btn btn-default']) !!}
-            </div>
-        </div>
-        @endif
-    </div>
-    <div class="col-md-8 col-md-pull-4">
-        <div class="panel panel-default">
-            <table class="table table-condensed">
-                <thead>
-                    <th>{{ trans('app.table_no') }}</th>
-                    <th>{{ trans('app.name') }}</th>
-                    <th>{{ trans('app.label') }}</th>
-                    <th class="text-center">{{ trans('role.users_count') }}</th>
-                    <th>{{ trans('app.action') }}</th>
-                </thead>
-                <tbody>
-                    @forelse($roles as $key => $role)
-                    <tr>
-                        <td>{{ $key + 1 }}</td>
-                        <td>{{ $role->name }}</td>
-                        <td>{{ $role->label }}</td>
-                        <td class="text-center">{{ $role->users()->count() }}</td>
-                        <td>
-                            {!! link_to_route('roles.index','detail',['act' => 'show', 'id' => $role->id],['class'=>'btn btn-info btn-xs']) !!}
-                            {!! link_to_route('roles.index','edit',['act' => 'edit', 'id' => $role->id],['class'=>'btn btn-warning btn-xs']) !!}
-                            {!! link_to_route('roles.index','x',['act' => 'del', 'id' => $role->id],['class'=>'btn btn-danger btn-xs']) !!}
-                        </td>
-                    </tr>
-                    @empty
-                    <tr>
-                        <td colspan="5">{{ trans('role.not_found') }}</td>
-                    </tr>
-                    @endforelse
-                </tbody>
-            </table>
-        </div>
-    </div>
-</div>
-@endsection
diff --git a/resources/views/users/show.blade.php b/resources/views/users/show.blade.php
index 3eac1a7..e670942 100755
--- a/resources/views/users/show.blade.php
+++ b/resources/views/users/show.blade.php
@@ -1,22 +1,17 @@
-@extends('layouts.app')
+@extends('layouts.dashboard')
 
 @section('title', trans('user.show'))
 
-@section('content')
-<h1 class="page-header">{{ $user->name }} <small>{{ trans('user.show') }}</small></h1>
+@section('content-dashboard')
 <div class="row">
     <div class="col-md-6">
         <div class="panel panel-default">
-            <div class="panel-heading"><h3 class="panel-title">{{ trans('user.show') }}</h3></div>
+            <div class="panel-heading"><h3 class="panel-title">{{ $user->name }} - {{ trans('user.show') }}</h3></div>
             <div class="panel-body">
                 <table class="table table-condensed">
                     <tbody>
                         <tr><th>{{ trans('app.name') }}</th><td>{{ $user->name }}</td></tr>
                         <tr><th>{{ trans('user.email') }}</th><td>{{ $user->email }}</td></tr>
-                        <tr>
-                            <th>{{ trans('user.role') }}</th>
-                            <td>{{ $user->present()->displayRoles }}</td>
-                        </tr>
                         <tr><th>{{ trans('user.registered_at') }}</th><td>{{ $user->created_at }}</td></tr>
                     </tbody>
                 </table>
@@ -28,4 +23,4 @@
         </div>
     </div>
 </div>
-@endsection
\ No newline at end of file
+@endsection