diff --git a/resources/views/accounts/index.twig b/resources/views/accounts/index.twig
index 2c68f6e593..74bb5e4984 100644
--- a/resources/views/accounts/index.twig
+++ b/resources/views/accounts/index.twig
@@ -18,7 +18,7 @@
                                 <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="fa fa-ellipsis-v"></span></button>
                                 <ul class="dropdown-menu" role="menu">
                                     <li><a href="{{ route('accounts.create', objectType) }}"><span
-                                                    class="fa fa-plus fa-fw"></span> {{ ('make_new_' ~ objectType ~ '_account')|_ }}
+                                                class="fa fa-plus fa-fw"></span> {{ ('make_new_' ~ objectType ~ '_account')|_ }}
                                         </a></li>
                                 </ul>
                             </div>
@@ -37,7 +37,7 @@
                     <div class="box-footer">
                         <p>
                             <a href="{{ route('accounts.create', objectType) }}" class="btn btn-success"><span
-                                        class="fa fa-plus fa-fw"></span> {{ ('make_new_' ~ objectType ~ '_account')|_ }}</a>
+                                    class="fa fa-plus fa-fw"></span> {{ ('make_new_' ~ objectType ~ '_account')|_ }}</a>
                         </p>
                         {% if inactiveCount > 0 %}
                             <p><small>
diff --git a/resources/views/accounts/show.twig b/resources/views/accounts/show.twig
index 1acd8b17b8..3f3b1d2661 100644
--- a/resources/views/accounts/show.twig
+++ b/resources/views/accounts/show.twig
@@ -18,12 +18,12 @@
                     <div class="box-tools pull-right">
                         <div class="btn-group">
                             <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span
-                                        class="fa fa-ellipsis-v"></span></button>
+                                    class="fa fa-ellipsis-v"></span></button>
                             <ul class="dropdown-menu" role="menu">
                                 <li><a href="{{ route('accounts.edit', account.id) }}"><span
-                                                class="fa fa-pencil fa-fw"></span> {{ 'edit'|_ }}</a></li>
+                                            class="fa fa-pencil fa-fw"></span> {{ 'edit'|_ }}</a></li>
                                 <li><a href="{{ route('accounts.delete', account.id) }}"><span
-                                                class="fa fa-trash fa-fw"></span> {{ 'delete'|_ }}</a></li>
+                                            class="fa fa-trash fa-fw"></span> {{ 'delete'|_ }}</a></li>
                             </ul>
                         </div>
                     </div>
diff --git a/resources/views/admin/link/index.twig b/resources/views/admin/link/index.twig
index 9ab3a4e654..5bd01d1ecf 100644
--- a/resources/views/admin/link/index.twig
+++ b/resources/views/admin/link/index.twig
@@ -28,9 +28,9 @@
                                     {% if linkType.editable %}
                                         <div class="btn-group btn-group-xs">
                                             <a class="btn btn-default btn-xs" href="{{ route('admin.links.edit',linkType.id) }}"><span
-                                                        class="fa fa-fw fa-pencil"></span></a>
+                                                    class="fa fa-fw fa-pencil"></span></a>
                                             <a class="btn btn-danger btn-xs" href="{{ route('admin.links.delete',linkType.id) }}"><span
-                                                        class="fa fa-fw fa-trash-o"></span></a>
+                                                    class="fa fa-fw fa-trash-o"></span></a>
                                         </div>
                                     {% endif %}
                                 </td>
diff --git a/resources/views/admin/link/show.twig b/resources/views/admin/link/show.twig
index 1b17f775c4..c45689b656 100644
--- a/resources/views/admin/link/show.twig
+++ b/resources/views/admin/link/show.twig
@@ -27,9 +27,9 @@
                             <tr>
                                 <td>
                                     <div class="btn-group btn-group-xs">
-                                        <a href="{{ route('transactions.link.delete', [link.id]) }}" class="btn btn-danger delete-link"  data-id="{{ link.id }}"><span class="fa fa-trash"></span></a>
+                                        <a href="{{ route('transactions.link.delete', [link.id]) }}" class="btn btn-danger delete-link" data-id="{{ link.id }}"><span class="fa fa-trash"></span></a>
                                         <a href="#" class="btn btn-default switch-link" data-id="{{ link.id }}"><span
-                                                    class="fa fa-fw fa-arrows-h"></span></a>
+                                                class="fa fa-fw fa-arrows-h"></span></a>
                                     </div>
                                 </td>
                                 <td data-value="{{ link.source.description }}">
@@ -61,6 +61,7 @@
     <script nonce="{{ JS_NONCE }}">
         $('.switch-link').on('click', switchLink);
         var switchLinkUrl = '{{ route('transactions.link.switch') }}';
+
         function switchLink(e) {
             e.preventDefault();
             var obj = $(e.currentTarget);
diff --git a/resources/views/admin/users/index.twig b/resources/views/admin/users/index.twig
index b9bdf6ca9d..80a766402a 100644
--- a/resources/views/admin/users/index.twig
+++ b/resources/views/admin/users/index.twig
@@ -55,9 +55,9 @@
                                 <td class="hidden-xs" data-value="{{ user.id }}">
                                     <div class="btn-group btn-group-xs">
                                         <a class="btn btn-default" href="{{ route('admin.users.edit',user.id) }}"><span
-                                                    class="fa fa-pencil"></span></a>
+                                                class="fa fa-pencil"></span></a>
                                         <a class="btn btn-danger" href="{{ route('admin.users.delete',user.id) }}"><span
-                                                    class="fa fa-trash"></span></a>
+                                                class="fa fa-trash"></span></a>
                                     </div>
                                 </td>
                                 <td class="hidden-xs" data-value="{{ user.id }}">#{{ user.id }}</td>
@@ -138,7 +138,7 @@
                                     <td class="hidden-xs" data-value="{{ user.id }}">
                                         <div class="btn-group btn-group-xs">
                                             <a class="btn btn-danger delete-invite" href="{{ route('admin.users.delete-invite', invitee.id) }}"><span
-                                                        class="fa fa-trash"></span></a>
+                                                    class="fa fa-trash"></span></a>
                                         </div>
                                     </td>
                                     <td>
@@ -153,7 +153,7 @@
                                         {{ invitee.expires.format('H:i') }}
                                     </td>
                                     <td>
-                                        {{  invitee.user.email }}
+                                        {{ invitee.user.email }}
                                     </td>
                                     <td>
                                         {% if invitee.redeemed %}
diff --git a/resources/views/bills/create.twig b/resources/views/bills/create.twig
index f309a07592..00c823f217 100644
--- a/resources/views/bills/create.twig
+++ b/resources/views/bills/create.twig
@@ -68,9 +68,9 @@
 {% endblock %}
 
 {% block styles %}
-    <link href="v1/css/bootstrap-tagsinput.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
-    <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
-    <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/bootstrap-tagsinput.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">
 {% endblock %}
 {% block scripts %}
     <script type="text/javascript" src="v1/js/lib/bootstrap-tagsinput.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
diff --git a/resources/views/bills/index.twig b/resources/views/bills/index.twig
index c340ad65f1..a4bdaaadfd 100644
--- a/resources/views/bills/index.twig
+++ b/resources/views/bills/index.twig
@@ -8,33 +8,33 @@
     {% if total == 0 %}
         {% include 'partials.empty' with {objectType: 'default', type: 'bills',route: route('bills.create')} %}
     {% else %}
-<div class="row">
-    <div class="col-lg-12 col-sm-12 col-md-12">
-        <div class="box">
-            <div class="box-header with-border">
-                <h3 class="box-title">{{ title }}</h3>
-                <div class="box-tools pull-right">
-                    <div class="btn-group">
-                        <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="fa fa-ellipsis-v"></span></button>
-                        <ul class="dropdown-menu" role="menu">
-                            <li><a href="{{ route('bills.create') }}"><span class="fa fa-plus fa-fw"></span> {{ 'new_bill'|_ }}</a></li>
-                        </ul>
+        <div class="row">
+            <div class="col-lg-12 col-sm-12 col-md-12">
+                <div class="box">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ title }}</h3>
+                        <div class="box-tools pull-right">
+                            <div class="btn-group">
+                                <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="fa fa-ellipsis-v"></span></button>
+                                <ul class="dropdown-menu" role="menu">
+                                    <li><a href="{{ route('bills.create') }}"><span class="fa fa-plus fa-fw"></span> {{ 'new_bill'|_ }}</a></li>
+                                </ul>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="box-body no-padding">
+                        <div style="padding:8px;">
+                            <a class="btn btn-success" href="{{ route('bills.create') }}"><span class="fa fa-plus fa-fw"></span> {{ 'create_new_bill'|_ }}</a>
+                        </div>
+                        {% include 'list/bills' %}
+                    </div>
+                    <div class="box-footer">
+                        <a class="btn btn-success" href="{{ route('bills.create') }}"><span class="fa fa-plus fa-fw"></span> {{ 'create_new_bill'|_ }}</a>
                     </div>
                 </div>
             </div>
-            <div class="box-body no-padding">
-                <div style="padding:8px;">
-                    <a class="btn btn-success" href="{{ route('bills.create') }}"><span class="fa fa-plus fa-fw"></span> {{ 'create_new_bill'|_ }}</a>
-                </div>
-                {% include 'list/bills' %}
-            </div>
-            <div class="box-footer">
-                <a class="btn btn-success" href="{{ route('bills.create') }}"><span class="fa fa-plus fa-fw"></span> {{ 'create_new_bill'|_ }}</a>
-            </div>
         </div>
-    </div>
-</div>
-{% endif %}
+    {% endif %}
 {% endblock %}
 
 {% block styles %}
diff --git a/resources/views/bills/show.twig b/resources/views/bills/show.twig
index dacf29fb9d..763055be63 100644
--- a/resources/views/bills/show.twig
+++ b/resources/views/bills/show.twig
@@ -99,7 +99,7 @@
                     <form action="{{ route('bills.rescan',object.data.id) }}" method="post">
                         <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
                         <p>
-                            <input type="submit" name="submit" value="{{ 'rescan_old'|_ }}" class="btn btn-default" />
+                            <input type="submit" name="submit" value="{{ 'rescan_old'|_ }}" class="btn btn-default"/>
                         </p>
                     </form>
 
@@ -111,14 +111,14 @@
                 </div>
             </div>
             {% if object.data.notes %}
-            <div class="box">
-                <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'notes'|_ }}</h3>
+                <div class="box">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'notes'|_ }}</h3>
+                    </div>
+                    <div class="box-body">
+                        {{ object.data.notes|default('')|markdown }}
+                    </div>
                 </div>
-                <div class="box-body">
-                    {{ object.data.notes|default('')|markdown }}
-                </div>
-            </div>
             {% endif %}
 
 
