diff --git a/resources/views/auth/register.twig b/resources/views/auth/register.twig
index e627e6691d..fc3f7bf51b 100644
--- a/resources/views/auth/register.twig
+++ b/resources/views/auth/register.twig
@@ -26,7 +26,7 @@
             <input type="hidden" name="_token" value="{{ csrf_token() }}">
 
             <div class="form-group has-feedback">
-                <input type="email" name="email" value="{{ email }}"class="form-control" placeholder="Email"/>
+                <input type="email" name="email" value="{{ email }}" class="form-control" placeholder="Email"/>
                 {% if showDemoWarning %}
                     <p class="help-block">You will receive an email from Firefly III. If your email address
                         is incorrect, your account may not work.</p>
diff --git a/resources/views/list/journals-tasker.twig b/resources/views/list/journals-tasker.twig
index 0fc1fe5096..1af28d1a5d 100644
--- a/resources/views/list/journals-tasker.twig
+++ b/resources/views/list/journals-tasker.twig
@@ -59,8 +59,8 @@
                     {% else %}
                         {{ transaction.description }}
                     {% endif %}
-                    </a>
-                    {{ splitJournalIndicator(transaction.journal_id) }}
+                </a>
+                {{ splitJournalIndicator(transaction.journal_id) }}
 
                 {% if transaction.transactionJournal.attachments|length > 0 %}
                     <i class="fa fa-paperclip"
diff --git a/resources/views/list/journals-tiny-tasker.twig b/resources/views/list/journals-tiny-tasker.twig
index ec13494fc7..a8eae3298d 100644
--- a/resources/views/list/journals-tiny-tasker.twig
+++ b/resources/views/list/journals-tiny-tasker.twig
@@ -15,10 +15,10 @@
             {% endif %}
             <span class="pull-right small">
             <!-- format amount of transaction -->
-            {{ formatAmountWithCode(transaction.transaction_amount, transaction.transaction_currency_code) }}
-            <!-- and then amount of journal itself. -->
-            {{ optionalJournalAmount(transaction.journal_id, transaction.transaction_amount,
-            transaction.transaction_currency_code, transaction.transaction_type_type) }}
+                {{ formatAmountWithCode(transaction.transaction_amount, transaction.transaction_currency_code) }}
+                <!-- and then amount of journal itself. -->
+                {{ optionalJournalAmount(transaction.journal_id, transaction.transaction_amount,
+                transaction.transaction_currency_code, transaction.transaction_type_type) }}
         </span>
         </a>
     {% endfor %}
diff --git a/resources/views/partials/menu-sidebar.twig b/resources/views/partials/menu-sidebar.twig
index 983d7e1b3e..f1b45e4a37 100644
--- a/resources/views/partials/menu-sidebar.twig
+++ b/resources/views/partials/menu-sidebar.twig
@@ -130,7 +130,8 @@
     </li>
 
     <!-- options and preferences -->
-    <li id="option-menu" class="{{ activeRoutePartial('admin') }} {{ activeRoutePartial('profile') }} {{ activeRoutePartial('preferences') }} {{ activeRoutePartial('currency') }} treeview">
+    <li id="option-menu"
+        class="{{ activeRoutePartial('admin') }} {{ activeRoutePartial('profile') }} {{ activeRoutePartial('preferences') }} {{ activeRoutePartial('currency') }} treeview">
         <a href="#">
             <i class="fa fa-gears fa-fw"></i>
             <span>{{ 'options'|_ }}</span>
@@ -149,9 +150,10 @@
             </li>
             <!-- admin (if user admin) -->
             {% if Auth.user.hasRole('owner') %}
-            <li class="{{ activeRoutePartial('admin') }}">
-                <a class="{{ activeRoutePartial('admin') }}" href="{{ route('admin.index') }}"><i class="fa fa-hand-spock-o fa-fw"></i> {{ 'administration'|_ }}</a>
-            </li>
+                <li class="{{ activeRoutePartial('admin') }}">
+                    <a class="{{ activeRoutePartial('admin') }}" href="{{ route('admin.index') }}"><i
+                                class="fa fa-hand-spock-o fa-fw"></i> {{ 'administration'|_ }}</a>
+                </li>
             {% endif %}
         </ul>
 
diff --git a/resources/views/preferences/index.twig b/resources/views/preferences/index.twig
index 3b5ad89453..33a8534f55 100644
--- a/resources/views/preferences/index.twig
+++ b/resources/views/preferences/index.twig
@@ -73,14 +73,10 @@
                         {{ ExpandedForm.checkbox('tj[attachments]','1', tjOptionalFields.attachments,{ 'label' : 'pref_optional_tj_attachments'|_ }) }}
 
 
-
                     </div>
                 </div>
 
 
-
-
-
             </div>
             <div class="col-lg-6 col-md-6 col-sm-6">
                 <div class="box">
diff --git a/resources/views/reports/partials/journals-audit-tasker.twig b/resources/views/reports/partials/journals-audit-tasker.twig
index 2367727e70..50e9ed6a00 100644
--- a/resources/views/reports/partials/journals-audit-tasker.twig
+++ b/resources/views/reports/partials/journals-audit-tasker.twig
@@ -43,7 +43,8 @@
             <td class="hide-buttons">
                 <div class="btn-group btn-group-xs">
                     <a href="{{ route('transactions.edit',transaction.journal_id) }}" class="btn btn-xs btn-default"><i class="fa fa-fw fa-pencil"></i></a>
