diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index dd6b9218a5..eec7f13268 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -45,6 +45,13 @@ return [
     'create_new_stuff'                           => 'Create new stuff',
     'new_withdrawal'                             => 'New withdrawal',
     'create_new_transaction'                     => 'Create new transaction',
+    'go_to_asset_accounts'                       => 'View your asset accounts',
+    'go_to_budgets'                              => 'Go to your budgets',
+    'go_to_categories'                           => 'Go to your categories',
+    'go_to_bills'                                => 'Go to your bills',
+    'go_to_expense_accounts'                     => 'See your asset accounts',
+    'go_to_revenue_accounts'                     => 'See your revenue accounts',
+    'go_to_piggies'                              => 'Go to piggy banks',
     'new_deposit'                                => 'New deposit',
     'new_transfer'                               => 'New transfer',
     'new_asset_account'                          => 'New asset account',
diff --git a/resources/lang/en_US/import.php b/resources/lang/en_US/import.php
index 3ccbed97ca..838111a03d 100644
--- a/resources/lang/en_US/import.php
+++ b/resources/lang/en_US/import.php
@@ -178,7 +178,7 @@ return [
     'spectre_extra_key_open_date'          => 'Open date',
     'spectre_extra_key_current_time'       => 'Current time',
     'spectre_extra_key_current_date'       => 'Current date',
-    'spectre_extra_key_cards'              => 'Car',
+    'spectre_extra_key_cards'              => 'Cards',
     'spectre_extra_key_units'              => 'Units',
     'spectre_extra_key_unit_price'         => 'Unit price',
     'spectre_extra_key_transactions_count' => 'Transactions count',
diff --git a/resources/views/index.twig b/resources/views/index.twig
index eaa6aa540b..a774663a41 100644
--- a/resources/views/index.twig
+++ b/resources/views/index.twig
@@ -16,6 +16,10 @@
                 <div class="box-body">
                     <canvas id="accounts-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
                 </div>
+                <div class="box-footer">
+                    <a href="{{ route('accounts.index','asset') }}" class="btn btn-default button-sm"><i
+                                class="fa fa-money"></i> {{ 'go_to_asset_accounts'|_ }}</a>
+                </div>
             </div>
 
             {# BUDGETS #}
@@ -26,6 +30,10 @@
                 <div class="box-body">
                     <canvas id="budgets-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
                 </div>
+                <div class="box-footer">
+                    <a href="{{ route('budgets.index') }}" class="btn btn-default button-sm"><i
+                                class="fa fa-tasks"></i> {{ 'go_to_budgets'|_ }}</a>
+                </div>
             </div>
             {# CATEGORIES #}
             <div class="box">
@@ -36,6 +44,10 @@
                 <div class="box-body">
                     <canvas id="categories-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
                 </div>
+                <div class="box-footer">
+                    <a href="{{ route('categories.index') }}" class="btn btn-default button-sm"><i
+                                class="fa fa-bar-chart"></i> {{ 'go_to_categories'|_ }}</a>
+                </div>
             </div>
         </div>
         <div class="col-lg-4 col-md-6 col-sm-12">
@@ -63,44 +75,10 @@
 
                         {% if data[0].count > 0 %}
                             <div class="box-body no-padding">
-                                <div class="btn-group" style="padding:8px;">
-                                    <a href="{{ route('transactions.create','withdrawal') }}" class="btn btn-success"><i
-                                                class="fa fa-money fa-fw"></i> {{ 'create_new_transaction'|_ }}</a>
-                                    <button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown" aria-haspopup="true"
-                                            aria-expanded="false">
-                                        <span class="caret"></span>
-                                        <span class="sr-only">Toggle Dropdown</span>
-                                    </button>
-                                    <ul class="dropdown-menu">
-                                        <li><a href="{{ route('transactions.create','withdrawal') }}"><i
-                                                        class="fa fa-long-arrow-left fa-fw"></i> {{ 'newWithdrawal'|_ }}</a></li>
-                                        <li><a href="{{ route('transactions.create','deposit') }}"><i
-                                                        class="fa fa-long-arrow-right fa-fw"></i> {{ 'newDeposit'|_ }}</a></li>
-                                        <li><a href="{{ route('transactions.create','transfer') }}"><i class="fa fa-fw fa-exchange"></i> {{ 'newTransfer'|_ }}
-                                            </a></li>
-                                    </ul>
-                                </div>
                                 {% include 'list.journals-tiny' with {'transactions': data[0],'account': data[1]} %}
                             </div>
                         {% else %}
                             <div class="box-body">
-                                <div class="btn-group">
-                                    <a href="{{ route('transactions.create','withdrawal') }}" class="btn btn-success"><i
-                                                class="fa fa-money fa-fw"></i> {{ 'create_new_transaction'|_ }}</a>
-                                    <button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown" aria-haspopup="true"
-                                            aria-expanded="false">
-                                        <span class="caret"></span>
-                                        <span class="sr-only">Toggle Dropdown</span>
-                                    </button>
-                                    <ul class="dropdown-menu">
-                                        <li><a href="{{ route('transactions.create','withdrawal') }}"><i
-                                                        class="fa fa-long-arrow-left fa-fw"></i> {{ 'newWithdrawal'|_ }}</a></li>
-                                        <li><a href="{{ route('transactions.create','deposit') }}"><i
-                                                        class="fa fa-long-arrow-right fa-fw"></i> {{ 'newDeposit'|_ }}</a></li>
-                                        <li><a href="{{ route('transactions.create','transfer') }}"><i class="fa fa-fw fa-exchange"></i> {{ 'newTransfer'|_ }}
-                                            </a></li>
-                                    </ul>
-                                </div>
                                 <p>
                                     <em>
                                         {{ trans('firefly.no_transactions_account', {name: data[1].name}) }}
@@ -111,8 +89,32 @@
                         {% endif %}
 
                         <div class="box-footer clearfix">
-                            <a class="btn btn-sm btn-default btn-flat pull-right"
-                               href="{{ route('accounts.show',data[1].id) }}">{{ formatAmountByAccount(data[1], data[1]|balance, false) }}</a>
+                            <div class="btn-group" role="group">
+
+                            </div>
+
+                            <div class="btn-group" role="group" aria-label="...">
+
+                                <div class="btn-group" role="group">
+                                    <a href="{{ route('transactions.create','withdrawal') }}" class="btn btn-success"><i
+                                                class="fa fa-check-circle-o fa-fw"></i> {{ 'create_new_transaction'|_ }}</a>
+                                    <button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown" aria-haspopup="true"
+                                            aria-expanded="false">
+                                        <span class="caret"></span>
+                                        <span class="sr-only">Toggle Dropdown</span>
+                                    </button>
+                                    <ul class="dropdown-menu">
+                                        <li><a href="{{ route('transactions.create','withdrawal') }}"><i
+                                                        class="fa fa-long-arrow-left fa-fw"></i> {{ 'newWithdrawal'|_ }}</a></li>
+                                        <li><a href="{{ route('transactions.create','deposit') }}"><i
+                                                        class="fa fa-long-arrow-right fa-fw"></i> {{ 'newDeposit'|_ }}</a></li>
+                                        <li><a href="{{ route('transactions.create','transfer') }}"><i class="fa fa-fw fa-exchange"></i> {{ 'newTransfer'|_ }}
+                                            </a></li>
+                                    </ul>
+                                </div>
+                                <a class="btn btn-default" href="{{ route('accounts.show',data[1].id) }}">{{ formatAmountByAccount(data[1], data[1]|balance, false) }}</a>
+                            </div>
+
                         </div>
                     </div>
                 {% endfor %}
@@ -129,7 +131,10 @@
                         <div style="width:100%;margin:0 auto;">
                             <canvas id="bills-chart" style="width:100%;height:200px;" height="200"></canvas>
                         </div>
-
+                    </div>
+                    <div class="box-footer">
+                        <a href="{{ route('bills.index') }}" class="btn btn-default button-sm"><i
+                                    class="fa fa-calendar"></i> {{ 'go_to_bills'|_ }}</a>
                     </div>
                 </div>
             {% endif %}
@@ -147,11 +152,14 @@
                 <div class="box-header with-border">
                     <h3 class="box-title"><a href="{{ route('accounts.index',['expense']) }}" title="{{ 'expense_accounts'|_ }}">{{ 'expense_accounts'|_ }}</a>
                     </h3>
-
                 </div>
                 <div class="box-body">
                     <canvas id="expense-accounts-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
                 </div>
+                <div class="box-footer">
+                    <a href="{{ route('accounts.index', ['expense']) }}" class="btn btn-default button-sm"><i
+                                class="fa fa-shopping-cart"></i> {{ 'go_to_expense_accounts'|_ }}</a>
+                </div>
             </div>
             {# OPTIONAL REVENUE ACCOUNTS #}
             {% if showDeps %}
@@ -164,6 +172,10 @@
                     <div class="box-body">
                         <canvas id="revenue-accounts-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
                     </div>
+                    <div class="box-footer">
+                        <a href="{{ route('accounts.index', ['revenue']) }}" class="btn btn-default button-sm"><i
+                                    class="fa fa-download"></i> {{ 'go_to_revenue_accounts'|_ }}</a>
+                    </div>
                 </div>
             {% endif %}
         </div>
diff --git a/resources/views/json/piggy-banks.twig b/resources/views/json/piggy-banks.twig
index 478ba1d95b..fecfcaf517 100644
--- a/resources/views/json/piggy-banks.twig
+++ b/resources/views/json/piggy-banks.twig
@@ -15,4 +15,8 @@
             </div>
         {% endfor %}
     </div>
+    <div class="box-footer">
+        <a href="{{ route('piggy-banks.index') }}" class="btn btn-default button-sm"><i
+                    class="fa fa-download"></i> {{ 'go_to_piggies'|_ }}</a>
+    </div>
 </div>
diff --git a/resources/views/piggy-banks/show.twig b/resources/views/piggy-banks/show.twig
index ab138b1c1c..e6c9666f7c 100644
--- a/resources/views/piggy-banks/show.twig
+++ b/resources/views/piggy-banks/show.twig
@@ -99,8 +99,7 @@
                     <div class="box-header with-border">
                         <h3 class="box-title">{{ trans('form.notes') }}</h3>
                     </div>
-                    <div class="box-body">
-                        {{ note.text|markdown }}
+                    <div class="box-body markdown">{{ note.text|markdown }}
                     </div>
                 </div>