diff --git a/resources/lang/id/invoice.php b/resources/lang/id/invoice.php
index 2e416ff..40e5a44 100644
--- a/resources/lang/id/invoice.php
+++ b/resources/lang/id/invoice.php
@@ -9,6 +9,7 @@ return [
     'not_found'      => 'Invoice tidak ditemukan',
     'empty'          => 'Belum ada Invoice',
     'back_to_index'  => 'Kembali ke daftar Invoice',
+    'draft_not_found' => 'Draft Invoice tidak ditemukan',
 
     // Actions
     'proccess'       => 'Proses Invoice',
diff --git a/resources/views/invoices/create.blade.php b/resources/views/invoices/create.blade.php
index 8300d76..e725111 100644
--- a/resources/views/invoices/create.blade.php
+++ b/resources/views/invoices/create.blade.php
@@ -3,18 +3,16 @@
 @section('title', 'Entry Invoice')
 
 @section('content')
-<div class="pull-right">
-    {!! FormField::formButton(
-        ['route' => 'invoices.add'],
-        trans('invoice.create'),
-        [
+<h1 class="page-header">
+    <div class="pull-right">
+        {!! FormField::formButton(['route' => 'invoices.add'], trans('invoice.create'), [
             'class' => 'btn btn-default',
             'name' => 'create-invoice-draft',
             'id' => 'invoice-draft-create-button'
-        ]
-    ) !!}
-</div>
-<h1 class="page-header">{{ trans('invoice.list') }}</h1>
+        ] ) !!}
+    </div>
+    {{ trans('invoice.list') }}
+</h1>
 
 <?php use Facades\App\Services\InvoiceDrafts\InvoiceDraftCollection; ?>
 @includeWhen(! InvoiceDraftCollection::isEmpty(), 'invoices.partials.invoice-draft-tabs')
diff --git a/resources/views/projects/invoices.blade.php b/resources/views/projects/invoices.blade.php
index 9b9288a..da1ec20 100755
--- a/resources/views/projects/invoices.blade.php
+++ b/resources/views/projects/invoices.blade.php
@@ -7,7 +7,11 @@
 
 <h1 class="page-header">
     <div class="pull-right">
-        {!! html_link_to_route('invoices.create', trans('invoice.create'), ['project_id' => $project->id], ['class' => 'btn btn-success','icon' => 'plus']) !!}
+        {!! FormField::formButton(['route' => 'invoices.add'], trans('invoice.create'), [
+            'class' => 'btn btn-success',
+            'name' => 'create-invoice-draft',
+            'id' => 'invoice-draft-create-button'
+        ] ) !!}
     </div>
     {{ $project->name }} <small>{{ trans('project.invoices') }}</small>
 </h1>