-                    <a href="{{ route('transactions.delete',transaction.journal_id) }}" class="btn btn-xs btn-danger"><i class="fa fa-fw fa-trash-o"></i></a></div>
+                    <a href="{{ route('transactions.delete',transaction.journal_id) }}" class="btn btn-xs btn-danger"><i class="fa fa-fw fa-trash-o"></i></a>
+                </div>
             </td>
             <td class="hide-icon">{{ transaction|typeIconTransaction }}</td>
 
@@ -141,7 +142,7 @@
                 {% if transaction.transactionJournal.hasMeta('notes') %}
                     {{ transaction.transactionJournal.getMeta('notes')|nl2br }}
                 {% endif %}
-                
+
             </td>
 
             <td class="hide-create_date">
diff --git a/resources/views/rules/index.twig b/resources/views/rules/index.twig
index 96b6597d01..5c0dee4ef9 100644
--- a/resources/views/rules/index.twig
+++ b/resources/views/rules/index.twig
@@ -104,10 +104,10 @@
                                                    class="btn btn-danger"><span
                                                             class="fa fa-fw fa-trash"></span></a>
                                             </div>
-                                            <br />
+                                            <br/>
                                             <div class="btn-group btn-group-xs">
                                                 <a href="{{ route('rules.rule-group.select_transactions',ruleGroup.id) }}" class="btn btn-default"
-                                                title=" {{ 'execute_on_existing_transactions_short'|_ }}">
+                                                   title=" {{ 'execute_on_existing_transactions_short'|_ }}">
                                                     <i class="fa fa-fw fa-check-circle"></i></a>
                                             </div>
 
diff --git a/resources/views/transactions/create.twig b/resources/views/transactions/create.twig
index 63cf400f2c..afa0b4b78c 100644
--- a/resources/views/transactions/create.twig
+++ b/resources/views/transactions/create.twig
@@ -93,16 +93,15 @@
                 not optionalFields.invoice_date or
                 not optionalFields.internal_reference or
                 not optionalFields.notes or
-                not optionalFields.attachments
-                %}
-                <p class="text-center text-success"><i class="fa fa-info-circle" aria-hidden="true"></i>  <em>{{ trans('firefly.hidden_fields_preferences', {link: route('preferences')})|raw }}</em></p>
+                not optionalFields.attachments %}
+                    <p class="text-center text-success"><i class="fa fa-info-circle" aria-hidden="true"></i>
+                        <em>{{ trans('firefly.hidden_fields_preferences', {link: route('preferences')})|raw }}</em></p>
                 {% endif %}
                 <!-- box for dates -->
                 {% if
-                    optionalFields.interest_date or optionalFields.book_date or optionalFields.process_date
-                    or optionalFields.due_date or optionalFields.payment_date
-                    or optionalFields.invoice_date
-                %}
+                optionalFields.interest_date or optionalFields.book_date or optionalFields.process_date
+                or optionalFields.due_date or optionalFields.payment_date
+                or optionalFields.invoice_date %}
                     <div class="box">
                         <div class="box-header with-border">
                             <h3 class="box-title">{{ 'optional_field_meta_dates'|_ }}</h3>
diff --git a/resources/views/transactions/edit.twig b/resources/views/transactions/edit.twig
index c13ff7bb31..03ed04c1ed 100644
--- a/resources/views/transactions/edit.twig
+++ b/resources/views/transactions/edit.twig
@@ -110,18 +110,17 @@
 
                 <!-- box for dates -->
                 {% if
-                    optionalFields.interest_date or
-                    optionalFields.book_date or
-                    optionalFields.process_date or
-                    optionalFields.due_date or
-                    optionalFields.payment_date or
-                    optionalFields.invoice_date or
-                    data.interest_date or
-                    data.book_date or
-                    data.process_date or
-                    data.due_date or
-                    data.payment_date
-                    %}
+                optionalFields.interest_date or
+                optionalFields.book_date or
+                optionalFields.process_date or
+                optionalFields.due_date or
+                optionalFields.payment_date or
+                optionalFields.invoice_date or
+                data.interest_date or
+                data.book_date or
+                data.process_date or
+                data.due_date or
+                data.payment_date %}
                     <div class="box">
                         <div class="box-header with-border">
                             <h3 class="box-title">{{ 'optional_field_meta_dates'|_ }}</h3>
@@ -163,15 +162,12 @@
                 {% endif %}
 
 
-
                 <!-- box for business fields -->
                 {% if
-                    optionalFields.internal_reference or
-                    optionalFields.notes or
-                    data['interal_reference'] or
-                    data['notes']
-
-                %}
+                optionalFields.internal_reference or
+                optionalFields.notes or
+                data['interal_reference'] or
+                data['notes'] %}
                     <div class="box">
                         <div class="box-header with-border">
                             <h3 class="box-title">{{ 'optional_field_meta_business'|_ }}</h3>