diff --git a/resources/views/cart/index.blade.php b/resources/views/cart/index.blade.php
index 6e6ce0e..c4d9768 100644
--- a/resources/views/cart/index.blade.php
+++ b/resources/views/cart/index.blade.php
@@ -4,7 +4,15 @@
 
 @section('content')
 <?php use Facades\App\Cart\CartCollection; ?>
-
+@if (CartCollection::isEmpty())
+    <h3 class="page-header">{{ trans('nav_menu.draft_list') }}</h3>
+    <form action="{{ route('cart.add') }}" method="POST">
+        {{ csrf_field() }}
+        <p class="text-muted">Anda belum memiliki Draft Transaksi, silakan buat Transaksi Baru:</p>
+        <input type="submit" class="btn btn-default navbar-btn" name="create-cash-draft" id="cash-draft-create-button" value="{{ trans('transaction.create_cash') }}">
+        <input type="submit" class="btn btn-default navbar-btn" name="create-credit-draft" id="credit-draft-create-button" value="{{ trans('transaction.create_credit') }}">
+    </form>
+@endif
 @includeWhen(! CartCollection::isEmpty(), 'cart.partials.transaction-draft-tabs')
 @if ($draft)
     @if (Request::get('action') == 'confirm')
diff --git a/resources/views/layouts/partials/top-nav.blade.php b/resources/views/layouts/partials/top-nav.blade.php
index 0c68821..9affae4 100644
--- a/resources/views/layouts/partials/top-nav.blade.php
+++ b/resources/views/layouts/partials/top-nav.blade.php
@@ -19,7 +19,7 @@
         <div class="collapse navbar-collapse" id="app-navbar-collapse">
             @if (Auth::check())
             <ul class="nav navbar-nav">
-                <li {{ (Request::segment(1) == 'drafts') ? 'class=active' : '' }}>
+                <li {{ in_array(Request::segment(1), ['drafts','home']) ? 'class=active' : '' }}>
                     {{ link_to_route('cart.index', trans('nav_menu.draft_list'), [], ['class' => 'strong text-primary']) }}
                 </li>
                 <li {{ (Request::segment(1) == 'transactions') ? 'class=active' : '' }}>