diff --git a/resources/views/budgets/create.twig b/resources/views/budgets/create.twig
index 72564b5c90..fd1e014b48 100644
--- a/resources/views/budgets/create.twig
+++ b/resources/views/budgets/create.twig
@@ -22,7 +22,7 @@
                 </div>
             </div>
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-                {# panel for auto-budget#}
+                {# panel for auto-budget #}
                 <div class="box">
                     <div class="box-header with-border">
                         <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
diff --git a/resources/views/budgets/show.twig b/resources/views/budgets/show.twig
index a06232bb31..ca1dbd4995 100644
--- a/resources/views/budgets/show.twig
+++ b/resources/views/budgets/show.twig
@@ -113,11 +113,11 @@
         </div>
     </div>
     {% if limits|length > 0 %}
-    <div class="row">
-        <div class="col-lg-offset-9 col-lg-3 col-md-offset-9 col-md-3 col-sm-12 col-xs-12">
-            <p class="small text-center"><a href="{{ route('budgets.show',budget.id) }}">{{ 'showEverything'|_ }}</a></p>
+        <div class="row">
+            <div class="col-lg-offset-9 col-lg-3 col-md-offset-9 col-md-3 col-sm-12 col-xs-12">
+                <p class="small text-center"><a href="{{ route('budgets.show',budget.id) }}">{{ 'showEverything'|_ }}</a></p>
+            </div>
         </div>
-    </div>
     {% endif %}
 
     <div class="row">
@@ -141,62 +141,62 @@
             </div>
         </div>
         {% if limits|length > 0 %}
-        <div class="col-lg-3 col-md-3 col-sm-12 col-xs-12">
-            {% for limit in limits %}
-                <div class="box {% if limit.start_date == budgetLimit.start_date %}box-primary box-solid{% endif %}">
-                    <div class="box-header with-border">
-                        <h3 class="box-title"><a
+            <div class="col-lg-3 col-md-3 col-sm-12 col-xs-12">
+                {% for limit in limits %}
+                    <div class="box {% if limit.start_date == budgetLimit.start_date %}box-primary box-solid{% endif %}">
+                        <div class="box-header with-border">
+                            <h3 class="box-title"><a
                                     href="{{ route('budgets.show.limit',[budget.id,limit.id]) }}">
-                                {{ limit.start_date.isoFormat(monthAndDayFormat) }} &mdash;
-                                {{ limit.end_date.isoFormat(monthAndDayFormat) }}
-                            </a>
-                        </h3>
-                    </div>
-                    <div class="box-body no-padding">
-                        <table class="table table-hover">
-                            <tr>
-                                <td style="width:33%;">{{ 'amount'|_ }}</td>
-                                <td>
-                                    {{ formatAmountBySymbol(limit.amount, limit.transactionCurrency.symbol, limit.transactionCurrency.decimal_places) }}
-                                </td>
-                            </tr>
-                            <tr>
-                                <td style="width:33%;">{{ 'spent'|_ }}</td>
-                                <td>
-                                    {{ formatAmountBySymbol(limit.spent, limit.transactionCurrency.symbol, limit.transactionCurrency.decimal_places) }}
-                                </td>
-                            </tr>
-                            {% if limit.spent > 0 %}
+                                    {{ limit.start_date.isoFormat(monthAndDayFormat) }} &mdash;
+                                    {{ limit.end_date.isoFormat(monthAndDayFormat) }}
+                                </a>
+                            </h3>
+                        </div>
+                        <div class="box-body no-padding">
+                            <table class="table table-hover">
                                 <tr>
-                                    <td colspan="2">
-                                        {% set overspent = limit.amount + limit.spent < 0 %}
-
-                                        {% if overspent %}
-                                            {% set pct = (limit.spent != 0 ? (limit.amount / (limit.spent*-1))*100 : 0) %} {# must have -1 here #}
-                                            <div class="progress progress-striped">
-                                                <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="{{ pct|round }}"
-                                                     aria-valuemin="0"
-                                                     aria-valuemax="100" style="width: {{ pct|round }}%;"></div>
-                                                <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="{{ (100-pct)|round }}"
-                                                     aria-valuemin="0" aria-valuemax="100" style="width: {{ (100-pct)|round }}%;"></div>
-                                            </div>
-                                        {% else %}
-                                            {% set pct = (limit.amount != 0 ? (((limit.spent*-1) / limit.amount)*100) : 0) %} {# must have -1 here #}
-                                            <div class="progress progress-striped">
-                                                <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{{ pct|round }}"
-                                                     aria-valuemin="0"
-                                                     aria-valuemax="100" style="width: {{ pct|round }}%;"></div>
-                                            </div>
-                                        {% endif %}
+                                    <td style="width:33%;">{{ 'amount'|_ }}</td>
+                                    <td>
+                                        {{ formatAmountBySymbol(limit.amount, limit.transactionCurrency.symbol, limit.transactionCurrency.decimal_places) }}
                                     </td>
                                 </tr>
-                            {% endif %}
-                        </table>
+                                <tr>
+                                    <td style="width:33%;">{{ 'spent'|_ }}</td>
+                                    <td>
+                                        {{ formatAmountBySymbol(limit.spent, limit.transactionCurrency.symbol, limit.transactionCurrency.decimal_places) }}
+                                    </td>
+                                </tr>
+                                {% if limit.spent > 0 %}
+                                    <tr>
+                                        <td colspan="2">
+                                            {% set overspent = limit.amount + limit.spent < 0 %}
+
+                                            {% if overspent %}
+                                                {% set pct = (limit.spent != 0 ? (limit.amount / (limit.spent*-1))*100 : 0) %} {# must have -1 here #}
+                                                <div class="progress progress-striped">
+                                                    <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="{{ pct|round }}"
+                                                         aria-valuemin="0"
+                                                         aria-valuemax="100" style="width: {{ pct|round }}%;"></div>
+                                                    <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="{{ (100-pct)|round }}"
+                                                         aria-valuemin="0" aria-valuemax="100" style="width: {{ (100-pct)|round }}%;"></div>
+                                                </div>
+                                            {% else %}
+                                                {% set pct = (limit.amount != 0 ? (((limit.spent*-1) / limit.amount)*100) : 0) %} {# must have -1 here #}
+                                                <div class="progress progress-striped">
+                                                    <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{{ pct|round }}"
+                                                         aria-valuemin="0"
+                                                         aria-valuemax="100" style="width: {{ pct|round }}%;"></div>
+                                                </div>
+                                            {% endif %}
+                                        </td>
+                                    </tr>
+                                {% endif %}
+                            </table>
+                        </div>
                     </div>
-                </div>
-            {% endfor %}
-            <p class="small text-center"><a href="{{ route('budgets.show',budget.id) }}">{{ 'showEverything'|_ }}</a></p>
-        </div>
+                {% endfor %}
+                <p class="small text-center"><a href="{{ route('budgets.show',budget.id) }}">{{ 'showEverything'|_ }}</a></p>
+            </div>
         {% endif %}
     </div>
 
@@ -206,17 +206,17 @@
         var budgetID = {{ budget.id }};
         var budgetLimitID = 0;
         {% if budgetLimit.id %}
-            budgetLimitID = {{ budgetLimit.id }};
-            var budgetChartUrl = '{{ route('chart.budget.budget-limit', [budget.id, budgetLimit.id] ) }}';
-            var currencySymbol = '{{ budgetLimit.transactionCurrency.symbol }}';
-            var expenseCategoryUrl = '{{ route('chart.budget.expense-category', [budget.id, budgetLimit.id]) }}';
-            var expenseAssetUrl = '{{ route('chart.budget.expense-asset', [budget.id, budgetLimit.id]) }}';
-            var expenseExpenseUrl = '{{ route('chart.budget.expense-expense', [budget.id, budgetLimit.id]) }}';
+        budgetLimitID = {{ budgetLimit.id }};
+        var budgetChartUrl = '{{ route('chart.budget.budget-limit', [budget.id, budgetLimit.id] ) }}';
+        var currencySymbol = '{{ budgetLimit.transactionCurrency.symbol }}';
+        var expenseCategoryUrl = '{{ route('chart.budget.expense-category', [budget.id, budgetLimit.id]) }}';
+        var expenseAssetUrl = '{{ route('chart.budget.expense-asset', [budget.id, budgetLimit.id]) }}';
+        var expenseExpenseUrl = '{{ route('chart.budget.expense-expense', [budget.id, budgetLimit.id]) }}';
         {% else %}
-            var budgetChartUrl = '{{ route('chart.budget.budget', [budget.id] ) }}';
-            var expenseCategoryUrl = '{{ route('chart.budget.expense-category', [budget.id]) }}';
-            var expenseAssetUrl = '{{ route('chart.budget.expense-asset', [budget.id]) }}';
-            var expenseExpenseUrl = '{{ route('chart.budget.expense-expense', [budget.id]) }}';
+        var budgetChartUrl = '{{ route('chart.budget.budget', [budget.id] ) }}';
+        var expenseCategoryUrl = '{{ route('chart.budget.expense-category', [budget.id]) }}';
+        var expenseAssetUrl = '{{ route('chart.budget.expense-asset', [budget.id]) }}';
+        var expenseExpenseUrl = '{{ route('chart.budget.expense-expense', [budget.id]) }}';
         {% endif %}
     </script>
 
diff --git a/resources/views/categories/create.twig b/resources/views/categories/create.twig
index 59cfe119ec..0556ac39ba 100644
--- a/resources/views/categories/create.twig
+++ b/resources/views/categories/create.twig
@@ -20,7 +20,7 @@
                 </div>
             </div>
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-                {# panel for optional fields#}
+                {# panel for optional fields #}
                 <div class="box">
                     <div class="box-header with-border">
                         <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
diff --git a/resources/views/categories/index.twig b/resources/views/categories/index.twig
index d19808e6a1..cefb5c0df2 100644
--- a/resources/views/categories/index.twig
+++ b/resources/views/categories/index.twig
@@ -6,41 +6,41 @@
 
 {% block content %}
     {% if categories.count() > 0 %}
-<div class="row">
-    <div class="col-lg-12 col-md-12 col-sm-12">
-        <div class="box">
-            <div class="box-header with-border">
-                <h3 class="box-title">{{ 'categories'|_ }}</h3>
-                <div class="box-tools pull-right">
-                    <div class="btn-group">
-                        <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="fa fa-ellipsis-v"></span></button>
-                        <ul class="dropdown-menu" role="menu">
-                            <li><a href="{{ route('categories.create') }}"><span class="fa fa-plus fa-fw"></span> {{ 'new_category'|_ }}</a></li>
-                        </ul>
+        <div class="row">
+            <div class="col-lg-12 col-md-12 col-sm-12">
+                <div class="box">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'categories'|_ }}</h3>
+                        <div class="box-tools pull-right">
+                            <div class="btn-group">
+                                <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="fa fa-ellipsis-v"></span></button>
+                                <ul class="dropdown-menu" role="menu">
+                                    <li><a href="{{ route('categories.create') }}"><span class="fa fa-plus fa-fw"></span> {{ 'new_category'|_ }}</a></li>
+                                </ul>
+                            </div>
+                        </div>
+
+                    </div>
+                    <div class="box-body no-padding">
+                        <div style="padding:8px;">
+                            <a class="btn btn-success" href="{{ route('categories.create') }}"><span class="fa fa-plus fa-fw"></span> {{ 'new_category'|_ }}</a>
+                        </div>
+                        {% include 'list/categories' %}
+                    </div>
+                    <div class="box-footer">
+                        <a class="btn btn-success" href="{{ route('categories.create') }}"><span class="fa fa-plus fa-fw"></span> {{ 'new_category'|_ }}</a>
                     </div>
                 </div>
 
             </div>
-            <div class="box-body no-padding">
-                <div style="padding:8px;">
-                    <a class="btn btn-success" href="{{ route('categories.create') }}"><span class="fa fa-plus fa-fw"></span> {{ 'new_category'|_ }}</a>
-                </div>
-                {% include 'list/categories' %}
-            </div>
-            <div class="box-footer">
-                <a class="btn btn-success" href="{{ route('categories.create') }}"><span class="fa fa-plus fa-fw"></span> {{ 'new_category'|_ }}</a>
-            </div>
         </div>
-
-    </div>
-</div>
-{% else %}
+    {% else %}
         {% include 'partials.empty' with {objectType: 'default', type: 'categories',route: route('categories.create')} %}
     {% endif %}
 {% endblock %}
 
 {% block styles %}
-    <link href="v1/css/bootstrap-sortable.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/bootstrap-sortable.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">
 {% endblock %}
 
 {% block scripts %}
diff --git a/resources/views/categories/show.twig b/resources/views/categories/show.twig
index 923f307a51..5a8563356e 100644
--- a/resources/views/categories/show.twig
+++ b/resources/views/categories/show.twig
@@ -88,7 +88,7 @@
                             </a>
                         </p>
                     {% else %}
-                        {% include 'list.groups'  %}
+                        {% include 'list.groups' %}
                         <p>
                             <span class="fa fa-calendar"></span>
                             <a href="{{ route('categories.show', [category.id]) }}">
diff --git a/resources/views/currencies/index.twig b/resources/views/currencies/index.twig
index 00df6f8152..d542f5fe6a 100644
--- a/resources/views/currencies/index.twig
+++ b/resources/views/currencies/index.twig
@@ -41,9 +41,9 @@
                                         <td>
                                             <div class="btn-group btn-group-xs">
                                                 <a class="btn btn-default" href="{{ route('currencies.edit',currency.id) }}"><span
-                                                            class="fa fa-fw fa-pencil"></span></a>
+                                                        class="fa fa-fw fa-pencil"></span></a>
                                                 <a class="btn btn-danger" href="{{ route('currencies.delete',currency.id) }}"><span
-                                                            class="fa fa-fw fa-trash"></span></a>
+                                                        class="fa fa-fw fa-trash"></span></a>
                                             </div>
                                         </td>
                                     {% endif %}
@@ -66,7 +66,7 @@
                                         <div class="btn-group">
                                             {% if currency.id != defaultCurrency.id %}
                                                 <button data-id="{{ currency.id }}" class="make_default btn btn-default"><span
-                                                            class="fa fa-fw fa-star"></span> {{ 'make_default_currency'|_ }}</button>
+                                                        class="fa fa-fw fa-star"></span> {{ 'make_default_currency'|_ }}</button>
                                             {% endif %}
                                             {% if currency.enabled %}
                                                 <a class="btn btn-default disable-currency" data-id="{{ currency.id }}"
diff --git a/resources/views/form/options.twig b/resources/views/form/options.twig
index 727a29215f..4bc1835803 100644
--- a/resources/views/form/options.twig
+++ b/resources/views/form/options.twig
@@ -7,7 +7,7 @@
         <div class="col-sm-8">
             <div class="checkbox">
                 <label>
-                    {{ Html.checkbox('create_another', false).id(name ~ '_return_to_form') }}
+                    {{ Html.checkbox('create_another').id(name ~ '_return_to_form') }}
                     {{ trans('form.returnHereExplanation') }}
 
                 </label>
diff --git a/resources/views/index.twig b/resources/views/index.twig
index b300a5c506..6b973a2f03 100644
--- a/resources/views/index.twig
+++ b/resources/views/index.twig
@@ -10,14 +10,14 @@
             {# ACCOUNTS #}
             <div class="box box-primary">
                 <div class="box-header with-border">
-                    <h3 class="box-title"><a href="{{ route('accounts.index',['asset'], false) }}"
+                    <h3 class="box-title"><a href="{{ route('accounts.index',['asset']) }}"
                                              title="{{ 'yourAccounts'|_ }}">{{ 'yourAccounts'|_ }}</a></h3>
                 </div>
                 <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'], false) }}" class="btn btn-default button-sm"><span
+                    <a href="{{ route('accounts.index',['asset']) }}" class="btn btn-default button-sm"><span
                             class="fa fa-money"></span> {{ 'go_to_asset_accounts'|_ }}</a>
                 </div>
             </div>
@@ -25,7 +25,7 @@
             {# BUDGETS #}
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title"><a href="{{ route('budgets.index',null, false) }}"
+                    <h3 class="box-title"><a href="{{ route('budgets.index') }}"
                                              title="{{ 'budgetsAndSpending'|_ }}">{{ 'budgetsAndSpending'|_ }}</a></h3>
                 </div>
                 <div class="box-body">
@@ -49,7 +49,7 @@
                     <canvas id="categories-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
                 </div>
                 <div class="box-footer">
-                    <a href="{{ route('categories.index',null, false) }}" class="btn btn-default button-sm">
+                    <a href="{{ route('categories.index') }}" class="btn btn-default button-sm">
                         <span class="fa fa-bookmark"></span>
                         <span>{{ 'go_to_categories'|_ }}</span>
                     </a>
@@ -64,7 +64,7 @@
                     <div class="box">
                         <div class="box-header with-border">
                             <h3 class="box-title"><a
-                                    href="{{ route('accounts.show', [data.account.id], false) }}">{{ data.account.name }}</a>
+                                    href="{{ route('accounts.show', [data.account.id]) }}">{{ data.account.name }}</a>
                             </h3>
                         </div>
 
@@ -92,34 +92,34 @@
                                 </a>
                                 <ul class="dropdown-menu">
                                     <li>
-                                        <a href="{{ route('transactions.create', ['withdrawal'], false) }}?source={{ data.account.id }}">{{ 'create_new_withdrawal'|_ }}</a>
+                                        <a href="{{ route('transactions.create', ['withdrawal']) }}?source={{ data.account.id }}">{{ 'create_new_withdrawal'|_ }}</a>
                                     </li>
                                     <li>
-                                        <a href="{{ route('transactions.create', ['deposit'], false) }}?destination={{ data.account.id }}">{{ 'create_new_deposit'|_ }}</a>
+                                        <a href="{{ route('transactions.create', ['deposit']) }}?destination={{ data.account.id }}">{{ 'create_new_deposit'|_ }}</a>
                                     </li>
                                     <li>
-                                        <a href="{{ route('transactions.create', ['transfer'], false) }}?source={{ data.account.id }}">{{ 'create_new_transfer'|_ }}</a>
+                                        <a href="{{ route('transactions.create', ['transfer']) }}?source={{ data.account.id }}">{{ 'create_new_transfer'|_ }}</a>
                                     </li>
                                 </ul>
                             </div>
                             <div class="btn-group">
                                 <a type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"
                                    aria-haspopup="true" aria-expanded="false"
-                                   href="{{ route('accounts.show', [data.account.id], false) }}">{{ formatAmountByAccount(data.account, data.account|balance, false) }}
+                                   href="{{ route('accounts.show', [data.account.id]) }}">{{ formatAmountByAccount(data.account, data.account|balance, false) }}
                                     <span class="caret"></span>
                                 </a>
                                 <ul class="dropdown-menu">
                                     <li>
-                                        <a href="{{ route('accounts.show', [data.account.id], false) }}">{{ 'show'|_ }}</a>
+                                        <a href="{{ route('accounts.show', [data.account.id]) }}">{{ 'show'|_ }}</a>
                                     </li>
                                     <li>
-                                        <a href="{{ route('accounts.reconcile', [data.account.id], false) }}">{{ 'reconcile'|_ }}</a>
+                                        <a href="{{ route('accounts.reconcile', [data.account.id]) }}">{{ 'reconcile'|_ }}</a>
                                     </li>
                                     <li>
-                                        <a href="{{ route('accounts.edit', [data.account.id], false) }}">{{ 'edit'|_ }}</a>
+                                        <a href="{{ route('accounts.edit', [data.account.id]) }}">{{ 'edit'|_ }}</a>
                                     </li>
                                     <li>
-                                        <a href="{{ route('accounts.delete', [data.account.id], false) }}">{{ 'delete'|_ }}</a>
+                                        <a href="{{ route('accounts.delete', [data.account.id]) }}">{{ 'delete'|_ }}</a>
                                     </li>
                                 </ul>
                             </div>
@@ -132,7 +132,7 @@
                 {# BILLS #}
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title"><a href="{{ route('bills.index', null, false) }}"
+                        <h3 class="box-title"><a href="{{ route('bills.index') }}"
                                                  title="{{ 'bills'|_ }}">{{ 'bills'|_ }}</a></h3>
 
                     </div>
@@ -142,7 +142,7 @@
                         </div>
                     </div>
                     <div class="box-footer">
-                        <a href="{{ route('bills.index',null, false) }}" class="btn btn-default button-sm"><span
+                        <a href="{{ route('bills.index') }}" class="btn btn-default button-sm"><span
                                 class="fa fa-calendar"></span> {{ 'go_to_bills'|_ }}</a>
                     </div>
                 </div>
@@ -159,7 +159,7 @@
             {# EXPENSE ACCOUNTS #}
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title"><a href="{{ route('accounts.index',['expense'], false) }}"
+                    <h3 class="box-title"><a href="{{ route('accounts.index',['expense']) }}"
                                              title="{{ 'expense_accounts'|_ }}">{{ 'expense_accounts'|_ }}</a>
                     </h3>
                 </div>
@@ -168,14 +168,14 @@
                             width="100%"></canvas>
                 </div>
                 <div class="box-footer">
-                    <a href="{{ route('accounts.index', ['expense'], false) }}" class="btn btn-default button-sm"><span
+                    <a href="{{ route('accounts.index', ['expense']) }}" class="btn btn-default button-sm"><span
                             class="fa fa-shopping-cart"></span> {{ 'go_to_expense_accounts'|_ }}</a>
                 </div>
             </div>
             {# OPTIONAL REVENUE ACCOUNTS #}
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title"><a href="{{ route('accounts.index',['revenue'], false) }}"
+                    <h3 class="box-title"><a href="{{ route('accounts.index',['revenue']) }}"
                                              title="{{ 'revenue_accounts'|_ }}">{{ 'revenue_accounts'|_ }}</a></h3>
 
                 </div>
@@ -184,7 +184,7 @@
                             width="100%"></canvas>
                 </div>
                 <div class="box-footer">
-                    <a href="{{ route('accounts.index', ['revenue'], false) }}" class="btn btn-default button-sm"><span
+                    <a href="{{ route('accounts.index', ['revenue']) }}" class="btn btn-default button-sm"><span
                             class="fa fa-download"></span> {{ 'go_to_revenue_accounts'|_ }}</a>
                 </div>
             </div>
@@ -200,9 +200,9 @@
             lineTextColor = '#bec5cb';
         }
         var billCount = {{ billCount }};
-        var accountFrontpageUrl = '{{ route('chart.account.frontpage', null, false) }}';
-        var accountRevenueUrl = '{{ route('chart.account.revenue', null, false) }}';
-        var accountExpenseUrl = '{{ route('chart.account.expense',null, false) }}';
+        var accountFrontpageUrl = '{{ route('chart.account.frontpage') }}';
+        var accountRevenueUrl = '{{ route('chart.account.revenue') }}';
+        var accountExpenseUrl = '{{ route('chart.account.expense') }}';
         var piggyInfoUrl = '{{ route('json.fp.piggy-banks') }}';
         var drawVerticalLine = '';
         {# render vertical line with text "today"  #}
diff --git a/resources/views/javascript/variables.twig b/resources/views/javascript/variables.twig
index 65a669e8ac..71a0c84137 100644
--- a/resources/views/javascript/variables.twig
+++ b/resources/views/javascript/variables.twig
@@ -54,9 +54,9 @@ var edit_selected_txt = "{{ trans('firefly.mass_edit')|escape('js') }}";
 var edit_bulk_selected_txt = "{{ trans('firefly.bulk_edit')|escape('js') }}";
 var delete_selected_txt = "{{ trans('firefly.mass_delete')|escape('js') }}";
 
-var mass_edit_url   = '{{ route('transactions.mass.edit', [''], false) }}';
-var bulk_edit_url   = '{{ route('transactions.bulk.edit', [''], false) }}';
-var mass_delete_url = '{{ route('transactions.mass.delete', [''], false) }}';
+var mass_edit_url   = '{{ route('transactions.mass.edit', ['']) }}';
+var bulk_edit_url   = '{{ route('transactions.bulk.edit', ['']) }}';
+var mass_delete_url = '{{ route('transactions.mass.delete', ['']) }}';
 
 // for demo:
 var nextLabel = "{{ trans('firefly.intro_next_label')|escape('js') }}";
diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig
index 927ebda896..56d9738485 100644
--- a/resources/views/layout/default.twig
+++ b/resources/views/layout/default.twig
@@ -95,7 +95,7 @@
     <header class="main-header">
 
         {# Logo #}
-        <a href="{{ route('index', null, false) }}" class="logo">
+        <a href="{{ route('index') }}" class="logo">
             {# mini logo for sidebar mini 50x50 pixels #}
             <span class="logo-mini">FF</span>
             {# logo for regular state and mobile devices #}
@@ -138,7 +138,7 @@
     </header>
     <aside class="main-sidebar">
         <section class="sidebar">
-            <form action="{{ route('search.index', null, false) }}" method="get" class="sidebar-form">
+            <form action="{{ route('search.index') }}" method="get" class="sidebar-form">
                 <div class="input-group">
                     <input autocomplete="off" type="text" name="search" class="form-control"
                            placeholder="{{ 'searchPlaceholder'|_ }}" value="{{ query }}" spellcheck="false"/>
@@ -176,7 +176,7 @@
     <footer class="main-footer">
         <div class="pull-right">
             <b class="hidden-xs">{{ 'version'|_ }}</b> <a
-                href="{{ route('debug', null, false) }}">{{ Config.get('firefly.version') }}</a>
+                href="{{ route('debug') }}">{{ Config.get('firefly.version') }}</a>
         </div>
         <strong><a href="https://github.com/firefly-iii/firefly-iii">Firefly III</a></strong>
         <small class="text-muted">&copy; James Cole, <a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL-3.0-or-later</a>.</small>
@@ -222,7 +222,7 @@
 
 {# All kinds of variables. #}
 <script
-    src="{{ route('javascript.variables', null, false) }}?ext=.js&amp;v={{ FF_VERSION }}{% if account %}&amp;account={{ account.id }}{% endif %}"
+    src="{{ route('javascript.variables') }}?ext=.js&amp;v={{ FF_VERSION }}{% if account %}&amp;account={{ account.id }}{% endif %}"
     type="text/javascript" nonce="{{ JS_NONCE }}"></script>
 
 {# Base script: jquery and bootstrap #}
@@ -247,8 +247,8 @@
 {% if not shownDemo %}
     <script type="text/javascript" nonce="{{ JS_NONCE }}">
         var routeForTour = "{{ current_route_name }}";
-        var routeStepsUrl = "{{ route('json.intro', [current_route_name, objectType|default("")], false) }}";
-        var routeForFinishedTour = "{{ route('json.intro.finished', [current_route_name, objectType|default("")], false) }}";
+        var routeStepsUrl = "{{ route('json.intro', [current_route_name, objectType|default("")]) }}";
+        var routeForFinishedTour = "{{ route('json.intro.finished', [current_route_name, objectType|default("")]) }}";
     </script>
     <script type="text/javascript" src="v1/lib/intro/intro.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
     <script type="text/javascript" src="v1/js/ff/intro/intro.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
@@ -280,7 +280,7 @@
                 style="border:0;" alt=""/></p></noscript>
 {% endif %}
 
-<form id="logout-form" action="{{ route('logout', null, false) }}" method="POST" style="display: none;">
+<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
     <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
 </form>
 
diff --git a/resources/views/layout/empty.twig b/resources/views/layout/empty.twig
index 10aa6155b1..ef018bcc25 100644
--- a/resources/views/layout/empty.twig
+++ b/resources/views/layout/empty.twig
@@ -31,7 +31,7 @@
                 );
             }
         </script>
-        <link href="v1/lib/adminlte/css/skins/skin-dark.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}"  media="(prefers-color-scheme: dark)">
+        <link href="v1/lib/adminlte/css/skins/skin-dark.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}" media="(prefers-color-scheme: dark)">
         <link href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}" media="(prefers-color-scheme: light)">
     {% endif %}
     {% if 'dark' == darkMode %}
@@ -70,15 +70,19 @@
         var _paq = window._paq || [];
         _paq.push(['trackPageView']);
         _paq.push(['enableLinkTracking']);
-        (function() {
-            var u="//{{ config('firefly.tracker_url') }}/";
-            _paq.push(['setTrackerUrl', u+'matomo.php']);
+        (function () {
+            var u = "//{{ config('firefly.tracker_url') }}/";
+            _paq.push(['setTrackerUrl', u + 'matomo.php']);
             _paq.push(['setSiteId', '{{ config('firefly.tracker_site_id') }}']);
-            var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-            g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+            var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
+            g.type = 'text/javascript';
+            g.async = true;
+            g.defer = true;
+            g.src = u + 'matomo.js';
+            s.parentNode.insertBefore(g, s);
         })();
     </script>
-    <noscript><p><img src="//{{ config('firefly.tracker_url') }}/matomo.php?idsite={{ config('firefly.tracker_site_id') }}&amp;rec=1" style="border:0;" alt="" /></p></noscript>
+    <noscript><p><img src="//{{ config('firefly.tracker_url') }}/matomo.php?idsite={{ config('firefly.tracker_site_id') }}&amp;rec=1" style="border:0;" alt=""/></p></noscript>
 {% endif %}
 
 </body>
diff --git a/resources/views/layout/guest.twig b/resources/views/layout/guest.twig
index 840880e838..a9c463dfeb 100644
--- a/resources/views/layout/guest.twig
+++ b/resources/views/layout/guest.twig
@@ -41,7 +41,7 @@
                 );
             }
         </script>
-        <link href="v1/lib/adminlte/css/skins/skin-dark.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}"  media="(prefers-color-scheme: dark)">
+        <link href="v1/lib/adminlte/css/skins/skin-dark.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}" media="(prefers-color-scheme: dark)">
         <link href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}" media="(prefers-color-scheme: light)">
     {% endif %}
     {% if 'dark' == darkMode %}
@@ -85,15 +85,19 @@
         var _paq = window._paq || [];
         _paq.push(['trackPageView']);
         _paq.push(['enableLinkTracking']);
-        (function() {
-            var u="//{{ config('firefly.tracker_url') }}/";
-            _paq.push(['setTrackerUrl', u+'matomo.php']);
+        (function () {
+            var u = "//{{ config('firefly.tracker_url') }}/";
+            _paq.push(['setTrackerUrl', u + 'matomo.php']);
             _paq.push(['setSiteId', '{{ config('firefly.tracker_site_id') }}']);
-            var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-            g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+            var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
+            g.type = 'text/javascript';
+            g.async = true;
+            g.defer = true;
+            g.src = u + 'matomo.js';
+            s.parentNode.insertBefore(g, s);
         })();
     </script>
-    <noscript><p><img src="//{{ config('firefly.tracker_url') }}/matomo.php?idsite={{ config('firefly.tracker_site_id') }}&amp;rec=1" style="border:0;" alt="" /></p></noscript>
+    <noscript><p><img src="//{{ config('firefly.tracker_url') }}/matomo.php?idsite={{ config('firefly.tracker_site_id') }}&amp;rec=1" style="border:0;" alt=""/></p></noscript>
 {% endif %}
 
 </body>
diff --git a/resources/views/layout/install.twig b/resources/views/layout/install.twig
index bbb966e5de..02140bbdfe 100644
--- a/resources/views/layout/install.twig
+++ b/resources/views/layout/install.twig
@@ -25,7 +25,7 @@
 <body class="hold-transition login-page dark-mode">
 <div class="login-box">
     <div class="login-logo">
-        <strong>Firefly</strong>III<br />
+        <strong>Firefly</strong>III<br/>
         <span style="font-family: monospace;font-size:16pt;">installation and upgrade</span>
     </div>
     {% block content %}{% endblock %}
@@ -45,15 +45,19 @@
         var _paq = window._paq || [];
         _paq.push(['trackPageView']);
         _paq.push(['enableLinkTracking']);
-        (function() {
-            var u="//{{ config('firefly.tracker_url') }}/";
-            _paq.push(['setTrackerUrl', u+'matomo.php']);
+        (function () {
+            var u = "//{{ config('firefly.tracker_url') }}/";
+            _paq.push(['setTrackerUrl', u + 'matomo.php']);
             _paq.push(['setSiteId', '{{ config('firefly.tracker_site_id') }}']);
-            var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-            g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+            var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
+            g.type = 'text/javascript';
+            g.async = true;
+            g.defer = true;
+            g.src = u + 'matomo.js';
+            s.parentNode.insertBefore(g, s);
         })();
     </script>
-    <noscript><p><img src="//{{ config('firefly.tracker_url') }}/matomo.php?idsite={{ config('firefly.tracker_site_id') }}&amp;rec=1" style="border:0;" alt="" /></p></noscript>
+    <noscript><p><img src="//{{ config('firefly.tracker_url') }}/matomo.php?idsite={{ config('firefly.tracker_site_id') }}&amp;rec=1" style="border:0;" alt=""/></p></noscript>
 {% endif %}
 
 </body>
diff --git a/resources/views/list/groups.twig b/resources/views/list/groups.twig
index 8d2acfc5fd..0b10ec219f 100644
--- a/resources/views/list/groups.twig
+++ b/resources/views/list/groups.twig
@@ -52,7 +52,7 @@
             <tr style="border-top:1px #aaa solid;" class="unsortable">
                 <td colspan="2" style="border-top:1px #aaa solid;">
                     <small><strong>
-                            <a href="{{ route('transactions.show', [group.id], false) }}"
+                            <a href="{{ route('transactions.show', [group.id]) }}"
                                title="{{ group.title }}">{{ group.title }}</a>
                         </strong></small>
                 </td>
@@ -81,9 +81,9 @@
                                 aria-haspopup="true" aria-expanded="false">
                             {{ 'actions'|_ }} <span class="caret"></span></button>
                         <ul class="dropdown-menu dropdown-menu-right" role="menu">
-                            <li><a href="{{ route('transactions.edit', [group.id], false) }}"><span
+                            <li><a href="{{ route('transactions.edit', [group.id]) }}"><span
                                         class="fa fa-fw fa-pencil"></span> {{ 'edit'|_ }}</a></li>
-                            <li><a href="{{ route('transactions.delete', [group.id], false) }}"><span
+                            <li><a href="{{ route('transactions.delete', [group.id]) }}"><span
                                         class="fa fa-fw fa-trash"></span> {{ 'delete'|_ }}</a></li>
                             <li><a href="#" data-id="{{ group.id }}" class="clone-transaction"><span
                                         class="fa fa-copy fa-fw"></span> {{ 'clone'|_ }}</a></li>
@@ -137,7 +137,7 @@
                         <span class="fa fa-paperclip"></span>
                     {% endif %}
                     {% if group.count == 1 %}
-                    <a href="{{ route('transactions.show', [group.id], false) }}" title="{{ transaction.description }}">
+                    <a href="{{ route('transactions.show', [group.id]) }}" title="{{ transaction.description }}">
                         {% endif %}
                         {{ transaction.description }}
                         {% if group.count == 1 %}
@@ -215,7 +215,7 @@
                     {% if 'Cash account' == transaction.source_account_type %}
                         <span class="text-success">({{ 'cash'|_ }})</span>
                     {% else %}
-                        <a href="{{ route('accounts.show', [transaction.source_account_id|default(1)], false) }}"
+                        <a href="{{ route('accounts.show', [transaction.source_account_id|default(1)]) }}"
                            title="{{ transaction.source_account_iban|default(transaction.source_account_name) }}">{{ transaction.source_account_name }}</a>
                     {% endif %}
                 </td>
@@ -223,14 +223,14 @@
                     {% if 'Cash account' == transaction.destination_account_type %}
                         <span class="text-success">({{ 'cash'|_ }})</span>
                     {% else %}
-                        <a href="{{ route('accounts.show', [transaction.destination_account_id|default(1)], false) }}"
+                        <a href="{{ route('accounts.show', [transaction.destination_account_id|default(1)]) }}"
                            title="{{ transaction.destination_account_iban|default(transaction.destination_account_name) }}">{{ transaction.destination_account_name }}</a>
                     {% endif %}
                 </td>
                 {% if showCategory %}
                     <td style=" {{ style|raw }}" class="hidden-xs">
                         {% if transaction.category_id %}
-                            <a href="{{ route('categories.show', [transaction.category_id], false) }}"
+                            <a href="{{ route('categories.show', [transaction.category_id]) }}"
                                title="{{ transaction.category_name }}">{{ transaction.category_name }}</a>
                         {% endif %}
                     </td>
@@ -238,7 +238,7 @@
                 {% if showBudget %}
                     <td style=" {{ style|raw }}" class="hidden-xs">
                         {% if transaction.budget_id %}
-                            <a href="{{ route('budgets.show', [transaction.budget_id], false) }}"
+                            <a href="{{ route('budgets.show', [transaction.budget_id]) }}"
                                title="{{ transaction.budget_name }}">{{ transaction.budget_name }}</a>
                         {% endif %}
                     </td>
@@ -251,14 +251,14 @@
                                     aria-haspopup="true" aria-expanded="false">
                                 {{ 'actions'|_ }} <span class="caret"></span></button>
                             <ul class="dropdown-menu dropdown-menu-right" role="menu">
-                                <li><a href="{{ route('transactions.edit', [group.id], false) }}"><span
+                                <li><a href="{{ route('transactions.edit', [group.id]) }}"><span
                                             class="fa fa-fw fa-pencil"></span> {{ 'edit'|_ }}</a></li>
-                                <li><a href="{{ route('transactions.delete', [group.id], false) }}"><span
+                                <li><a href="{{ route('transactions.delete', [group.id]) }}"><span
                                             class="fa fa-fw fa-trash"></span> {{ 'delete'|_ }}</a></li>
                                 <li><a href="#" data-id="{{ group.id }}" class="clone-transaction"><span
                                             class="fa fa-copy fa-fw"></span> {{ 'clone'|_ }}</a></li>
                                 <li>
-                                    <a href="{{ route('rules.create-from-journal', [transaction.transaction_journal_id], false) }}"><span
+                                    <a href="{{ route('rules.create-from-journal', [transaction.transaction_journal_id]) }}"><span
                                             class="fa fa-fw fa-random"></span> {{ 'create_rule_from_transaction'|_ }}
                                     </a></li>
                             </ul>
@@ -316,5 +316,5 @@
     </tfoot>
 </table>
 <script type="text/javascript" nonce="{{ JS_NONCE }}">
-    var cloneGroupUrl = '{{ route('transactions.clone',null, false) }}';
+    var cloneGroupUrl = '{{ route('transactions.clone') }}';
 </script>
diff --git a/resources/views/object-groups/index.twig b/resources/views/object-groups/index.twig
index 534bf7a878..b6dad95f11 100644
--- a/resources/views/object-groups/index.twig
+++ b/resources/views/object-groups/index.twig
@@ -40,7 +40,7 @@
                                 <tr class="group-sortable" data-id="{{ objectGroup.id }}" data-name="{{ objectGroup.title|escape('html') }}" data-order="{{ objectGroup.order }}">
                                     <td><span class="fa fa-fw fa-bars group-handle"></span></td>
                                     <td>
-                                        <strong>{{ objectGroup.title }}</strong><br />
+                                        <strong>{{ objectGroup.title }}</strong><br/>
 
                                         {% for piggyBank in objectGroup.piggyBanks %}
                                             - {{ 'piggy_bank'|_ }}: <a href="{{ route('piggy-banks.show', [piggyBank.id]) }}">{{ piggyBank.name }}</a><br>
diff --git a/resources/views/partials/favicons.twig b/resources/views/partials/favicons.twig
index 5dce4a1111..3d7760d7e3 100644
--- a/resources/views/partials/favicons.twig
+++ b/resources/views/partials/favicons.twig
@@ -1,11 +1,11 @@
-<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
-<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png?v=3e8AboOwbd">
-<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png?v=3e8AboOwbd">
-<link rel="manifest" href="/manifest.webmanifest?v=3e8AboOwbd">
-<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#3c8dbc">
-<link rel="shortcut icon" href="/favicon.ico?v=3e8AboOwbd">
+<link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png">
+<link rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.png?v=3e8AboOwbd">
+<link rel="icon" type="image/png" sizes="16x16" href="favicon-16x16.png?v=3e8AboOwbd">
+<link rel="manifest" href="manifest.webmanifest?v=3e8AboOwbd">
+<link rel="mask-icon" href="safari-pinned-tab.svg" color="#3c8dbc">
+<link rel="shortcut icon" href="favicon.ico?v=3e8AboOwbd">
 <meta name="apple-mobile-web-app-title" content="Firefly III">
 <meta name="application-name" content="Firefly III">
 <meta name="msapplication-TileColor" content="#3c8dbc">
-<meta name="msapplication-TileImage" content="/mstile-144x144.png?v=3e8AboOwbd">
+<meta name="msapplication-TileImage" content="mstile-144x144.png?v=3e8AboOwbd">
 <meta name="theme-color" content="#3c8dbc">
diff --git a/resources/views/partials/menu-sidebar.twig b/resources/views/partials/menu-sidebar.twig
index 5777032644..24943f169e 100644
--- a/resources/views/partials/menu-sidebar.twig
+++ b/resources/views/partials/menu-sidebar.twig
@@ -1,6 +1,6 @@
 <ul class="sidebar-menu" data-widget="tree">
     <li class="{{ activeRouteStrict('index') }}">
-        <a href="{{ route('index', null, false) }}">
+        <a href="{{ route('index') }}">
             <em class="fa fa-dashboard fa-fw"></em>
             <span>{{ 'dashboard'|_ }}</span>
         </a>
@@ -9,7 +9,7 @@
     <li class="header text-uppercase">{{ 'financial_control'|_ }}</li>
 
     <li class="{{ activeRoutePartial('budgets') }}" id="budget-menu">
-        <a href="{{ route('budgets.index', null, false) }}">
+        <a href="{{ route('budgets.index') }}">
             <em class="fa fa-pie-chart fa-fw"></em>
             <span>{{ 'budgets'|_ }}</span>
         </a>
@@ -23,7 +23,7 @@
     </li>
 
     <li class="{{ activeRoutePartial('piggy-banks') }}">
-        <a href="{{ route('piggy-banks.index', null, false) }}">
+        <a href="{{ route('piggy-banks.index') }}">
             <em class="fa fa-bullseye fa-fw"></em>
             <span>{{ 'piggyBanks'|_ }}</span>
         </a>
@@ -42,19 +42,19 @@
 
         <ul class="treeview-menu">
             <li class="{{ activeRoutePartialObjectType('transactions', 'withdrawal') }}">
-                <a href="{{ route('transactions.index', ['withdrawal'], false) }}">
+                <a href="{{ route('transactions.index', ['withdrawal']) }}">
                     <span class="fa fa-angle-right fa-fw"></span>
                     <span>{{ 'expenses'|_ }}</span>
                 </a>
             </li>
             <li class="{{ activeRoutePartialObjectType('transactions', 'deposit') }}">
-                <a href="{{ route('transactions.index', ['deposit'], false) }}">
+                <a href="{{ route('transactions.index', ['deposit']) }}">
                     <span class="fa fa-angle-right fa-fw"></span>
                     <span>{{ 'income'|_ }}</span>
                 </a>
             </li>
             <li class="{{ activeRoutePartialObjectType('transactions', 'transfers') }}">
-                <a href="{{ route('transactions.index', ['transfers'], false) }}">
+                <a href="{{ route('transactions.index', ['transfers']) }}">
                     <span class="fa fa-angle-right fa-fw"></span>
                     <span>{{ 'transfers'|_ }}</span>
                 </a>
@@ -73,19 +73,19 @@
 
         <ul class="treeview-menu">
             <li class="{{ activeRoutePartial('rules') }}">
-                <a href="{{ route('rules.index', null, false) }}">
+                <a href="{{ route('rules.index') }}">
                     <span class="fa fa-angle-right fa-fw"></span>
                     <span>{{ 'rules'|_ }}</span>
                 </a>
             </li>
             <li class="{{ activeRoutePartial('recurring') }}">
-                <a href="{{ route('recurring.index', null, false) }}">
+                <a href="{{ route('recurring.index') }}">
                     <span class="fa fa-angle-right fa-fw"></span>
                     <span>{{ 'recurrences'|_ }}</span>
                 </a>
             </li>
             <li class="{{ activeRoutePartial('webhooks') }}">
-                <a href="{{ route('webhooks.index', null, false) }}">
+                <a href="{{ route('webhooks.index') }}">
                     <span class="fa fa-angle-right fa-fw"></span>
                     <span>{{ 'webhooks'|_ }}</span>
                 </a>
@@ -106,25 +106,25 @@
 
         <ul class="treeview-menu">
             <li class="{{ activeRoutePartialObjectType('accounts', 'asset') }}">
-                <a href="{{ route('accounts.index', ['asset'], false) }}">
+                <a href="{{ route('accounts.index', ['asset']) }}">
                     <span class="fa fa-angle-right fa-fw"></span>
                     <span>{{ 'asset_accounts'|_ }}</span>
                 </a>
             </li>
             <li class="{{ activeRoutePartialObjectType('accounts', 'expense') }}">
-                <a href="{{ route('accounts.index', ['expense'], false) }}">
+                <a href="{{ route('accounts.index', ['expense']) }}">
                     <span class="fa fa-angle-right fa-fw"></span>
                     <span>{{ 'expense_accounts'|_ }}</span>
                 </a>
             </li>
             <li class="{{ activeRoutePartialObjectType('accounts', 'revenue') }}">
-                <a href="{{ route('accounts.index', ['revenue'], false) }}">
+                <a href="{{ route('accounts.index', ['revenue']) }}">
                     <span class="fa fa-angle-right fa-fw"></span>
                     <span>{{ 'revenue_accounts'|_ }}</span>
                 </a>
             </li>
             <li class="{{ activeRoutePartialObjectType('accounts', 'liabilities') }}">
-                <a href="{{ route('accounts.index', ['liabilities'], false) }}">
+                <a href="{{ route('accounts.index', ['liabilities']) }}">
                     <span class="fa fa-angle-right fa-fw"></span>
                     <span>{{ 'liabilities_accounts'|_ }}</span>
                 </a>
@@ -143,19 +143,19 @@
 
         <ul class="treeview-menu">
             <li class="{{ activeRoutePartial('categories') }}">
-                <a href="{{ route('categories.index', null, false) }}">
+                <a href="{{ route('categories.index') }}">
                     <span class="fa fa-angle-right fa-fw"></span>
                     <span>{{ 'categories'|_ }}</span>
                 </a>
             </li>
             <li class="{{ activeRoutePartial('tags') }}">
-                <a href="{{ route('tags.index', null, false) }}">
+                <a href="{{ route('tags.index') }}">
                     <span class="fa fa-angle-right fa-fw"></span>
                     <span>{{ 'tags'|_ }}</span>
                 </a>
             </li>
             <li class="{{ activeRoutePartial('object-groups') }}">
-                <a href="{{ route('object-groups.index', null, false) }}">
+                <a href="{{ route('object-groups.index') }}">
                     <span class="fa fa-angle-right fa-fw"></span>
                     <span>{{ 'object_groups_menu_bar'|_ }}</span>
                 </a>
@@ -164,7 +164,7 @@
     </li>
 
     <li class="{{ activeRoutePartial('reports') }}" id="report-menu">
-        <a href="{{ route('reports.index', null, false) }}"> {# relative route! #}
+        <a href="{{ route('reports.index') }}"> {# relative route! #}
             <em class="fa fa-bar-chart fa-fw"></em>
             <span>{{ 'reports'|_ }}</span>
         </a>
@@ -173,7 +173,7 @@
 
     {% if config('firefly.feature_flags.export') %}
         <li class="{{ activeRoutePartial('export') }}" id="report-menu">
-            <a href="{{ route('export.index', null, false) }}">
+            <a href="{{ route('export.index') }}">
                 <em class="fa fa-upload fa-fw"></em>
                 <span>{{ 'export_data_menu'|_ }}</span>
             </a>
@@ -192,27 +192,27 @@
 
         <ul class="treeview-menu">
             <li class="{{ activeRoutePartial('profile') }}">
-                <a class="{{ activeRouteStrict('profile.index') }}" href="{{ route('profile.index', null, false) }}">
+                <a class="{{ activeRouteStrict('profile.index') }}" href="{{ route('profile.index') }}">
                     <span class="fa fa-angle-right fa-fw"></span>
                     <span>{{ 'profile'|_ }}</span>
                 </a>
             </li>
             <li class="{{ activeRoutePartial('preferences') }}">
                 <a class="{{ activeRouteStrict('preferences.index') }}"
-                   href="{{ route('preferences.index', null, false) }}">
+                   href="{{ route('preferences.index') }}">
                     <span class="fa fa-angle-right fa-fw"></span>
                     <span>{{ 'preferences'|_ }}</span>
                 </a>
             </li>
             <li class="{{ activeRoutePartial('currencies') }}">
-                <a class="{{ activeRoutePartial('currencies') }}" href="{{ route('currencies.index', null, false) }}">
+                <a class="{{ activeRoutePartial('currencies') }}" href="{{ route('currencies.index') }}">
                     <span class="fa fa-angle-right fa-fw"></span>
                     <span>{{ 'currencies'|_ }}</span>
                 </a>
             </li>
             {% if true == featuringWebhooks %}
                 <li class="{{ activeRoutePartial('webhooks') }}">
-                    <a class="{{ activeRoutePartial('webhooks') }}" href="{{ route('webhooks.index', null, false) }}">
+                    <a class="{{ activeRoutePartial('webhooks') }}" href="{{ route('webhooks.index') }}">
                         <span class="fa fa-angle-right fa-fw"></span>
                         <span>{{ 'webhooks'|_ }}</span>
                     </a>
@@ -220,7 +220,7 @@
             {% endif %}
             {% if hasRole('owner') %}
                 <li class="{{ activeRoutePartial('admin') }}">
-                    <a class="{{ activeRoutePartial('admin') }}" href="{{ route('admin.index', null, false) }}">
+                    <a class="{{ activeRoutePartial('admin') }}" href="{{ route('admin.index') }}">
                         <span class="fa fa-angle-right fa-fw"></span>
                         <span>{{ 'administration'|_ }}</span>
                     </a>
@@ -232,7 +232,7 @@
 
     {% if 'remote_user_guard' != authGuard or '' != logoutUri %}
         <li>
-            <a href="{{ route('logout', null, false) }}" class="logout-link">
+            <a href="{{ route('logout') }}" class="logout-link">
                 <em class="fa fa-sign-out fa-fw"></em>
                 <span>{{ 'logout'|_ }}</span>
             </a>
diff --git a/resources/views/piggy-banks/create.twig b/resources/views/piggy-banks/create.twig
index a2a12de533..f25dd211a8 100644
--- a/resources/views/piggy-banks/create.twig
+++ b/resources/views/piggy-banks/create.twig
@@ -70,6 +70,6 @@
 {% endblock %}
 
 {% block styles %}
-    <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
-    <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">
 {% endblock %}
diff --git a/resources/views/piggy-banks/index.twig b/resources/views/piggy-banks/index.twig
index 15d5fdd4a3..7a25c002d4 100644
--- a/resources/views/piggy-banks/index.twig
+++ b/resources/views/piggy-banks/index.twig
@@ -8,71 +8,71 @@
     {% if piggyBanks|length == 0 %}
         {% include 'partials.empty' with {objectType: 'default', type: 'piggies',route: route('piggy-banks.create')} %}
     {% else %}
-<div class="row">
-    <div class="col-lg-12 col-md-12 col-sm-12">
-        <div class="box">
-            <div class="box-header with-border">
-                <h3 class="box-title">{{ 'piggyBanks'|_ }}</h3>
-            </div>
-            <div class="box-body no-padding">
-                <div style="padding:8px;">
-                    <a class="btn btn-success" href="{{ route('piggy-banks.create') }}"><span class="fa fa-plus fa-fw"></span> {{ 'create_new_piggy_bank'|_ }}</a>
+        <div class="row">
+            <div class="col-lg-12 col-md-12 col-sm-12">
+                <div class="box">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'piggyBanks'|_ }}</h3>
+                    </div>
+                    <div class="box-body no-padding">
+                        <div style="padding:8px;">
+                            <a class="btn btn-success" href="{{ route('piggy-banks.create') }}"><span class="fa fa-plus fa-fw"></span> {{ 'create_new_piggy_bank'|_ }}</a>
+                        </div>
+                        {% include 'list/piggy-banks' %}
+                    </div>
+                    <div class="box-footer">
+                        <a class="btn btn-success" href="{{ route('piggy-banks.create') }}"><span class="fa fa-plus fa-fw"></span> {{ 'create_new_piggy_bank'|_ }}</a>
+                    </div>
                 </div>
-                {% include 'list/piggy-banks' %}
-            </div>
-            <div class="box-footer">
-                <a class="btn btn-success" href="{{ route('piggy-banks.create') }}"><span class="fa fa-plus fa-fw"></span> {{ 'create_new_piggy_bank'|_ }}</a>
             </div>
         </div>
-    </div>
-</div>
 
-<div class="row">
-    <div class="col-lg-12 col-md-12 col-sm-12">
-        <div class="box">
-            <div class="box-header with-border">
-                <h3 class="box-title">{{ 'account_status'|_ }}</h3>
-            </div>
-            <div class="box-body no-padding">
-                <table class="table table-responsive table-hover" id="accountStatus">
-                    <thead>
-                    <tr>
-                        <th>{{ 'account'|_ }}</th>
-                        <th style="text-align:right;" class="hidden-sm hidden-xs">{{ 'balance'|_ }}</th>
-                        <th style="text-align:right;">{{ 'left_for_piggy_banks'|_ }}</th>
-                        <th style="text-align:right;" class="hidden-sm hidden-xs">{{ 'sum_of_piggy_banks'|_ }}</th>
-                        <th style="text-align:right;" class="hidden-sm hidden-xs">{{ 'saved_so_far'|_ }}</th>
-                        <th style="text-align:right;" class="hidden-sm hidden-xs">{{ 'left_to_save'|_ }}</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    {% for id,info in accounts %}
-                        <tr>
-                            <td><a href="{{ route('accounts.show',id) }}" title="{{ info.name }}">{{ info.name }}</a></td>
-                            <td style="text-align:right;" class="hidden-sm hidden-xs">
-                                {{ formatAmountBySymbol(info.current_balance,info.currency_symbol,info.currency_decimal_places) }}
-                                </td>
-                            <td style="text-align:right;">
-                                {{ formatAmountBySymbol(info.left,info.currency_symbol,info.currency_decimal_places) }}
-                            </td>
-                            <td style="text-align:right;" class="hidden-sm hidden-xs">
-                                {{ formatAmountBySymbol(info.target,info.currency_symbol,info.currency_decimal_places) }}
-                            </td>
-                            <td style="text-align:right;" class="hidden-sm hidden-xs">
-                                {{ formatAmountBySymbol(info.saved,info.currency_symbol,info.currency_decimal_places) }}
-                                </td>
-                            <td style="text-align:right;" class="hidden-sm hidden-xs">
-                                {{ formatAmountBySymbol(info.to_save,info.currency_symbol,info.currency_decimal_places) }}
-                            </td>
-                        </tr>
-                    {% endfor %}
-                    </tbody>
-                </table>
+        <div class="row">
+            <div class="col-lg-12 col-md-12 col-sm-12">
+                <div class="box">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'account_status'|_ }}</h3>
+                    </div>
+                    <div class="box-body no-padding">
+                        <table class="table table-responsive table-hover" id="accountStatus">
+                            <thead>
+                            <tr>
+                                <th>{{ 'account'|_ }}</th>
+                                <th style="text-align:right;" class="hidden-sm hidden-xs">{{ 'balance'|_ }}</th>
+                                <th style="text-align:right;">{{ 'left_for_piggy_banks'|_ }}</th>
+                                <th style="text-align:right;" class="hidden-sm hidden-xs">{{ 'sum_of_piggy_banks'|_ }}</th>
+                                <th style="text-align:right;" class="hidden-sm hidden-xs">{{ 'saved_so_far'|_ }}</th>
+                                <th style="text-align:right;" class="hidden-sm hidden-xs">{{ 'left_to_save'|_ }}</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            {% for id,info in accounts %}
+                                <tr>
+                                    <td><a href="{{ route('accounts.show',id) }}" title="{{ info.name }}">{{ info.name }}</a></td>
+                                    <td style="text-align:right;" class="hidden-sm hidden-xs">
+                                        {{ formatAmountBySymbol(info.current_balance,info.currency_symbol,info.currency_decimal_places) }}
+                                    </td>
+                                    <td style="text-align:right;">
+                                        {{ formatAmountBySymbol(info.left,info.currency_symbol,info.currency_decimal_places) }}
+                                    </td>
+                                    <td style="text-align:right;" class="hidden-sm hidden-xs">
+                                        {{ formatAmountBySymbol(info.target,info.currency_symbol,info.currency_decimal_places) }}
+                                    </td>
+                                    <td style="text-align:right;" class="hidden-sm hidden-xs">
+                                        {{ formatAmountBySymbol(info.saved,info.currency_symbol,info.currency_decimal_places) }}
+                                    </td>
+                                    <td style="text-align:right;" class="hidden-sm hidden-xs">
+                                        {{ formatAmountBySymbol(info.to_save,info.currency_symbol,info.currency_decimal_places) }}
+                                    </td>
+                                </tr>
+                            {% endfor %}
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
             </div>
         </div>
-    </div>
-</div>
-{% endif %}
+    {% endif %}
 {% endblock %}
 {% block scripts %}
     <script src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>
diff --git a/resources/views/piggy-banks/show.twig b/resources/views/piggy-banks/show.twig
index 0c0ef544bb..6ac2e24001 100644
--- a/resources/views/piggy-banks/show.twig
+++ b/resources/views/piggy-banks/show.twig
@@ -37,18 +37,18 @@
                             <td><a href="{{ route('accounts.show', piggyBank.account_id) }}">{{ piggyBank.account.name }}</a></td>
                         </tr>
                         {% if piggy.object_group_title %}
-                        <tr>
-                            <td style="width:40%;">{{ 'object_group'|_ }}</td>
-                            <td>{{ piggy.object_group_title }}</a></td>
-                        </tr>
+                            <tr>
+                                <td style="width:40%;">{{ 'object_group'|_ }}</td>
+                                <td>{{ piggy.object_group_title }}</a></td>
+                            </tr>
                         {% endif %}
                         {% if null != piggy.target_amount %}
-                        <tr>
-                            <td>{{ 'target_amount'|_ }}</td>
-                            <td>
-                                {{ formatAmountBySymbol(piggy.target_amount, piggy.currency_symbol, piggy.currency_decimal_places) }}
-                            </td>
-                        </tr>
+                            <tr>
+                                <td>{{ 'target_amount'|_ }}</td>
+                                <td>
+                                    {{ formatAmountBySymbol(piggy.target_amount, piggy.currency_symbol, piggy.currency_decimal_places) }}
+                                </td>
+                            </tr>
                         {% endif %}
                         <tr>
                             <td>{{ 'saved_so_far'|_ }}</td>
@@ -57,12 +57,12 @@
                             </td>
                         </tr>
                         {% if null != piggy.left_to_save %}
-                        <tr>
-                            <td>{{ 'left_to_save'|_ }}</td>
-                            <td>
-                                {{ formatAmountBySymbol(piggy.left_to_save, piggy.currency_symbol, piggy.currency_decimal_places) }}
-                            </td>
-                        </tr>
+                            <tr>
+                                <td>{{ 'left_to_save'|_ }}</td>
+                                <td>
+                                    {{ formatAmountBySymbol(piggy.left_to_save, piggy.currency_symbol, piggy.currency_decimal_places) }}
+                                </td>
+                            </tr>
                         {% endif %}
                         <tr>
                             <td>{{ 'start_date'|_ }}</td>
diff --git a/resources/views/preferences/index.twig b/resources/views/preferences/index.twig
index 5860e8e728..84d5cf80f4 100644
--- a/resources/views/preferences/index.twig
+++ b/resources/views/preferences/index.twig
@@ -287,13 +287,13 @@
                                         <h3>{{ 'dark_mode_preference'|_ }}</h3>
                                         <p class="text-info">{{ 'dark_mode_preference_help'|_ }}</p>
                                         {% for mode in availableDarkModes %}
-                                        <div class="radio">
-                                            <label>
-                                                <input type="radio" name="darkMode"
-                                                       value="{{ mode }}" {% if darkMode == mode %} checked {% endif %}>
-                                                {{ ('dark_mode_option_'~mode)|_ }}
-                                            </label>
-                                        </div>
+                                            <div class="radio">
+                                                <label>
+                                                    <input type="radio" name="darkMode"
+                                                           value="{{ mode }}" {% if darkMode == mode %} checked {% endif %}>
+                                                    {{ ('dark_mode_option_'~mode)|_ }}
+                                                </label>
+                                            </div>
                                         {% endfor %}
                                     </div>
                                 </div>
@@ -313,8 +313,8 @@
                                                 <div class="col-sm-10">
                                                     <div class="checkbox">
                                                         <label>
-                                                        <input type="checkbox" name="notification_{{ id }}" {{ enabled == true ? 'checked' : '' }} value="1">
-                                                            {{ trans('firefly.pref_notification_' ~ id)  }}
+                                                            <input type="checkbox" name="notification_{{ id }}" {{ enabled == true ? 'checked' : '' }} value="1">
+                                                            {{ trans('firefly.pref_notification_' ~ id) }}
 
                                                         </label>
                                                     </div>
diff --git a/resources/views/recurring/index.twig b/resources/views/recurring/index.twig
index 437ad9dc10..a484df4d03 100644
--- a/resources/views/recurring/index.twig
+++ b/resources/views/recurring/index.twig
@@ -50,9 +50,9 @@
                                     <td class="hidden-sm hidden-xs">
                                         <div class="btn-group btn-group-xs edit_tr_buttons">
                                             <a class="btn btn-default btn-xs" title="{{ 'edit'|_ }}" href="{{ route('recurring.edit',rt.id) }}"><span
-                                                        class="fa fa-fw fa-pencil"></span></a><a class="btn btn-danger btn-xs" title="{{ 'delete'|_ }}"
-                                                                                              href="{{ route('recurring.delete',rt.id) }}"><span
-                                                        class="fa fa-fw fa-trash-o"></span></a>
+                                                    class="fa fa-fw fa-pencil"></span></a><a class="btn btn-danger btn-xs" title="{{ 'delete'|_ }}"
+                                                                                             href="{{ route('recurring.delete',rt.id) }}"><span
+                                                    class="fa fa-fw fa-trash-o"></span></a>
                                         </div>
                                     </td>
                                     <td data-value="{{ rt.title }}">
@@ -73,7 +73,7 @@
                                         <ol>
                                             {% for rtt in rt.transactions %}
                                                 <li>
-                                                    {# normal amount + comma#}
+                                                    {# normal amount + comma #}
                                                     {{ formatAmountBySymbol(rtt['amount'],rtt['currency_symbol'],rtt['currency_decimal_places']) }}{% if rtt['foreign_amount'] == null %},{% endif %}
 
                                                     {# foreign amount + comma #}
@@ -89,7 +89,7 @@
                                     </td>
                                     <td>
                                         {% if null != rt.repeat_until and today > rt.repeat_until %}
-                                        <span class="text-danger">
+                                            <span class="text-danger">
                                             {{ trans('firefly.repeat_until_in_past', {date: rt.repeat_until.isoFormat(monthAndDayFormat) }) }}
                                         </span>
                                         {% endif %}
@@ -131,7 +131,7 @@
                                             {% for rep in rt.repetitions %}
                                                 {% for occ in rep.occurrences %}
                                                     {% if loop.index0 < 2 %}
-                                                    <li>{{ occ.isoFormat(monthAndDayFormat) }}</li>
+                                                        <li>{{ occ.isoFormat(monthAndDayFormat) }}</li>
                                                     {% endif %}
                                                 {% endfor %}
                                             {% endfor %}
diff --git a/resources/views/recurring/show.twig b/resources/views/recurring/show.twig
index 17459a3ce9..f43a6ee23a 100644
--- a/resources/views/recurring/show.twig
+++ b/resources/views/recurring/show.twig
@@ -41,7 +41,7 @@
             <div class="box-footer">
                 <div class="btn-group">
                     <a href="{{ route('recurring.edit', [array.id]) }}" class="btn btn-sm btn-default"><span
-                                class="fa fa-pencil"></span> {{ 'edit'|_ }}</a>
+                            class="fa fa-pencil"></span> {{ 'edit'|_ }}</a>
                     <a href="{{ route('recurring.delete', [array.id]) }}" class="btn btn-sm btn-danger">{{ 'delete'|_ }}
                         <span class="fa fa-trash"></span></a>
                 </div>
diff --git a/resources/views/reports/audit/report.twig b/resources/views/reports/audit/report.twig
index dfd2ee2ede..c3ca5d319f 100644
--- a/resources/views/reports/audit/report.twig
+++ b/resources/views/reports/audit/report.twig
@@ -6,79 +6,79 @@
 
 {% block content %}
 
-<div class="row no-print">
-    <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
-        <div class="box" id="optionsBox">
-            <div class="box-header with-border">
-                <h3 class="box-title">{{ 'options'|_ }}</h3>
-            </div>
-            <div class="box-body">
-                <ul class="list-inline">
-                    {% for hide in hideable %}
-                        <li><input
+    <div class="row no-print">
+        <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+            <div class="box" id="optionsBox">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ 'options'|_ }}</h3>
+                </div>
+                <div class="box-body">
+                    <ul class="list-inline">
+                        {% for hide in hideable %}
+                            <li><input
                                     {% if hide in defaultShow %}checked{% endif %}
                                     type="checkbox" class="audit-option-checkbox" name="option[]" value="{{ hide }}" id="option_{{ hide }}"/> <label
                                     for="option_{{ hide }}" style="font-weight:normal;">{{ trans('list.'~hide) }}</label></li>
-                    {% endfor %}
+                        {% endfor %}
 
-                </ul>
+                    </ul>
+                </div>
             </div>
         </div>
     </div>
-</div>
 
 
-{% for account in accounts %}
-<div class="row">
-    <div class="col-lg-12 col-md-12 col-sm-12">
-        <div class="box">
-            <div class="box-header with-border">
-                <h3 class="box-title">{{ account.name }}</h3>
+    {% for account in accounts %}
+        <div class="row">
+            <div class="col-lg-12 col-md-12 col-sm-12">
+                <div class="box">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ account.name }}</h3>
+                    </div>
+                    {% set url = route('accounts.show',account.id) %}
+                    {% if not auditData[account.id].exists %}
+                        <div class="box-body">
+
+                            <em>
+                                {{ trans('firefly.no_audit_activity',
+                                    {
+                                        account_name: account.name|escape,
+                                        url: url,
+                                        start: start.isoFormat(monthAndDayFormat),
+                                        end: end.isoFormat(monthAndDayFormat),
+                                    })|raw }}
+
+                            </em>
+                        </div>
+                    {% else %}
+                        <div class="box-body no-padding">
+                            <p style="padding:10px;">
+                                {{ trans('firefly.audit_end_balance',
+                                    {
+                                        account_name: account.name|escape,
+                                        url: url,
+                                        end: auditData[account.id].dayBefore,
+                                        balance: formatAmountByAccount(account, auditData[account.id].dayBeforeBalance)
+                                    })|raw }}
+                            </p>
+                            {% include 'reports.partials.journals-audit'  with {'journals': auditData[account.id].journals,'account':account} %}
+
+                            <p style="padding:10px;">
+
+                                {{ trans('firefly.audit_end_balance',
+                                    {
+                                        account_name: account.name|escape,
+                                        url: url,
+                                        end: auditData[account.id].end,
+                                        balance: formatAmountByAccount(account,auditData[account.id].endBalance)
+                                    })|raw }}
+                            </p>
+                        </div>
+                    {% endif %}
+                </div>
             </div>
-            {% set url = route('accounts.show',account.id) %}
-            {% if not auditData[account.id].exists %}
-            <div class="box-body">
-
-                <em>
-                    {{ trans('firefly.no_audit_activity',
-                        {
-                            account_name: account.name|escape,
-                            url: url,
-                            start: start.isoFormat(monthAndDayFormat),
-                            end: end.isoFormat(monthAndDayFormat),
-                        })|raw }}
-
-                </em>
-            </div>
-            {% else %}
-            <div class="box-body no-padding">
-                <p style="padding:10px;">
-                    {{ trans('firefly.audit_end_balance',
-                        {
-                            account_name: account.name|escape,
-                            url: url,
-                            end: auditData[account.id].dayBefore,
-                            balance: formatAmountByAccount(account, auditData[account.id].dayBeforeBalance)
-                        })|raw }}
-                </p>
-                {% include 'reports.partials.journals-audit'  with {'journals': auditData[account.id].journals,'account':account} %}
-
-                <p style="padding:10px;">
-
-                    {{ trans('firefly.audit_end_balance',
-                        {
-                            account_name: account.name|escape,
-                            url: url,
-                            end: auditData[account.id].end,
-                            balance: formatAmountByAccount(account,auditData[account.id].endBalance)
-                        })|raw }}
-                </p>
-            </div>
-            {% endif %}
         </div>
-    </div>
-</div>
-{% endfor %}
+    {% endfor %}
 
 {% endblock %}
 {% block styles %}
diff --git a/resources/views/reports/budget/month.twig b/resources/views/reports/budget/month.twig
index e4511f7abf..faf3a113b5 100644
--- a/resources/views/reports/budget/month.twig
+++ b/resources/views/reports/budget/month.twig
@@ -103,18 +103,18 @@
     </div>
 
     {% for budget in budgets %}
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="box main_budget_chart">
-                <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'expenses'|_ }} ({{ budget.name }})</h3>
-                </div>
-                <div class="box-body">
-                    <canvas class="main_budget_canvas" data-url="{{ route('chart.budget.main', [accountIds, budget.id, start.format('Ymd'), end.format('Ymd')]) }}" id="in-out-chart-{{ budget.id }}" style="width:100%;height:400px;" height="400" width="100%"></canvas>
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="box main_budget_chart">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'expenses'|_ }} ({{ budget.name }})</h3>
+                    </div>
+                    <div class="box-body">
+                        <canvas class="main_budget_canvas" data-url="{{ route('chart.budget.main', [accountIds, budget.id, start.format('Ymd'), end.format('Ymd')]) }}" id="in-out-chart-{{ budget.id }}" style="width:100%;height:400px;" height="400" width="100%"></canvas>
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
     {% endfor %}
     <div class="row">
         <div class="col-lg-6">
diff --git a/resources/views/reports/index.twig b/resources/views/reports/index.twig
index 5f0d1ef1af..c2fc58d042 100644
--- a/resources/views/reports/index.twig
+++ b/resources/views/reports/index.twig
@@ -38,15 +38,15 @@
 
                             <div class="col-sm-9" id="inputAccountsSelect">
                                 <select id="inputAccounts" name="accounts[]" multiple class="form-control">
-                                    {% for role, accountList in groupedAccounts  %}
+                                    {% for role, accountList in groupedAccounts %}
                                         <optgroup label="{{ role }}">
-                                    {% for account in accountList %}
-                                        <option
-                                                value="{{ account.id }}"
-                                                label="{{ account.name }}{% if accountGetMetaField(account, 'accountRole') == 'sharedAsset' %} ({{ 'shared'|_|lower }}){% endif %}">
-                                            {{ account.name }}{% if accountGetMetaField(account, 'accountRole') == 'sharedAsset' %} ({{ 'shared'|_|lower }}){% endif %}
-                                        </option>
-                                    {% endfor %}
+                                            {% for account in accountList %}
+                                                <option
+                                                    value="{{ account.id }}"
+                                                    label="{{ account.name }}{% if accountGetMetaField(account, 'accountRole') == 'sharedAsset' %} ({{ 'shared'|_|lower }}){% endif %}">
+                                                    {{ account.name }}{% if accountGetMetaField(account, 'accountRole') == 'sharedAsset' %} ({{ 'shared'|_|lower }}){% endif %}
+                                                </option>
+                                            {% endfor %}
                                         </optgroup>
                                     {% endfor %}
                                 </select>
@@ -186,7 +186,7 @@
         var selectAllText = "{{ trans('firefly.multi_select_select_all')|escape('js') }}";
         var nonSelectedText = "{{ trans('firefly.multi_select_no_selection')|escape('js') }}";
         var nSelectedText = "{{ trans('firefly.multi_select_n_selected')|escape('js') }}";
-        var allSelectedText = "{{ trans('firefly.multi_select_all_selected')|escape('js')   }}";
+        var allSelectedText = "{{ trans('firefly.multi_select_all_selected')|escape('js') }}";
         var filterPlaceholder = "{{ trans('firefly.multi_select_filter_placeholder')|escape('js') }}";
     </script>
     <script type="text/javascript" src="v1/js/lib/bootstrap-multiselect.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
diff --git a/resources/views/rules/index.twig b/resources/views/rules/index.twig
index 0f8103fb47..45c50c328f 100644
--- a/resources/views/rules/index.twig
+++ b/resources/views/rules/index.twig
@@ -13,9 +13,9 @@
     </div>
 
     {% if ruleGroups|length == 1 and ruleGroups[0].rules.count() == 0 %}
-    {% include 'partials.empty' with {objectType: 'default', type: 'rules',route: route('rules.create')} %}
-    {# make FF ignore demo for now. #}
-    {% set shownDemo = true %}
+        {% include 'partials.empty' with {objectType: 'default', type: 'rules',route: route('rules.create')} %}
+        {# make FF ignore demo for now. #}
+        {% set shownDemo = true %}
     {% endif %}
 
     {% for ruleGroup in ruleGroups %}
@@ -37,20 +37,20 @@
                                 <button type="button" class="btn btn-box-tool" data-widget="collapse"><span class="fa fa-minus"></span>
                                 </button>
                                 <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span
-                                            class="fa fa-ellipsis-v"></span></button>
+                                        class="fa fa-ellipsis-v"></span></button>
                                 <ul class="dropdown-menu" role="menu">
                                     <li><a href="{{ route('rule-groups.edit',ruleGroup.id) }}"><span class="fa fa-fw fa-pencil"></span> {{ 'edit'|_ }}</a></li>
                                     <li><a href="{{ route('rule-groups.delete',ruleGroup.id) }}"><span class="fa fa-fw fa-trash"></span> {{ 'delete'|_ }}</a></li>
                                     <li><a href="{{ route('rule-groups.select-transactions',ruleGroup.id) }}"><span
-                                                    class="fa fa-fw fa-power-off"></span> {{ trans('firefly.apply_rule_group_selection', {title: ruleGroup.title}) }}
+                                                class="fa fa-fw fa-power-off"></span> {{ trans('firefly.apply_rule_group_selection', {title: ruleGroup.title}) }}
                                         </a></li>
                                     {% if ruleGroup.order > 1 %}
                                         <li><a href="#" class="move-group" data-direction="up" data-id="{{ ruleGroup.id }}"><span
-                                                        class="fa fa-fw fa-arrow-up"></span> {{ 'move_rule_group_up'|_ }}</a></li>
+                                                    class="fa fa-fw fa-arrow-up"></span> {{ 'move_rule_group_up'|_ }}</a></li>
                                     {% endif %}
                                     {% if ruleGroup.order < ruleGroups|length %}
                                         <li><a href="#" class="move-group" data-direction="down" data-id="{{ ruleGroup.id }}"><span
-                                                        class="fa fa-fw fa-arrow-down"></span> {{ 'move_rule_group_down'|_ }}
+                                                    class="fa fa-fw fa-arrow-down"></span> {{ 'move_rule_group_down'|_ }}
                                             </a></li>
                                     {% endif %}
                                 </ul>
@@ -77,7 +77,7 @@
                                 </thead>
                                 <tbody class="rule-connected-list">
                                 {% for rule in ruleGroup.rules %}
-                                    <tr class="single-rule" data-order="{{ rule.order }}"  data-id="{{ rule.id }}" data-group-id="{{ ruleGroup.id }}" data-position="{{ loop.index0 }}">
+                                    <tr class="single-rule" data-order="{{ rule.order }}" data-id="{{ rule.id }}" data-group-id="{{ ruleGroup.id }}" data-position="{{ loop.index0 }}">
                                         <td>
                                             <div class="btn-group btn-group-xs prio_buttons">
                                                 <span class="fa fa-fw fa-bars rule-handle"></span>
@@ -87,11 +87,11 @@
                                             <div class="btn-group btn-group-xs edit_buttons">
                                                 <a title="{{ 'edit'|_ }}" href="{{ route('rules.edit', rule.id) }}"
                                                    class="btn btn-default"><span
-                                                            class="fa fa-fw fa-pencil"></span></a>
+                                                        class="fa fa-fw fa-pencil"></span></a>
                                                 <a title="{{ 'delete'|_ }}"
                                                    href="{{ route('rules.delete', rule.id) }}"
                                                    class="btn btn-danger"><span
-                                                            class="fa fa-fw fa-trash"></span></a>
+                                                        class="fa fa-fw fa-trash"></span></a>
                                             </div>
                                         </td>
                                         <td>
@@ -101,7 +101,7 @@
                                                     <a href="{{ route('rules.search',rule.id) }}" class="btn btn-default {% if false == rule.strict %}test_rule_triggers{% endif %}" data-id="{{ rule.id }}" title="{{ 'test_rule_triggers'|_ }}"><span data-id="{{ rule.id }}" class="fa fa-fw fa-flask"></span></a>
 
                                                     {# actually execute rule #}
-                                                <a href="{{ route('rules.select-transactions',rule.id) }}" class="btn btn-default" title=" {{ trans('firefly.apply_rule_selection', {title: rule.title}) }}"><span class="fa fa-fw fa-power-off "></span></a>
+                                                    <a href="{{ route('rules.select-transactions',rule.id) }}" class="btn btn-default" title=" {{ trans('firefly.apply_rule_selection', {title: rule.title}) }}"><span class="fa fa-fw fa-power-off "></span></a>
                                                 {% endif %}
 
                                                 {# duplicate rule #}
@@ -120,12 +120,12 @@
 
                                             {% if rule.description != "" %}
                                                 <small class="hidden-xs"
-                                                        {% if not rule.active %}
-                                                            class="text-muted"
-                                                        {% endif %}
+                                                    {% if not rule.active %}
+                                                        class="text-muted"
+                                                    {% endif %}
                                                 ><br/>{{ rule.description|default('')|markdown }}</small>
                                             {% endif %}
-                                            <small><br />{% if rule.strict %}<span class="text-danger">{{ 'rule_is_strict'|_ }}</span>{% else %}<span class="text-success">{{ 'rule_is_not_strict'|_ }}</span>{% endif %}</small>
+                                            <small><br/>{% if rule.strict %}<span class="text-danger">{{ 'rule_is_strict'|_ }}</span>{% else %}<span class="text-success">{{ 'rule_is_not_strict'|_ }}</span>{% endif %}</small>
                                         </td>
                                         <td class="hidden-xs">
                                             {% if rule.ruleTriggers.count() > 0 %}
@@ -133,10 +133,10 @@
                                                     {% for trigger in rule.ruleTriggers %}
                                                         {% if trigger.trigger_type != "user_action" %}
                                                             <li
-                                                                    {% if not rule.active %}
-                                                                        class="text-muted"
-                                                                    {% endif %}
-                                                                    data-id="{{ trigger.id }}">
+                                                                {% if not rule.active %}
+                                                                    class="text-muted"
+                                                                {% endif %}
+                                                                data-id="{{ trigger.id }}">
                                                                 {{ trans(('firefly.rule_trigger_' ~ getRootSearchOperator(trigger.trigger_type)), {trigger_value: trigger.trigger_value}) }}
 
                                                                 {% if trigger.stop_processing %}
@@ -153,10 +153,10 @@
                                                 <ul class="small" data-id="{{ rule.id }}">
                                                     {% for action in rule.ruleActions %}
                                                         <li
-                                                                {% if not rule.active %}
-                                                                    class="text-muted"
-                                                                {% endif %}
-                                                                data-id="{{ action.id }}">{{ trans(('firefly.rule_action_' ~ action.action_type), {action_value: action.action_value}) }}
+                                                            {% if not rule.active %}
+                                                                class="text-muted"
+                                                            {% endif %}
+                                                            data-id="{{ action.id }}">{{ trans(('firefly.rule_action_' ~ action.action_type), {action_value: action.action_value}) }}
                                                             {% if action.stop_processing %}
                                                                 <span class="fa fa-stop-circle-o"></span>
                                                             {% endif %}
diff --git a/resources/views/rules/rule/edit.twig b/resources/views/rules/rule/edit.twig
index 2ee6ca7fc9..7d1805cb3e 100644
--- a/resources/views/rules/rule/edit.twig
+++ b/resources/views/rules/rule/edit.twig
@@ -70,7 +70,7 @@
                             <br/>
                             <a href="#" class="btn btn-default add_rule_trigger">{{ 'add_rule_trigger'|_ }}</a>
                             <a href="#" class="btn btn-default test_rule_triggers"><span
-                                        class="fa fa-flask"></span> {{ 'test_rule_triggers'|_ }}</a>
+                                    class="fa fa-flask"></span> {{ 'test_rule_triggers'|_ }}</a>
                         </p>
                     </div>
                 </div>
diff --git a/resources/views/rules/rule/select-transactions.twig b/resources/views/rules/rule/select-transactions.twig
index 0b9aecde08..aae7bc3b9a 100644
--- a/resources/views/rules/rule/select-transactions.twig
+++ b/resources/views/rules/rule/select-transactions.twig
@@ -45,6 +45,6 @@
 {% endblock %}
 
 {% block styles %}
-    <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
-    <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">
 {% endblock %}
diff --git a/resources/views/search/index.twig b/resources/views/search/index.twig
index 811d799b68..94a4f88f3f 100644
--- a/resources/views/search/index.twig
+++ b/resources/views/search/index.twig
@@ -48,7 +48,7 @@
                         <p>{{ trans('firefly.invalid_operators_list') }}</p>
                         <ul>
                             {% for operator in invalidOperators %}
-                                <li class="text-danger">{{ operator.type  }}:{{ operator.value }}</li>
+                                <li class="text-danger">{{ operator.type }}:{{ operator.value }}</li>
                             {% endfor %}
                         </ul>
                     {% endif %}
@@ -100,7 +100,7 @@
 
                                 <div class="mass_buttons btn-group btn-group pull-right">
                                     <a href="#" class="btn btn-default mass_select"><span
-                                                class="fa fa-fw fa-check-square-o"></span> {{ 'select_transactions'|_ }}</a>
+                                            class="fa fa-fw fa-check-square-o"></span> {{ 'select_transactions'|_ }}</a>
                                     <a href="#" class="btn btn-default mass_stop_select" style="display:none;"><span class="fa faw-fw fa-square-o"
                                         ></span> {{ 'stop_selection'|_ }}</a>
                                 </div>
diff --git a/resources/views/tags/index.twig b/resources/views/tags/index.twig
index ea453360bc..de15b4db18 100644
--- a/resources/views/tags/index.twig
+++ b/resources/views/tags/index.twig
@@ -31,13 +31,13 @@
                                     <div class="row">
                                         {% for tagInfo in entries %}
                                             <div class="col-xs-6 col-sm-4 col-md-3 col-lg-2"
-                                            style="line-height: 1.7em;"
+                                                 style="line-height: 1.7em;"
                                             ><input type="checkbox" name="tags[]" value="{{ tagInfo.id }}"> <a
-                                                        class="label label-success"
-                                                        style="font-weight: normal;font-size:0.9em;"
+                                                    class="label label-success"
+                                                    style="font-weight: normal;font-size:0.9em;"
 
-                                                                                                     title="{{ tagInfo.created_at.isoFormat(monthAndDayFormat) }}"
-                                                                                                     href="{{ route('tags.show',tagInfo.id) }}">{% if tagInfo.location %}<span class="fa fa-fw fa-map-marker"></span>{% endif %}<span class="fa fa-fw fa-tag"></span>{{ tagInfo.tag }}{% if tagInfo.attachments.count() > 0 %}<span class="fa fa-fw fa-paperclip"></span>{% endif %}</a></div>
+                                                    title="{{ tagInfo.created_at.isoFormat(monthAndDayFormat) }}"
+                                                    href="{{ route('tags.show',tagInfo.id) }}">{% if tagInfo.location %}<span class="fa fa-fw fa-map-marker"></span>{% endif %}<span class="fa fa-fw fa-tag"></span>{{ tagInfo.tag }}{% if tagInfo.attachments.count() > 0 %}<span class="fa fa-fw fa-paperclip"></span>{% endif %}</a></div>
 
                                         {% endfor %}
                                     </div>
@@ -45,7 +45,7 @@
                                     <ul class="list-inline">
                                         {% for tagInfo in entries %}
                                             <li>
-                                            <!--&nbsp;-->
+                                                <!--&nbsp;-->
 
                                             </li>
                                         {% endfor %}
diff --git a/resources/views/tags/show.twig b/resources/views/tags/show.twig
index 41cd148b66..885c5f6716 100644
--- a/resources/views/tags/show.twig
+++ b/resources/views/tags/show.twig
@@ -15,13 +15,13 @@
                     <div class="box-tools pull-right">
                         <div class="btn-group">
                             <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span
-                                        class="fa fa-ellipsis-v"></span></button>
+                                    class="fa fa-ellipsis-v"></span></button>
                             <ul class="dropdown-menu" role="menu">
                                 <li><a href="{{ route('tags.edit',tag.id) }}"><span
-                                                class="fa fa-pencil fa-fw"></span> {{ trans('firefly.edit_tag',{tag: tag.tag}) }}
+                                            class="fa fa-pencil fa-fw"></span> {{ trans('firefly.edit_tag',{tag: tag.tag}) }}
                                     </a></li>
                                 <li><a href="{{ route('tags.delete',tag.id) }}"><span
-                                                class="fa fa-trash fa-fw"></span> {{ trans('firefly.delete_tag',{tag: tag.tag}) }}
+                                            class="fa fa-trash fa-fw"></span> {{ trans('firefly.delete_tag',{tag: tag.tag}) }}
                                     </a></li>
                             </ul>
                         </div>
@@ -164,9 +164,9 @@
                 <div class="box-footer">
                     <div class="btn-group btn-group-sm">
                         <a href="{{ route('tags.edit',tag.id) }}" class="btn btn-default"><span
-                                    class="fa fa-pencil fa-fw"></span></a>
+                                class="fa fa-pencil fa-fw"></span></a>
                         <a href="{{ route('tags.delete',tag.id) }}" class="btn btn-danger"><span
-                                    class="fa fa-trash fa-fw"></span></a>
+                                class="fa fa-trash fa-fw"></span></a>
                     </div>
                     <p class="text-muted">
                         <small>{{ 'sums_apply_to_range'|_ }}</small>
@@ -181,13 +181,13 @@
                     <div class="box-tools pull-right">
                         <div class="btn-group">
                             <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span
-                                        class="fa fa-ellipsis-v"></span></button>
+                                    class="fa fa-ellipsis-v"></span></button>
                             <ul class="dropdown-menu" role="menu">
                                 <li><a href="{{ route('tags.edit',tag.id) }}"><span
-                                                class="fa fa-pencil fa-fw"></span> {{ trans('firefly.edit_tag',{tag: tag.tag}) }}
+                                            class="fa fa-pencil fa-fw"></span> {{ trans('firefly.edit_tag',{tag: tag.tag}) }}
                                     </a></li>
                                 <li><a href="{{ route('tags.delete',tag.id) }}"><span
-                                                class="fa fa-trash fa-fw"></span> {{ trans('firefly.delete_tag',{tag: tag.tag}) }}
+                                            class="fa fa-trash fa-fw"></span> {{ trans('firefly.delete_tag',{tag: tag.tag}) }}
                                     </a></li>
                             </ul>
                         </div>
@@ -224,7 +224,7 @@
         <div class="row">
             <div class="col-lg-offset-10 col-lg-2 col-md-offset-10 col-md-2 col-sm-12 col-xs-12">
                 <p class="small text-center"><a
-                            href="{{ route('tags.show',[tag.id,'all']) }}">{{ 'showEverything'|_ }}</a></p>
+                        href="{{ route('tags.show',[tag.id,'all']) }}">{{ 'showEverything'|_ }}</a></p>
             </div>
         </div>
     {% endif %}
@@ -238,13 +238,13 @@
                     <div class="box-tools pull-right">
                         <div class="btn-group">
                             <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span
-                                        class="fa fa-ellipsis-v"></span></button>
+                                    class="fa fa-ellipsis-v"></span></button>
                             <ul class="dropdown-menu" role="menu">
                                 <li><a href="{{ route('tags.edit',tag.id) }}"><span
-                                                class="fa fa-pencil fa-fw"></span> {{ trans('firefly.edit_tag',{tag: tag.tag}) }}
+                                            class="fa fa-pencil fa-fw"></span> {{ trans('firefly.edit_tag',{tag: tag.tag}) }}
                                     </a></li>
                                 <li><a href="{{ route('tags.delete',tag.id) }}"><span
-                                                class="fa fa-trash fa-fw"></span> {{ trans('firefly.delete_tag',{tag: tag.tag}) }}
+                                            class="fa fa-trash fa-fw"></span> {{ trans('firefly.delete_tag',{tag: tag.tag}) }}
                                     </a></li>
                             </ul>
                         </div>
diff --git a/resources/views/transactions/bulk/edit.twig b/resources/views/transactions/bulk/edit.twig
index 2d7a02e9be..fdcc89863b 100644
--- a/resources/views/transactions/bulk/edit.twig
+++ b/resources/views/transactions/bulk/edit.twig
@@ -40,7 +40,7 @@
                                         <tr>
                                             <td>
                                                 <a href="{{ route('transactions.show', [journal.transaction_group_id]) }}">
-                                                {{ journal.description }}</a></td>
+                                                    {{ journal.description }}</a></td>
                                             <td>
                                                 {% if journal.transaction_type_type == 'Deposit' %}
                                                     {{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places) }}
@@ -77,7 +77,7 @@
                                             <td>
                                                 {% for tag in journal.tags %}
                                                     {% if 0 != tag.id %}
-                                                <span style="display: inline;"><a class="label label-success" href="{{ route('tags.show', [tag.id]) }}">
+                                                        <span style="display: inline;"><a class="label label-success" href="{{ route('tags.show', [tag.id]) }}">
                                                         <span class="fa fa-fw fa-tag"></span>
                                                         {{ tag.name }}</a>
                                                 </span>
@@ -85,7 +85,7 @@
                                                 {% endfor %}
                                             </td>
                                             <td>
-                                                {% if journal.journals_in_group > 1  %}
+                                                {% if journal.journals_in_group > 1 %}
                                                     <span title="{{ 'part_of_split'|_ }}" class="text-danger fa fa-fw fa-exclamation-triangle"></span>
                                                 {% endif %}
                                             </td>
@@ -141,19 +141,19 @@
                                         <td>
                                             <div class="radio">
                                                 <label>
-                                                    <input type="radio" name="tags_action" id="tags_action_do_nothing" value="no_nothing" checked />
+                                                    <input type="radio" name="tags_action" id="tags_action_do_nothing" value="no_nothing" checked/>
                                                     {{ 'no_bulk_tags'|_ }}
                                                 </label>
                                             </div>
                                             <div class="radio">
                                                 <label>
-                                                    <input type="radio" name="tags_action" id="tags_action_do_replace" value="do_replace" />
+                                                    <input type="radio" name="tags_action" id="tags_action_do_replace" value="do_replace"/>
                                                     {{ 'replace_with_these_tags'|_ }}
                                                 </label>
                                             </div>
                                             <div class="radio">
                                                 <label>
-                                                    <input type="radio" name="tags_action" id="tags_action_do_append" value="do_append" />
+                                                    <input type="radio" name="tags_action" id="tags_action_do_append" value="do_append"/>
                                                     {{ 'append_these_tags'|_ }}
                                                 </label>
                                             </div>
@@ -195,5 +195,5 @@
     <script type="text/javascript" src="v1/js/ff/transactions/mass/edit-bulk.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
 {% endblock %}
 {% block styles %}
-    <link href="v1/css/bootstrap-tagsinput.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"  media="all" nonce="{{ JS_NONCE }}">
+    <link href="v1/css/bootstrap-tagsinput.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">
 {% endblock %}
diff --git a/resources/views/transactions/convert.twig b/resources/views/transactions/convert.twig
index 6c63f62930..ebf89c4ca9 100644
--- a/resources/views/transactions/convert.twig
+++ b/resources/views/transactions/convert.twig
@@ -81,13 +81,13 @@
                                                 transaction.source_type == 'Debt' or
                                                 transaction.source_type == 'Mortgage' %}
                                                 <input
-                                                        autocomplete="off"
-                                                        placeholder="Source account"
-                                                        name="source_name[{{ transaction.transaction_journal_id }}]"
-                                                        type="text"
-                                                        value="{% if transaction.destination_type != "Cash account" %}{{ preFilled.source_name[transaction.transaction_journal_id]|default(transaction.destination_name) }}{% endif %}"
-                                                        class="form-control tt-input input-revenue"
-                                                        spellcheck="false" dir="auto">
+                                                    autocomplete="off"
+                                                    placeholder="Source account"
+                                                    name="source_name[{{ transaction.transaction_journal_id }}]"
+                                                    type="text"
+                                                    value="{% if transaction.destination_type != "Cash account" %}{{ preFilled.source_name[transaction.transaction_journal_id]|default(transaction.destination_name) }}{% endif %}"
+                                                    class="form-control tt-input input-revenue"
+                                                    spellcheck="false" dir="auto">
                                             {% endif %}
                                         {% endif %}
 
@@ -153,13 +153,13 @@
                                                 transaction.source_type == 'Debt' or
                                                 transaction.source_type == 'Mortgage' %}
                                                 <input
-                                                        autocomplete="off"
-                                                        placeholder="Source account"
-                                                        name="source_name[{{ transaction.transaction_journal_id }}]"
-                                                        type="text"
-                                                        value="{% if transaction.destination_type != "Cash account" %}{{ transaction.source_name }}{% endif %}"
-                                                        class="form-control tt-input"
-                                                        spellcheck="false" dir="auto">
+                                                    autocomplete="off"
+                                                    placeholder="Source account"
+                                                    name="source_name[{{ transaction.transaction_journal_id }}]"
+                                                    type="text"
+                                                    value="{% if transaction.destination_type != "Cash account" %}{{ transaction.source_name }}{% endif %}"
+                                                    class="form-control tt-input"
+                                                    spellcheck="false" dir="auto">
                                             {% endif %}
 
                                         {% endif %}
@@ -206,13 +206,13 @@
                                                 {# if new source is Liability, destination must be expense account. #}
 
                                                 <input
-                                                        autocomplete="off"
-                                                        placeholder="Destination account"
-                                                        name="destination_name[{{ transaction.transaction_journal_id }}]"
-                                                        type="text"
-                                                        value="{% if transaction.source_type != "Cash account" %}{{ transaction.source_name }}{% endif %}"
-                                                        class="form-control tt-input"
-                                                        spellcheck="false" dir="auto">
+                                                    autocomplete="off"
+                                                    placeholder="Destination account"
+                                                    name="destination_name[{{ transaction.transaction_journal_id }}]"
+                                                    type="text"
+                                                    value="{% if transaction.source_type != "Cash account" %}{{ transaction.source_name }}{% endif %}"
+                                                    class="form-control tt-input"
+                                                    spellcheck="false" dir="auto">
                                             {% endif %}
                                         {% endif %}
 
@@ -237,13 +237,13 @@
                                                 transaction.source_type == 'Debt' or
                                                 transaction.source_type == 'Mortgage' %}
                                                 <input
-                                                        autocomplete="off"
-                                                        placeholder="Destination account"
-                                                        name="destination_name[{{ transaction.transaction_journal_id }}]"
-                                                        type="text"
-                                                        value="{% if transaction.source_type != "Cash account" %}{{ transaction.destination_name }}{% endif %}"
-                                                        class="form-control tt-input"
-                                                        spellcheck="false" dir="auto">
+                                                    autocomplete="off"
+                                                    placeholder="Destination account"
+                                                    name="destination_name[{{ transaction.transaction_journal_id }}]"
+                                                    type="text"
+                                                    value="{% if transaction.source_type != "Cash account" %}{{ transaction.destination_name }}{% endif %}"
+                                                    class="form-control tt-input"
+                                                    spellcheck="false" dir="auto">
                                             {% endif %}
                                         {% endif %}
 
diff --git a/resources/views/transactions/mass/edit.twig b/resources/views/transactions/mass/edit.twig
index 5dade42913..27d4a14cae 100644
--- a/resources/views/transactions/mass/edit.twig
+++ b/resources/views/transactions/mass/edit.twig
@@ -36,7 +36,7 @@
                                     <td>
                                         {# LINK TO EDIT FORM #}
                                         <a href="{{ route('transactions.edit', journal.transaction_group_id) }}" class="btn btn-xs btn-default"><span
-                                                    class="fa fa-fw fa-pencil"></span></a>
+                                                class="fa fa-fw fa-pencil"></span></a>
                                         <input type="hidden" name="journals[]" value="{{ journal.transaction_journal_id }}"/>
                                     </td>
                                     <td>