diff --git a/resources/views/accounts/edit.twig b/resources/views/accounts/edit.twig
index 96f13de5a3..b793c6b9d7 100644
--- a/resources/views/accounts/edit.twig
+++ b/resources/views/accounts/edit.twig
@@ -53,7 +53,7 @@
                 </div>
             </div>
 
-            <!-- panel for credit card options -->
+            {# panel for credit card options #}
             {% if preFilled.accountRole == 'ccAsset' %}
                 <div class="box">
                     <div class="box-header with-border">
@@ -66,7 +66,7 @@
                 </div>
             {% endif %}
 
-            <!-- panel for options  -->
+            {# panel for options  #}
             <div class="box">
                 <div class="box-header with-border">
                     <h3 class="box-title">{{ 'options'|_ }}</h3>
diff --git a/resources/views/accounts/reconcile/edit.twig b/resources/views/accounts/reconcile/edit.twig
index 8eac4a85e4..8c053c04c1 100644
--- a/resources/views/accounts/reconcile/edit.twig
+++ b/resources/views/accounts/reconcile/edit.twig
@@ -50,15 +50,15 @@
                         <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
                     </div>
                     <div class="box-body">
-                        <!-- CATEGORY ALWAYS -->
+                        {# category always #}
                         {{ ExpandedForm.text('category',data['category']) }}
 
-                        <!-- TAGS -->
+                        {# tags #}
                         {{ ExpandedForm.text('tags') }}
                     </div>
                 </div>
 
-                <!-- box for attachments -->
+                {# box for attachments #}
                 {% if optionalFields.attachments %}
                     <div class="box">
                         <div class="box-header with-border">
@@ -66,14 +66,14 @@
                         </div>
                         <div class="box-body">
                             {% if optionalFields.attachments %}
-                                <!-- ATTACHMENTS -->
+                                {# attachments #}
                                 {{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
                             {% endif %}
                         </div>
                     </div>
                 {% endif %}
 
-                <!-- panel for options -->
+                {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
                         <h3 class="box-title">{{ 'options'|_ }}</h3>
diff --git a/resources/views/admin/configuration/index.twig b/resources/views/admin/configuration/index.twig
index f04b387783..d950ee5989 100644
--- a/resources/views/admin/configuration/index.twig
+++ b/resources/views/admin/configuration/index.twig
@@ -40,8 +40,8 @@
                 </div>
             </div>
 
-            <!-- configuration setting block -->
-            <!--
+            {# block for config setting #}
+            {#
             <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
                 <div class="box box-default">
                     <div class="box-header with-border">
@@ -54,7 +54,7 @@
                     </div>
                 </div>
             </div>
-            -->
+            #}
         </div>
         <div class="row">
             <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
diff --git a/resources/views/admin/link/create.twig b/resources/views/admin/link/create.twig
index 83d7fe947c..45272d6079 100644
--- a/resources/views/admin/link/create.twig
+++ b/resources/views/admin/link/create.twig
@@ -22,7 +22,7 @@
                 </div>
             </div>
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-                <!-- panel for options -->
+                {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
                         <h3 class="box-title">{{ 'options'|_ }}</h3>
diff --git a/resources/views/admin/link/edit.twig b/resources/views/admin/link/edit.twig
index 80b7833500..560c69188b 100644
--- a/resources/views/admin/link/edit.twig
+++ b/resources/views/admin/link/edit.twig
@@ -24,7 +24,7 @@
         </div>
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
 
-            <!-- panel for options  -->
+            {# panel for options #}
             <div class="box">
                 <div class="box-header with-border">
                     <h3 class="box-title">{{ 'options'|_ }}</h3>
diff --git a/resources/views/admin/users/edit.twig b/resources/views/admin/users/edit.twig
index 510bc5ffd1..bd4834c61e 100644
--- a/resources/views/admin/users/edit.twig
+++ b/resources/views/admin/users/edit.twig
@@ -27,7 +27,7 @@
             </div>
         </div>
         <div class="col-lg-6 col-md-6 col-sm-12">
-            <!-- panel for options  -->
+            {# panel for options #}
             <div class="box">
                 <div class="box-header with-border">
                     <h3 class="box-title">{{ 'options'|_ }}</h3>
diff --git a/resources/views/admin/users/show.twig b/resources/views/admin/users/show.twig
index a881d96da1..0479a8cc0e 100644
--- a/resources/views/admin/users/show.twig
+++ b/resources/views/admin/users/show.twig
@@ -99,13 +99,11 @@
                         </tr>
                         <tr>
                             <td>{{ trans('list.export_jobs_count') }}</td>
-                            <td>{{ information.export_jobs }}, {{ trans('firefly.successful_count', {count: information.export_jobs_success}) }}
-                                <!-- of which x successful --></td>
+                            <td>{{ information.export_jobs }}, {{ trans('firefly.successful_count', {count: information.export_jobs_success}) }}</td>
                         </tr>
                         <tr>
                             <td>{{ trans('list.import_jobs_count') }}</td>
-                            <td>{{ information.import_jobs }}, {{ trans('firefly.successful_count', {count: information.import_jobs_success}) }}
-                                <!-- of which x successful --></td>
+                            <td>{{ information.import_jobs }}, {{ trans('firefly.successful_count', {count: information.import_jobs_success}) }}</td>
                         </tr>
                         <tr>
                             <td>{{ trans('list.budget_count') }}</td>
diff --git a/resources/views/attachments/edit.twig b/resources/views/attachments/edit.twig
index deed7522de..affb40ef0f 100644
--- a/resources/views/attachments/edit.twig
+++ b/resources/views/attachments/edit.twig
@@ -37,7 +37,7 @@
                     </div>
                 </div>
 
-                <!-- panel for options  -->
+                {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
                         <h3 class="box-title">{{ 'options'|_ }}</h3>
diff --git a/resources/views/auth/login.twig b/resources/views/auth/login.twig
index 37493ba6ca..8d0ee18c90 100644
--- a/resources/views/auth/login.twig
+++ b/resources/views/auth/login.twig
@@ -67,11 +67,9 @@
                         </label>
                     </div>
                 </div>
-                <!-- /.col -->
                 <div class="col-xs-4">
                     <button type="submit" class="btn btn-primary btn-block btn-flat">{{ 'sign_in'|_ }}</button>
                 </div>
-                <!-- /.col -->
             </div>
         </form>
         {% if allowRegistration %}
@@ -79,6 +77,5 @@
         {% endif %}
         <a href="{{ URL.to('/password/reset') }}">{{ 'forgot_my_password'|_ }}</a>
     </div>
-    <!-- /.login-box-body -->
 {% endblock %}
 
diff --git a/resources/views/auth/passwords/email.twig b/resources/views/auth/passwords/email.twig
index 4695a05f4a..7d639bf189 100644
--- a/resources/views/auth/passwords/email.twig
+++ b/resources/views/auth/passwords/email.twig
@@ -38,11 +38,9 @@
                 </div>
 
                 <div class="row">
-                    <!-- /.col -->
                     <div class="col-xs-12">
                         <button type="submit" class="btn btn-primary btn-flat pull-right">{{ 'reset_button'|_ }}</button>
                     </div>
-                    <!-- /.col -->
                 </div>
 
             </form>
@@ -53,6 +51,6 @@
             <a href="{{ route('register') }}" class="text-center">{{ 'register_new_account'|_ }}</a><br>
         {% endif %}
 
-    </div><!-- /.login-box-body -->
+    </div>
 
 {% endblock %}
diff --git a/resources/views/auth/passwords/reset.twig b/resources/views/auth/passwords/reset.twig
index b56e40189d..f49e6aabd5 100644
--- a/resources/views/auth/passwords/reset.twig
+++ b/resources/views/auth/passwords/reset.twig
@@ -36,7 +36,6 @@
                 <div class="col-xs-12">
                     <button type="submit" class="btn btn-primary pull-right btn-flat">{{ 'button_reset_password'|_ }}</button>
                 </div>
-                <!-- /.col -->
             </div>
 
         </form>
@@ -45,6 +44,6 @@
         {% if allowRegistration %}
             <a href="{{ route('register') }}" class="text-center">{{ 'register_new_account'|_ }}</a><br>
         {% endif %}
-    </div><!-- /.form-box -->
+    </div>
 
 {% endblock %}
diff --git a/resources/views/auth/register.twig b/resources/views/auth/register.twig
index 995251d982..f6c76ce3ec 100644
--- a/resources/views/auth/register.twig
+++ b/resources/views/auth/register.twig
@@ -42,13 +42,12 @@
                 <div class="col-xs-4">
                     <button class="btn btn-primary pull-right btn-flat">{{ 'button_register'|_ }}</button>
                 </div>
-                <!-- /.col -->
             </div>
         </form>
 
         <a href="{{ URL.to('/login') }}">{{ 'want_to_login'|_ }}</a><br>
         <a href="{{ URL.to('/password/reset') }}">{{ 'forgot_my_password'|_ }}</a>
-    </div><!-- /.form-box -->
+    </div>
 
     {% include 'partials.password-modal' %}
 
diff --git a/resources/views/auth/two-factor.twig b/resources/views/auth/two-factor.twig
index a02c30bf56..73fd2998ae 100644
--- a/resources/views/auth/two-factor.twig
+++ b/resources/views/auth/two-factor.twig
@@ -26,15 +26,12 @@
             </div>
 
             <div class="row">
-                <!-- /.col -->
                 <div class="col-xs-6 col-xs-offset-6">
                     <button type="submit" class="btn btn-primary btn-block btn-flat">{{ 'authenticate'|_ }}</button>
                 </div>
-                <!-- /.col -->
             </div>
         </form>
         <a href="{{ route('two-factor.lost') }}">{{ 'two_factor_forgot'|_ }}</a>
     </div>
-    <!-- /.login-box-body -->
 {% endblock %}
 
diff --git a/resources/views/bills/create.twig b/resources/views/bills/create.twig
index 08bc14a318..c7e485ef5b 100644
--- a/resources/views/bills/create.twig
+++ b/resources/views/bills/create.twig
@@ -41,7 +41,7 @@
                     </div>
                 </div>
 
-                <!-- panel for options -->
+                {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
                         <h3 class="box-title">{{ 'options'|_ }}</h3>
diff --git a/resources/views/budgets/create.twig b/resources/views/budgets/create.twig
index 4243a15087..3d6b429805 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 options -->
+                {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
                         <h3 class="box-title">{{ 'options'|_ }}</h3>
diff --git a/resources/views/budgets/edit.twig b/resources/views/budgets/edit.twig
index 5054c47264..eeaf34244e 100644
--- a/resources/views/budgets/edit.twig
+++ b/resources/views/budgets/edit.twig
@@ -21,7 +21,7 @@
 
         </div>
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-            <!-- panel for options -->
+            {# panel for options #}
             <div class="box">
                 <div class="box-header with-border">
                     <h3 class="box-title">{{ 'options'|_ }}</h3>
diff --git a/resources/views/budgets/show.twig b/resources/views/budgets/show.twig
index 4a697a3c6e..21cf15aff2 100644
--- a/resources/views/budgets/show.twig
+++ b/resources/views/budgets/show.twig
@@ -127,7 +127,7 @@
                                         {% 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 -->
+                                            {% 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"
@@ -136,7 +136,7 @@
                                                      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 -->
+                                            {% 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"
diff --git a/resources/views/categories/create.twig b/resources/views/categories/create.twig
index b5c8f65aa3..eda7c8f04c 100644
--- a/resources/views/categories/create.twig
+++ b/resources/views/categories/create.twig
@@ -22,7 +22,7 @@
 
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
 
-                <!-- panel for options -->
+                {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
                         <h3 class="box-title">{{ 'options'|_ }}</h3>
diff --git a/resources/views/categories/edit.twig b/resources/views/categories/edit.twig
index f31c402fe0..9c912d9eeb 100644
--- a/resources/views/categories/edit.twig
+++ b/resources/views/categories/edit.twig
@@ -22,7 +22,7 @@
         <div class="col-lg-6 col-md-6 col-sm-12">
 
 
-            <!-- panel for options -->
+            {# panel for options #}
             <div class="box">
                 <div class="box-header with-border">
                     <h3 class="box-title">{{ 'options'|_ }}</h3>
diff --git a/resources/views/currencies/create.twig b/resources/views/currencies/create.twig
index be786ad691..2524659508 100644
--- a/resources/views/currencies/create.twig
+++ b/resources/views/currencies/create.twig
@@ -25,7 +25,7 @@
 
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
 
-                <!-- panel for options -->
+                {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
                         <h3 class="box-title">{{ 'options'|_ }}</h3>
diff --git a/resources/views/currencies/edit.twig b/resources/views/currencies/edit.twig
index a9c4c582e3..187375a45b 100644
--- a/resources/views/currencies/edit.twig
+++ b/resources/views/currencies/edit.twig
@@ -25,7 +25,7 @@
 
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
 
-            <!-- panel for options -->
+            {# panel for options #}
             <div class="box">
                 <div class="box-header with-border">
                     <h3 class="box-title">{{ 'options'|_ }}</h3>
diff --git a/resources/views/debug.twig b/resources/views/debug.twig
index 6ac2180e5e..2200e27f0e 100644
--- a/resources/views/debug.twig
+++ b/resources/views/debug.twig
@@ -6,7 +6,7 @@
 
 <p style="font-family:Arial, Arial, Helvetica, sans-serif;font-size:12pt;width:600px;">
     If you are running into problems, you can use the information in this box as debug information. Please copy-and-paste into a new
-    or existing <a href="https://github.com/firefly-iii/firefly-iii/issues">Github issue</a>. It will generate a beautiful table that can
+    or existing <a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub issue</a>. It will generate a beautiful table that can
     be used to quickly diagnose your problem.
 </p>
 <textarea rows="30" cols="100" name="debug_info" style="font-family:Menlo, Monaco, Consolas, monospace;font-size:8pt;">
@@ -43,7 +43,7 @@ Debug information generated at {{ now }} for Firefly III version **{{ FF_VERSION
 
 <p style="font-family:Arial, Arial, Helvetica, sans-serif;font-size:12pt;width:600px;color:#a00;">
     You may also share the content of the box below. You can also copy-and-paste this into a new
-    or existing <a href="https://github.com/firefly-iii/firefly-iii/issues">Github issue</a>. However, the content of this
+    or existing <a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub issue</a>. However, the content of this
     box may contain private information such as account names, transaction details or email addresses.
 </p>
 
diff --git a/resources/views/emails/error-html.twig b/resources/views/emails/error-html.twig
index 1fe56d6b7e..f3126c63e5 100644
--- a/resources/views/emails/error-html.twig
+++ b/resources/views/emails/error-html.twig
@@ -34,7 +34,7 @@
     This can help fix the bug you just encountered.
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    If you prefer, you can also open a new issue on <a href="https://github.com/firefly-iii/firefly-iii/issues">Github</a>.
+    If you prefer, you can also open a new issue on <a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub</a>.
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
diff --git a/resources/views/error.twig b/resources/views/error.twig
index 9f9adc7801..ec415e2296 100644
--- a/resources/views/error.twig
+++ b/resources/views/error.twig
@@ -18,7 +18,7 @@
         <div class="col-lg-12 col-md-12 col-sm-12">
             <p>
                 If you do not know how to handle this error, please open an issue on
-                <a href="https://github.com/firefly-iii/firefly-iii/issues">Github</a>
+                <a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub</a>
                 or <a href="mailto:thegrumpydictator@gmail.com">send me a message</a>.
             </p>
         </div>
diff --git a/resources/views/errors/404.twig b/resources/views/errors/404.twig
index 65d7a60e8f..d30f3eeae5 100644
--- a/resources/views/errors/404.twig
+++ b/resources/views/errors/404.twig
@@ -30,8 +30,6 @@
             <p class="text-danger">
                 The page you have requested does not exist. Please check that you have not entered
                 the wrong URL. Did you make a typo perhaps?
-
-                <!-- {{ Request.url() }} -->
             </p>
         </div>
     </div>
@@ -39,7 +37,7 @@
         <div class="col-lg-12 col-md-12 col-sm-12">
             <p>
                 If you are sure this page should exist, please open a ticket on
-                <strong><a href="https://github.com/firefly-iii/firefly-iii/issues">Github</a></strong>.
+                <strong><a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub</a></strong>.
             </p>
         </div>
     </div>
diff --git a/resources/views/errors/FireflyException.twig b/resources/views/errors/FireflyException.twig
index b28718ef32..0a63831817 100644
--- a/resources/views/errors/FireflyException.twig
+++ b/resources/views/errors/FireflyException.twig
@@ -47,7 +47,7 @@
                 </p>
                 <p>
                     If you cannot find the cause of this error or when you need some help, please open a ticket on
-                    <strong><a href="https://github.com/firefly-iii/firefly-iii/issues">Github</a></strong>.
+                    <strong><a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub</a></strong>.
                 </p>
             </div>
         </div>
diff --git a/resources/views/export/index.twig b/resources/views/export/index.twig
index 1be34b8667..a772feb710 100644
--- a/resources/views/export/index.twig
+++ b/resources/views/export/index.twig
@@ -49,7 +49,7 @@
 
                                     {{ ExpandedForm.date('export_end_range', today) }}
 
-                                    <!-- EXPORT FORMATS -->
+                                    {# EXPORT FORMATS #}
                                     <div class="form-group">
                                         <label for="exportFormat" class="col-sm-4 control-label">{{ 'export_format'|_ }}</label>
 
@@ -73,7 +73,7 @@
                                     </div>
 
 
-                                    <!-- ACCOUNTS -->
+                                    {# ACCOUNTS #}
                                     {{ ExpandedForm.multiCheckbox('accounts',accountList, checked, {' class': 'account-checkbox'}) }}
 
                                     {{ ExpandedForm.checkbox('include_attachments','1', true) }}
diff --git a/resources/views/import/spectre/accounts.twig b/resources/views/import/spectre/accounts.twig
index 3868cff0c7..e2c13db3e6 100644
--- a/resources/views/import/spectre/accounts.twig
+++ b/resources/views/import/spectre/accounts.twig
@@ -39,10 +39,10 @@
                                                 {{ account.nature|capitalize }} "<strong>{{ account.name }}</strong>" ({{ formatAmountBySymbol(account.balance, account.currency_code~' ') }})<br />
                                                 {% for name, value in account.extra %}
                                                     {% if not value is iterable and name != 'sort_code' and name !='current_date' and name != 'available_amount' and name !='current_time' and name != 'last_posted_transaction_id' %}
-                                                        {{ name|capitalize }}: {{ value }}<br />
+                                                        {{ trans('import.spectre_extra_key_'~name) }}: {{ value }}<br />
                                                     {% endif %}
                                                     {% if name == 'available_amount' %}
-                                                        Available amount: {{ formatAmountBySymbol(value, account.currency_code~' ') }}
+                                                        {{ trans('import.spectre_extra_key_'~name) }}: {{ formatAmountBySymbol(value, account.currency_code~' ') }}
                                                     {% endif %}
                                                 {% endfor %}
                                             </td>
diff --git a/resources/views/import/spectre/redirect.twig b/resources/views/import/spectre/redirect.twig
index e76c8b4bdb..e592f10170 100644
--- a/resources/views/import/spectre/redirect.twig
+++ b/resources/views/import/spectre/redirect.twig
@@ -9,7 +9,6 @@
     <title>Page Redirection</title>
 </head>
 <body>
-<!-- Note: don't tell people to `click` the link, just tell them that it is a link. -->
 If you are not redirected automatically, follow this <a href='{{ data['token-url'] }}'>link to Spectre.</a>.
 </body>
 </html>#}
\ No newline at end of file
diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig
index 683f1b5c9a..4d6ac23ce9 100644
--- a/resources/views/layout/default.twig
+++ b/resources/views/layout/default.twig
@@ -48,19 +48,16 @@
 
         {# Logo #}
         <a href="{{ route('index') }}" class="logo">
-            <!-- mini logo for sidebar mini 50x50 pixels -->
+            {# mini logo for sidebar mini 50x50 pixels #}
             <span class="logo-mini">FF</span>
-            <!-- logo for regular state and mobile devices -->
+            {# logo for regular state and mobile devices #}
             <span class="logo-lg"><b>Firefly</b>III</span>
         </a>
 
-        <!-- Header Navbar: style can be found in header.less -->
         <nav class="navbar navbar-static-top" role="navigation">
-            <!-- Sidebar toggle button-->
             <a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
                 <span class="sr-only">{{ 'toggleNavigation'|_ }}</span>
             </a>
-            <!-- Navbar Right Menu -->
             <div class="navbar-custom-menu">
                 <ul class="nav navbar-nav">
 
@@ -70,7 +67,6 @@
                         </a>
                     </li>
 
-                    <!-- Messages: style can be found in dropdown.less-->
                     <li>
                         <span style="color:#fff;padding: 15px;display: block;line-height: 20px;">
                             <span id="daterange"></span>
@@ -92,11 +88,8 @@
 
         </nav>
     </header>
-    <!-- Left side column. contains the logo and sidebar -->
     <aside class="main-sidebar">
-        <!-- sidebar: style can be found in sidebar.less -->
         <section class="sidebar">
-            <!-- search form -->
             <form action="{{ route('search.index') }}" method="get" class="sidebar-form">
                 <div class="input-group">
                     <input type="text" name="q" class="form-control" placeholder="{{ 'searchPlaceholder'|_ }}" value="{{ query }}"/>
@@ -105,22 +98,16 @@
               </span>
                 </div>
             </form>
-            <!-- /.search form -->
-            <!-- sidebar menu: : style can be found in sidebar.less -->
             {% include('partials.menu-sidebar') %}
         </section>
-        <!-- /.sidebar -->
     </aside>
 
-    <!-- Content Wrapper. Contains page content -->
     <div class="content-wrapper">
-        <!-- Content Header (Page header) -->
         <section class="content-header">
             {% include('partials.page-header') %}
             {% block breadcrumbs %}{% endblock %}
         </section>
 
-        <!-- Main content -->
         <section class="content">
             {% if IS_DEMO_SITE %}
                 <div class="row no-print">
@@ -134,13 +121,9 @@
 
             {% include('partials.flashes') %}
 
-            <!-- actual content -->
             {% block content %}{% endblock %}
         </section>
-        <!-- /.content -->
     </div>
-    <!-- /.content-wrapper -->
-
     <footer class="main-footer">
         <div class="pull-right hidden-xs">
             <b>{{ 'version'|_ }}</b> <a href="{{ route('debug') }}">{{ Config.get('firefly.version') }}</a>
@@ -151,10 +134,6 @@
     {% include('partials.control-bar') %}
 
 </div>
-<!-- ./wrapper -->
-
-
-<!-- Modal -->
 <div class="modal fade" id="defaultModal" tabindex="-1" role="dialog">
 </div>
 
diff --git a/resources/views/layout/empty.twig b/resources/views/layout/empty.twig
index f96c8615d1..4159301c11 100644
--- a/resources/views/layout/empty.twig
+++ b/resources/views/layout/empty.twig
@@ -27,7 +27,6 @@
     </div>
     {% block content %}{% endblock %}
 </div>
-<!-- /.login-box -->
 <script type="text/javascript" src="js/lib/jquery-3.2.1.min.js?v={{ FF_VERSION }}"></script>
 <script type="text/javascript" src="lib/bootstrap/js/bootstrap.min.js?v={{ FF_VERSION }}"></script>
 
diff --git a/resources/views/layout/guest.twig b/resources/views/layout/guest.twig
index 3742c6d910..19422c543a 100644
--- a/resources/views/layout/guest.twig
+++ b/resources/views/layout/guest.twig
@@ -37,7 +37,6 @@
     </div>
     {% block content %}{% endblock %}
 </div>
-<!-- /.login-box -->
 <script type="text/javascript" src="js/lib/jquery-3.2.1.min.js?v={{ FF_VERSION }}"></script>
 <script type="text/javascript" src="lib/bootstrap/js/bootstrap.min.js?v={{ FF_VERSION }}"></script>
 <script type="text/javascript" src="js/ff/guest.js?v={{ FF_VERSION }}"></script>
diff --git a/resources/views/list/bills.twig b/resources/views/list/bills.twig
index e4e8f6afc8..57c972cf71 100644
--- a/resources/views/list/bills.twig
+++ b/resources/views/list/bills.twig
@@ -47,14 +47,6 @@
                 </span>
             </td>
 
-            <!--
-            Some debug data:
-            entry.paidDates.count(): {{ entry.paidDates.count() }}
-            entry.paidDates set:
-            entry.payDates.count(): {{ entry.payDates.count() }}
-            active: {% if entry.active %}true{% else %}false{% endif %}
-            -->
-
             {#
             paidDates = 0 (bill not paid in period)
             payDates  = 0 (bill not expected to be paid in this period)
diff --git a/resources/views/partials/control-bar.twig b/resources/views/partials/control-bar.twig
index 813549c0aa..78f55615ac 100644
--- a/resources/views/partials/control-bar.twig
+++ b/resources/views/partials/control-bar.twig
@@ -1,8 +1,5 @@
-<!-- Control Sidebar -->
 <aside class="control-sidebar control-sidebar-dark">
-    <!-- Tab panes -->
     <div class="tab-content">
-        <!-- Home tab content -->
         <div class="tab-panel active" id="control-sidebar-home-tab">
             <h3 class="control-sidebar-heading">{{ 'create_new_stuff'|_ }}</h3>
             <ul class='control-sidebar-menu'>
@@ -101,12 +98,8 @@
                 </li>
 
             </ul>
-            <!-- /.control-sidebar-menu -->
 
         </div>
-        <!-- /.tab-pane -->
     </div>
-</aside><!-- /.control-sidebar -->
-<!-- Add the sidebar's background. This div must be placed
-     immediately after the control sidebar -->
+</aside>
 <div class='control-sidebar-bg'></div>
diff --git a/resources/views/partials/menu-sidebar.twig b/resources/views/partials/menu-sidebar.twig
index 205a887c99..a489fc7a53 100644
--- a/resources/views/partials/menu-sidebar.twig
+++ b/resources/views/partials/menu-sidebar.twig
@@ -1,10 +1,8 @@
 <ul class="sidebar-menu">
-    <!-- home / dashboard -->
     <li class="{{ activeRouteStrict('index') }} treeview">
         <a href="{{ route('index') }}"><i class="fa fa-dashboard fa-fw"></i>
             <span>{{ 'dashboard'|_ }}</span></a>
     </li>
-    <!-- accounts -->
     <li class="{{ activeRoutePartial('accounts') }} treeview" id="account-menu">
         <a href="#">
             <i class="fa fa-credit-card fa-fw"></i>
@@ -13,7 +11,6 @@
               <i class="fa fa-angle-left pull-right"></i>
             </span>
         </a>
-        <!-- submenu for accounts -->
         <ul class="treeview-menu">
             <li class="{{ activeRoutePartialWhat('accounts', 'asset') }}">
                 <a href="{{ route('accounts.index','asset') }}">
@@ -32,37 +29,30 @@
             </li>
         </ul>
     </li>
-    <!-- budgets-->
     <li class="{{ activeRoutePartial('budgets') }}" id="budget-menu">
         <a href="{{ route('budgets.index') }}">
             <i class="fa fa-tasks fa-fw"></i>
             <span>{{ 'budgets'|_ }}</span>
         </a>
     </li>
-    <!-- categories -->
     <li class="{{ activeRoutePartial('categories') }}">
         <a href="{{ route('categories.index') }}">
             <i class="fa fa-bar-chart fa-fw"></i>
             <span>{{ 'categories'|_ }}</span>
         </a>
     </li>
-    <!-- tags -->
     <li class="{{ activeRoutePartial('tags') }}">
         <a href="{{ route('tags.index') }}">
             <i class="fa fa-tags fa-fw"></i>
             <span>{{ 'tags'|_ }}</span>
         </a>
     </li>
-
-    <!-- reports -->
     <li class="{{ activeRoutePartial('reports') }}" id="report-menu">
         <a href="{{ route('reports.index') }}">
             <i class="fa fa-line-chart fa-fw"></i>
             <span>{{ 'reports'|_ }}</span>
         </a>
     </li>
-
-    <!-- transactions -->
     <li class="{{ activeRoutePartial('transactions') }} treeview" id="transaction-menu">
         <a href="#">
             <i class="fa fa-repeat"></i>
@@ -87,7 +77,6 @@
         </ul>
 
     </li>
-    <!-- money management -->
     <li class="{{ activeRoutePartial('bills') }} {{ activeRoutePartial('piggy-banks') }} {{ activeRoutePartial('rules') }} treeview">
         <a href="#">
             <i class="fa fa-euro fa-fw"></i>
@@ -112,8 +101,6 @@
         </ul>
 
     </li>
-
-    <!-- import and export  -->
     <li class="{{ activeRoutePartial('export') }} {{ activeRoutePartial('import') }} treeview">
         <a href="#">
             <i class="fa fa-arrows-alt fa-fw"></i>
@@ -134,9 +121,6 @@
         </ul>
 
     </li>
-
-    <!-- options and preferences -->
-
     <li id="option-menu"
         class="{{ activeRoutePartial('admin') }} {{ activeRoutePartial('profile') }} {{ activeRoutePartial('preferences') }} {{ activeRoutePartial('currencies') }} treeview">
         <a href="#">
@@ -162,7 +146,6 @@
                 <a class="{{ activeRoutePartial('currencies') }}" href="{{ route('currencies.index') }}"><i class="fa fa-usd fa-fw"></i> {{ 'currencies'|_ }}
                 </a>
             </li>
-            <!-- admin (if user admin) -->
             {% if Auth.user.hasRole('owner') %}
                 <li class="{{ activeRoutePartial('admin') }}">
                     <a class="{{ activeRoutePartial('admin') }}" href="{{ route('admin.index') }}"><i
@@ -173,9 +156,6 @@
 
 
     </li>
-
-
-    <!-- other options -->
     {% if not SANDSTORM %}
         <li>
             <a href="{{ route('logout') }}">
diff --git a/resources/views/partials/password-modal.twig b/resources/views/partials/password-modal.twig
index 9aa7be78d8..8237612199 100644
--- a/resources/views/partials/password-modal.twig
+++ b/resources/views/partials/password-modal.twig
@@ -1,4 +1,3 @@
-<!-- Modal -->
 <div class="modal fade" id="passwordModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
diff --git a/resources/views/piggy-banks/create.twig b/resources/views/piggy-banks/create.twig
index ce1ccd340c..439177c5d7 100644
--- a/resources/views/piggy-banks/create.twig
+++ b/resources/views/piggy-banks/create.twig
@@ -35,7 +35,7 @@
                     </div>
                 </div>
 
-                <!-- panel for options -->
+                {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
                         <h3 class="box-title">{{ 'options'|_ }}</h3>
diff --git a/resources/views/piggy-banks/edit.twig b/resources/views/piggy-banks/edit.twig
index cf9b37cc41..54dbb62500 100644
--- a/resources/views/piggy-banks/edit.twig
+++ b/resources/views/piggy-banks/edit.twig
@@ -38,7 +38,7 @@
                 </div>
             </div>
 
-            <!-- panel for options -->
+            {# panel for options #}
             <div class="box">
                 <div class="box-header with-border">
                     <h3 class="box-title">{{ 'options'|_ }}</h3>
diff --git a/resources/views/popup/list/journals.twig b/resources/views/popup/list/journals.twig
index 3c2e74077a..599eb9d810 100644
--- a/resources/views/popup/list/journals.twig
+++ b/resources/views/popup/list/journals.twig
@@ -26,9 +26,8 @@
     {# Make sum: #}
     {% set sum = 0 %}
     {% for transaction in journals %}
-        <!-- add to sum
+        {# add to sum #}
         {% set sum = (sum + transaction.transaction_amount) %}
-        -->
         <tr class="drag" data-date="{{ transaction.date.format('Y-m-d') }}" data-id="{{ transaction.journal_id }}">
             <td class="hidden-xs">
                 {{ transaction|transactionIcon }}
diff --git a/resources/views/popup/report/balance-amount.twig b/resources/views/popup/report/balance-amount.twig
index fcd9b9ec00..8301c7fa71 100644
--- a/resources/views/popup/report/balance-amount.twig
+++ b/resources/views/popup/report/balance-amount.twig
@@ -1,4 +1,3 @@
-<!-- Modal dialog to show balance amount -->
 <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
         <div class="modal-header">
diff --git a/resources/views/popup/report/budget-spent-amount.twig b/resources/views/popup/report/budget-spent-amount.twig
index 0817e533d7..fa88bae9ae 100644
--- a/resources/views/popup/report/budget-spent-amount.twig
+++ b/resources/views/popup/report/budget-spent-amount.twig
@@ -1,4 +1,3 @@
-<!-- Modal dialog to show budget expenses -->
 <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
         <div class="modal-header">
diff --git a/resources/views/popup/report/category-entry.twig b/resources/views/popup/report/category-entry.twig
index e3371f439f..0539cedc55 100644
--- a/resources/views/popup/report/category-entry.twig
+++ b/resources/views/popup/report/category-entry.twig
@@ -1,4 +1,3 @@
-<!-- Modal dialog to show category expenses -->
 <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
         <div class="modal-header">
diff --git a/resources/views/popup/report/expense-entry.twig b/resources/views/popup/report/expense-entry.twig
index e2d660dbe5..205613cffc 100644
--- a/resources/views/popup/report/expense-entry.twig
+++ b/resources/views/popup/report/expense-entry.twig
@@ -1,4 +1,3 @@
-<!-- Modal dialog to show expenses to an account -->
 <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
         <div class="modal-header">
diff --git a/resources/views/popup/report/income-entry.twig b/resources/views/popup/report/income-entry.twig
index 4d5d637a0d..5161c585b9 100644
--- a/resources/views/popup/report/income-entry.twig
+++ b/resources/views/popup/report/income-entry.twig
@@ -1,4 +1,3 @@
-<!-- Modal dialog to show incomes to an account -->
 <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
         <div class="modal-header">
diff --git a/resources/views/preferences/index.twig b/resources/views/preferences/index.twig
index dca354f584..69e4f9995c 100644
--- a/resources/views/preferences/index.twig
+++ b/resources/views/preferences/index.twig
@@ -10,7 +10,7 @@
 
         <div class="row">
             <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
-                <!-- start of preferences tabs -->
+                {# start of preferences tabs #}
                 <div class="nav-tabs-custom">
                     <ul class="nav nav-tabs">
                         <li class="active"><a href="#general" data-toggle="tab" aria-expanded="true">{{ 'preferences_general'|_ }}</a></li>
@@ -20,9 +20,9 @@
                     </ul>
                     <div class="tab-content">
                         <div class="tab-pane active" id="general">
-                            <!-- general settings here -->
+                            {# general settings here #}
                             <div class="row">
-                                <!-- general settings column A -->
+                                {# general settings column A #}
                                 <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                                     {# language #}
                                     <div class="preferences-box">
@@ -47,7 +47,7 @@
                                         </p>
                                     </div>
 
-                                    <!-- fiscal year -->
+                                    {# fiscal year #}
                                     <div class="preferences-box">
                                         <h3>{{ 'pref_custom_fiscal_year'|_ }}</h3>
                                         <p class="text-info">
@@ -59,10 +59,10 @@
                                     </div>
                                 </div>
 
-                                <!-- general settings column B -->
+                                {# general settings column B #}
                                 <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
 
-                                    <!-- transaction preferences -->
+                                    {# transaction preferences #}
                                     <div class="preferences-box">
                                         <h3>{{ 'pref_optional_fields_transaction'|_ }}</h3>
                                         <p class="text-info">
@@ -87,9 +87,9 @@
                             </div>
                         </div>
                         <div class="tab-pane" id="frontpage">
-                            <!-- frontpage settings here -->
+                            {# frontpage settings here #}
                             <div class="row">
-                                <!-- frontpage settings column a -->
+                                {# frontpage settings column a #}
                                 <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                                     <div class="preferences-box">
                                         <h3>{{ 'pref_home_screen_accounts'|_ }}</h3>
@@ -113,9 +113,9 @@
                                         {% endfor %}
                                     </div>
                                 </div>
-                                <!-- frontpage settings column b -->
+                                {# frontpage settings column b #}
                                 <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-                                    <!-- show deposit chart -->
+                                    {# show deposit chart #}
                                     <div class="preferences-box">
                                         <h3>{{ 'pref_home_show_deposits'|_ }}</h3>
                                         <p class="text-info">{{ 'pref_home_show_deposits_info'|_ }}</p>
@@ -137,12 +137,12 @@
                             </div>
                         </div>
                         <div class="tab-pane" id="security">
-                            <!-- security settings here -->
+                            {# security settings here #}
                             <div class="row">
-                                <!-- security settings column A -->
+                                {# security settings column A #}
                                 <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
 
-                                    <!-- 2fa -->
+                                    {# 2fa #}
                                     <div class="preferences-box">
                                         <h3>{{ 'pref_two_factor_auth'|_ }}</h3>
                                         <p class="text-info">{{ 'pref_two_factor_auth_help'|_ }}</p>
@@ -177,17 +177,17 @@
                                     </div>
                                 </div>
 
-                                <!-- security settings column B -->
+                                {# security settings column B #}
                                 <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                                 </div>
                             </div>
                         </div>
                         <div class="tab-pane" id="layout">
-                            <!-- layout settings here -->
+                            {# layout settings here #}
                             <div class="row">
-                                <!-- layout settings column A -->
+                                {# layout settings column A #}
                                 <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-                                    <!-- view range -->
+                                    {# view range #}
                                     <div class="preferences-box">
                                         <h3>{{ 'pref_view_range'|_ }}</h3>
                                         <p class="text-info">{{ 'pref_view_range_help'|_ }}</p>
@@ -239,10 +239,9 @@
                                             </label>
                                         </div>
                                     </div>
-                                    <!-- end -->
                                 </div>
 
-                                <!-- layout settings column B -->
+                                {# layout settings column B #}
                                 <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                                     <div class="preferences-box">
                                         <h3>{{ 'list_page_size_title'|_ }}</h3>
diff --git a/resources/views/reports/audit/report.twig b/resources/views/reports/audit/report.twig
index 585df0ab10..fca6036a1d 100644
--- a/resources/views/reports/audit/report.twig
+++ b/resources/views/reports/audit/report.twig
@@ -6,7 +6,6 @@
 
 {% block content %}
 
-<!-- options block -->
 <div class="row no-print">
     <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
         <div class="box" id="optionsBox">
diff --git a/resources/views/reports/partials/balance.twig b/resources/views/reports/partials/balance.twig
index 77c795d351..3bed737ebe 100644
--- a/resources/views/reports/partials/balance.twig
+++ b/resources/views/reports/partials/balance.twig
@@ -1,5 +1,4 @@
 <table class="table table-hover">
-    <!-- build balance report header -->
     <thead>
     <tr>
         <th colspan="2">{{ 'budgets'|_ }}</th>
@@ -13,7 +12,6 @@
     </thead>
     <tbody>
 
-    <!-- make rows -->
     {% for balanceLine in balance.getBalanceLines %}
         <tr>
 
diff --git a/resources/views/reports/partials/journals-audit.twig b/resources/views/reports/partials/journals-audit.twig
index a63c8e863d..35d7e2f698 100644
--- a/resources/views/reports/partials/journals-audit.twig
+++ b/resources/views/reports/partials/journals-audit.twig
@@ -16,7 +16,7 @@
         <th class="hide-process_date">{{ trans('list.process_date') }}</th>
         <th class="hide-interest_date">{{ trans('list.interest_date') }}</th>
 
-        <!-- new optional fields (3x) -->
+        {# new optional fields (3x) #}
         <th class="hide-interest_date">{{ trans('list.due_date') }}</th>
         <th class="hide-payment_date">{{ trans('list.payment_date') }}</th>
         <th class="hide-invoice_date">{{ trans('list.invoice_date') }}</th>
@@ -28,7 +28,7 @@
         <th class="hide-category"><i class="fa fa-bar-chart fa-fw" title="{{ trans('list.category') }}"></i></th>
         <th class="hide-bill">{{ trans('list.bill') }}</th>
 
-        <!-- more optional fields (2x) -->
+        {# more optional fields (2x) #}
         <th class="hide-internal_reference">{{ trans('list.internal_reference') }}</th>
         <th class="hide-notes">{{ trans('list.notes') }}</th>
 
@@ -82,7 +82,7 @@
 
             </td>
 
-            <!-- new optional fields (3x) -->
+            {# new optional fields (3x) #}
             <td class="hide-due_date">
                 {% if transaction.transactionJournal.hasMeta('due_date') %}
                     {{ transaction.transactionJournal.getMeta('due_date').formatLocalized(monthAndDayFormat) }}
@@ -125,7 +125,7 @@
                 <td class="hide-bill">&nbsp;</td>
             {% endif %}
 
-            <!-- new optional fields (2x) -->
+            {# new optional fields (2x) #}
             <td class="hide-internal_reference">
 
                 {% if transaction.transactionJournal.hasMeta('internal_reference') %}
diff --git a/resources/views/rules/partials/test-trigger-modal.twig b/resources/views/rules/partials/test-trigger-modal.twig
index ef2e5e15c9..c94c4aebf3 100644
--- a/resources/views/rules/partials/test-trigger-modal.twig
+++ b/resources/views/rules/partials/test-trigger-modal.twig
@@ -1,4 +1,3 @@
-<!-- Modal dialog to show transactions matching these triggers -->
 <div class="modal fade" id="testTriggerModal" tabindex="-1" role="dialog" aria-labelledby="testTriggerLabel">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
diff --git a/resources/views/rules/rule-group/create.twig b/resources/views/rules/rule-group/create.twig
index 4d8ad05f44..01edaae1d1 100644
--- a/resources/views/rules/rule-group/create.twig
+++ b/resources/views/rules/rule-group/create.twig
@@ -20,7 +20,7 @@
             </div>
             <div class="col-lg-6 col-md-6 col-sm-12">
 
-                <!-- optional fields -->
+                {# optional fields #}
                 <div class="box">
                     <div class="box-header with-border">
                         <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
@@ -30,7 +30,7 @@
                     </div>
                 </div>
 
-                <!-- panel for options -->
+                {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
                         <h3 class="box-title">{{ 'options'|_ }}</h3>
diff --git a/resources/views/rules/rule-group/edit.twig b/resources/views/rules/rule-group/edit.twig
index 5e86c39b67..8ef2671a6b 100644
--- a/resources/views/rules/rule-group/edit.twig
+++ b/resources/views/rules/rule-group/edit.twig
@@ -22,7 +22,7 @@
         </div>
         <div class="col-lg-6 col-md-12 col-sm-6">
 
-            <!-- optional fields -->
+            {# optional fields #}
             <div class="box">
                 <div class="box-header with-border">
                     <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
@@ -32,7 +32,7 @@
                 </div>
             </div>
 
-            <!-- panel for options -->
+            {# panel for options #}
             <div class="box">
                 <div class="box-header with-border">
                     <h3 class="box-title">{{ 'options'|_ }}</h3>
diff --git a/resources/views/rules/rule-group/select-transactions.twig b/resources/views/rules/rule-group/select-transactions.twig
index 0569055293..6ae7769f03 100644
--- a/resources/views/rules/rule-group/select-transactions.twig
+++ b/resources/views/rules/rule-group/select-transactions.twig
@@ -28,8 +28,6 @@
                                 <div class="col-lg-6 col-md-8 col-sm-12 col-xs-12">
                                     {{ ExpandedForm.date('start_date', first) }}
                                     {{ ExpandedForm.date('end_date', today) }}
-
-                                    <!-- ACCOUNTS -->
                                     {{ ExpandedForm.multiCheckbox('accounts',accountList, checkedAccounts, {' class': 'account-checkbox', 'label': trans('firefly.include_transactions_from_accounts') }) }}
                                 </div>
                             </div>
diff --git a/resources/views/rules/rule/create.twig b/resources/views/rules/rule/create.twig
index 63bf253a95..5c1f3b998d 100644
--- a/resources/views/rules/rule/create.twig
+++ b/resources/views/rules/rule/create.twig
@@ -25,7 +25,7 @@
             </div>
             <div class="col-lg-6 col-md-6 col-sm-12">
 
-                <!-- optional fields -->
+                {# optional fields #}
                 <div class="box">
                     <div class="box-header with-border">
                         <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
@@ -37,14 +37,12 @@
             </div>
         </div>
 
-        <!-- RULE TRIGGERS -->
         <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">{{ 'rule_triggers'|_ }}</h3>
                     </div>
-                    <!-- display any error -->
                     <div class="box-body rule-trigger-box">
                         <table class="table table-condensed table-bordered table-striped">
                             <thead>
@@ -73,7 +71,6 @@
 
         {% include '/rules/partials/test-trigger-modal' %}
 
-        <!-- RULE ACTIONS -->
         <div class="row">
             <div class="col-lg-12 col-md-12 col-sm-12">
                 <div class="box">
@@ -107,7 +104,7 @@
 
         <div class="row">
             <div class="col-lg-12 col-md-12 col-sm-12">
-                <!-- panel for options -->
+                {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
                         <h3 class="box-title">{{ 'options'|_ }}</h3>
diff --git a/resources/views/rules/rule/edit.twig b/resources/views/rules/rule/edit.twig
index e10c749ceb..2b28a6e21e 100644
--- a/resources/views/rules/rule/edit.twig
+++ b/resources/views/rules/rule/edit.twig
@@ -24,7 +24,7 @@
         </div>
         <div class="col-lg-6 col-md-6 col-sm-12">
 
-            <!-- optional fields -->
+            {# optional fields #}
             <div class="box">
                 <div class="box-header with-border">
                     <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
@@ -36,14 +36,12 @@
         </div>
     </div>
 
-    <!-- RULE TRIGGERS -->
     <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">{{ 'rule_triggers'|_ }}</h3>
                 </div>
-                <!-- display any error -->
                 <div class="box-body rule-trigger-box">
                     <table class="table table-condensed table-bordered table-striped">
                         <thead>
@@ -72,7 +70,6 @@
 
     {% include '/rules/partials/test-trigger-modal' %}
 
-    <!-- RULE ACTIONS -->
     <div class="row">
         <div class="col-lg-12 col-md-12 col-sm-12">
             <div class="box">
@@ -106,7 +103,7 @@
 
     <div class="row">
         <div class="col-lg-12 col-md-12 col-sm-12">
-            <!-- panel for options -->
+            {# panel for options #}
             <div class="box">
                 <div class="box-header with-border">
                     <h3 class="box-title">{{ 'options'|_ }}</h3>
diff --git a/resources/views/rules/rule/select-transactions.twig b/resources/views/rules/rule/select-transactions.twig
index f4241e2cf0..39fe00f7de 100644
--- a/resources/views/rules/rule/select-transactions.twig
+++ b/resources/views/rules/rule/select-transactions.twig
@@ -28,8 +28,6 @@
                                 <div class="col-lg-6 col-md-8 col-sm-12 col-xs-12">
                                     {{ ExpandedForm.date('start_date', first) }}
                                     {{ ExpandedForm.date('end_date', today) }}
-
-                                    <!-- ACCOUNTS -->
                                     {{ ExpandedForm.multiCheckbox('accounts',accountList, checkedAccounts, {' class': 'account-checkbox', 'label': trans('firefly.include_transactions_from_accounts') }) }}
                                 </div>
                             </div>
diff --git a/resources/views/tags/create.twig b/resources/views/tags/create.twig
index a4fbc11476..e2a1fb3b4b 100644
--- a/resources/views/tags/create.twig
+++ b/resources/views/tags/create.twig
@@ -32,7 +32,7 @@
                     </div>
                 </div>
 
-                <!-- panel for options -->
+                {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
                         <h3 class="box-title">{{ 'options'|_ }}</h3>
diff --git a/resources/views/tags/edit.twig b/resources/views/tags/edit.twig
index 41d032f2d6..52d45915db 100644
--- a/resources/views/tags/edit.twig
+++ b/resources/views/tags/edit.twig
@@ -34,7 +34,7 @@
                 </div>
             </div>
 
-            <!-- panel for options -->
+            {# panel for options #}
             <div class="box">
                 <div class="box-header with-border">
                     <h3 class="box-title">{{ 'options'|_ }}</h3>
diff --git a/resources/views/tags/show.twig b/resources/views/tags/show.twig
index c7820c6beb..52b4d64025 100644
--- a/resources/views/tags/show.twig
+++ b/resources/views/tags/show.twig
@@ -5,8 +5,6 @@
 {% endblock %}
 
 {% block content %}
-    <!-- show this block only when the tag has some meta-data -->
-
     <div class="row">
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="box">
diff --git a/resources/views/transactions/show.twig b/resources/views/transactions/show.twig
index 5920f84bda..62b6fa49e9 100644
--- a/resources/views/transactions/show.twig
+++ b/resources/views/transactions/show.twig
@@ -74,18 +74,14 @@
                             <td>{{ trans('list.description') }}</td>
                             <td>{{ journal.description }}</td>
                         </tr>
-                        <!-- source(s) -->
                         <tr>
                             <td>{{ 'source_accounts'|_ }}</td>
                             <td>{{ sourceAccount(journal)|raw }}</td>
                         </tr>
-
-                        <!-- destination(s) -->
                         <tr>
                             <td>{{ 'destination_accounts'|_ }}</td>
                             <td>{{ destinationAccount(journal)|raw }}</td>
                         </tr>
-                        <!-- total amount -->
                         <tr>
                             <td>{{ 'total_amount'|_ }}</td>
                             <td>
@@ -163,7 +159,6 @@
                 </div>
             </div>
 
-            <!-- events, if present -->
             {% if journal.piggyBankEvents|length > 0 %}
                 <div class="box">
                     <div class="box-header with-border">
diff --git a/resources/views/transactions/single/edit.twig b/resources/views/transactions/single/edit.twig
index 7f36389329..e70e57ca2e 100644
--- a/resources/views/transactions/single/edit.twig
+++ b/resources/views/transactions/single/edit.twig
@@ -80,23 +80,16 @@
                         <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
                     </div>
                     <div class="box-body">
-                        <!-- BUDGET ONLY WHEN CREATING A WITHDRAWAL -->
                         {% if what == 'withdrawal' %}
                             {{ ExpandedForm.select('budget_id',budgetList,data['budget_id']) }}
                         {% endif %}
-
-                        <!-- CATEGORY ALWAYS -->
                         {{ ExpandedForm.text('category',data['category']) }}
-
-                        <!-- TAGS -->
                         {{ ExpandedForm.text('tags') }}
-
                         {# NO PIGGY BANK #}
                     </div>
                 </div>
 
 
-                <!-- explain if necessary -->
                 {% if
                     not optionalFields.interest_date or
                     not optionalFields.book_date or
@@ -110,9 +103,6 @@
                     <p class="text-center text-success"><i class="fa fa-info-circle"></i>
                         <em>{{ trans('firefly.hidden_fields_preferences', {link: route('preferences.index')})|raw }}</em></p>
                 {% endif %}
-
-
-                <!-- box for dates -->
                 {% if
                     optionalFields.interest_date or
                     optionalFields.book_date or
@@ -132,32 +122,26 @@
                         <div class="box-body">
 
                             {% if optionalFields.interest_date or data['interest_date'] %}
-                                <!-- INTEREST DATE -->
                                 {{ ExpandedForm.date('interest_date',data['interest_date']) }}
                             {% endif %}
 
                             {% if optionalFields.book_date or data['book_date'] %}
-                                <!-- BOOK DATE -->
                                 {{ ExpandedForm.date('book_date',data['book_date']) }}
                             {% endif %}
 
                             {% if optionalFields.process_date or data['process_date'] %}
-                                <!-- PROCESSING DATE -->
                                 {{ ExpandedForm.date('process_date',data['process_date']) }}
                             {% endif %}
 
                             {% if optionalFields.due_date or data['due_date'] %}
-                                <!-- DUE DATE -->
                                 {{ ExpandedForm.date('due_date',data['due_date']) }}
                             {% endif %}
 
                             {% if optionalFields.payment_date or data['payment_date'] %}
-                                <!-- PAYMENT DATE -->
                                 {{ ExpandedForm.date('payment_date',data['payment_date']) }}
                             {% endif %}
 
                             {% if optionalFields.invoice_date or data['invoice_date'] %}
-                                <!-- INVOICE DATE -->
                                 {{ ExpandedForm.date('invoice_date',data['invoice_date']) }}
                             {% endif %}
 
@@ -166,7 +150,6 @@
                 {% endif %}
 
 
-                <!-- box for business fields -->
                 {% if
                     optionalFields.internal_reference or
                     optionalFields.notes or
@@ -178,12 +161,10 @@
                         </div>
                         <div class="box-body">
                             {% if optionalFields.internal_reference or data['interal_reference'] %}
-                                <!-- REFERENCE -->
                                 {{ ExpandedForm.text('internal_reference', data['interal_reference']) }}
                             {% endif %}
 
                             {% if optionalFields.notes or data['notes'] %}
-                                <!-- NOTES -->
                                 {{ ExpandedForm.textarea('notes', data['notes'], {helpText: trans('firefly.field_supports_markdown')}) }}
                             {% endif %}
 
@@ -191,7 +172,6 @@
                     </div>
                 {% endif %}
 
-                <!-- box for attachments -->
                 {% if optionalFields.attachments %}
                     <div class="box">
                         <div class="box-header with-border">
@@ -199,14 +179,13 @@
                         </div>
                         <div class="box-body">
                             {% if optionalFields.attachments %}
-                                <!-- ATTACHMENTS -->
                                 {{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
                             {% endif %}
                         </div>
                     </div>
                 {% endif %}
 
-                <!-- panel for options -->
+                {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
                         <h3 class="box-title">{{ 'options'|_ }}</h3>
diff --git a/resources/views/transactions/split/edit.twig b/resources/views/transactions/split/edit.twig
index 6573de4cec..f49a1bb805 100644
--- a/resources/views/transactions/split/edit.twig
+++ b/resources/views/transactions/split/edit.twig
@@ -311,7 +311,7 @@
             </div>
             <div class="row">
                 <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-                    <!-- panel for options -->
+                    {# panel for options #}
                     <div class="box">
                         <div class="box-header with-border">
                             <h3 class="box-title">{{ 'options'|_ }}</h3>