diff --git a/app/Http/Requests/Accounts/RegisterRequest.php b/app/Http/Requests/Accounts/RegisterRequest.php
index b010081..fb2888c 100644
--- a/app/Http/Requests/Accounts/RegisterRequest.php
+++ b/app/Http/Requests/Accounts/RegisterRequest.php
@@ -25,7 +25,7 @@ class RegisterRequest extends Request
     {
         return [
             'name'                  => 'required|max:255',
-            'email'                 => 'required|email|max:255|unique:users,email|unique:agencies,email',
+            'email'                 => 'required|email|max:255|unique:users,email',
             'password'              => 'required|between:6,15|confirmed',
             'password_confirmation' => 'required',
         ];
diff --git a/resources/lang/id/app.php b/resources/lang/id/app.php
index 24df63b..0d55159 100644
--- a/resources/lang/id/app.php
+++ b/resources/lang/id/app.php
@@ -35,6 +35,7 @@ return [
     'delete_confirm_button' => 'Ya, silakan hapus!',
     'delete_confirm'        => 'Anda yakin ingin menghapus?',
     'change_photo'          => 'Ganti Foto',
+    'done'                  => 'Selesai',
 
     // Attributes
     'name'                  => 'Nama',
diff --git a/resources/lang/id/feature.php b/resources/lang/id/feature.php
index 3b33b01..e66cae6 100644
--- a/resources/lang/id/feature.php
+++ b/resources/lang/id/feature.php
@@ -25,6 +25,7 @@ return [
     'deleted'                => 'Hapus data Fitur telah berhasil.',
     'undeleted'              => 'Data Fitur gagal dihapus.',
     'add_from_other_project' => 'Tambah Fitur dari Project Lain',
+    'sort_tasks'             => 'Urutkan Prioritas Task',
 
     // Attributes
     'name'                   => 'Nama Fitur',
diff --git a/resources/views/features/partials/feature-show.blade.php b/resources/views/features/partials/feature-show.blade.php
index 0604b44..ceb00eb 100644
--- a/resources/views/features/partials/feature-show.blade.php
+++ b/resources/views/features/partials/feature-show.blade.php
@@ -2,7 +2,7 @@
     <div class="panel-heading"><h3 class="panel-title">{{ trans('feature.show') }}</h3></div>
     <table class="table table-condensed">
         <tbody>
-            <tr><th class="col-md-3">{{ trans('feature.name') }}</th><td class="col-md-9">{{ $feature->name }}</td></tr>
+            <tr><th class="col-md-4">{{ trans('feature.name') }}</th><td class="col-md-8">{{ $feature->name }}</td></tr>
             <tr><th>{{ trans('feature.type') }}</th><td>{{ $feature->type() }}</td></tr>
             <tr><th>{{ trans('feature.price') }}</th><td>{{ formatRp($feature->price) }}</td></tr>
             <tr><th>{{ trans('feature.tasks_count') }}</th><td>{{ $feature->tasks->count() }}</td></tr>
@@ -11,4 +11,4 @@
             <tr><th>{{ trans('feature.description') }}</th><td>{!! nl2br($feature->description) !!}</td></tr>
         </tbody>
     </table>
-</div>
\ No newline at end of file
+</div>
diff --git a/resources/views/features/partials/feature-tasks.blade.php b/resources/views/features/partials/feature-tasks.blade.php
index 112c71e..cd04901 100644
--- a/resources/views/features/partials/feature-tasks.blade.php
+++ b/resources/views/features/partials/feature-tasks.blade.php
@@ -1,5 +1,12 @@
-<div class="panel panel-default">
-    <div class="panel-heading"><h3 class="panel-title">{{ trans('feature.tasks') }}</h3></div>
+<div id="feature-tasks" class="panel panel-default">
+    <div class="panel-heading">
+        @if (request('action') == 'sort_tasks')
+            {{ link_to_route('features.show', trans('app.done'), [$feature->id], ['class' => 'btn btn-default btn-xs pull-right', 'style' => 'margin: -2px -8px']) }}
+        @else
+            {{ link_to_route('features.show', trans('feature.sort_tasks'), [$feature->id, 'action' => 'sort_tasks', '#feature-tasks'], ['class' => 'btn btn-default btn-xs pull-right', 'style' => 'margin: -2px -8px']) }}
+        @endif
+        <h3 class="panel-title">{{ trans('feature.tasks') }}</h3>
+    </div>
     <table class="table table-condensed">
         <thead>
             <th>{{ trans('app.table_no') }}</th>
@@ -49,12 +56,20 @@
             <tr>
                 <th class="text-right" colspan="3">Total</th>
                 <th class="text-center">{{ formatDecimal($feature->tasks->avg('progress')) }} %</th>
-                <th></th>
+                <th>
+                    @if (request('action') == 'sort_tasks')
+                        {{ link_to_route('features.show', trans('app.done'), [$feature->id], ['class' => 'btn btn-default btn-xs pull-right']) }}
+                    @else
+                        {{ link_to_route('features.show', trans('feature.sort_tasks'), [$feature->id, 'action' => 'sort_tasks', '#feature-tasks'], ['class' => 'btn btn-default btn-xs pull-right']) }}
+                    @endif
+                </th>
             </tr>
         </tfoot>
     </table>
 </div>
 
+@if (request('action') == 'sort_tasks')
+
 @section('ext_js')
     {!! Html::script(url('assets/js/plugins/jquery-ui.min.js')) !!}
 @endsection
@@ -72,4 +87,6 @@
     });
 })();
 </script>
-@endsection
\ No newline at end of file
+@endsection
+
+@endif