diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index 6acfe20e45..f7b56014d2 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -217,6 +217,8 @@ return [
     'expected_total'                                      => 'expected total',
     'reconciliation_account_name'                         => ':name reconciliation (:currency)',
     'saved'                                               => 'Saved',
+    'advanced_options'                                    => 'Advanced options',
+    'advanced_options_explain'                            => 'Some pages in Firefly III have advanced options hidden behind this button. This page doesn\'t have anything fancy here, but do check out the others!',
 
     // API access
     'authorization_request'                               => 'Firefly III v:version Authorization Request',
diff --git a/resources/views/v2/accounts/show.twig b/resources/views/v2/accounts/show.twig
index bf03bbd83b..d6e89081d4 100644
--- a/resources/views/v2/accounts/show.twig
+++ b/resources/views/v2/accounts/show.twig
@@ -3,7 +3,7 @@
     {{ Breadcrumbs.render }}
 {% endblock %}
 {% block content %}
-<div id="accounts"></div>
+<div id="accounts_show"></div>
 {% endblock %}
 
 {% block styles %}
@@ -11,5 +11,5 @@
 {% endblock %}
 
 {% block scripts %}
-    <script src="v2/js/accounts.js" nonce="{{ JS_NONCE }}"></script>
+    <script src="v2/js/accounts/show.js" nonce="{{ JS_NONCE }}"></script>
 {% endblock %}
diff --git a/resources/views/v2/budgets/index.twig b/resources/views/v2/budgets/index.twig
index b6a76eec70..1f85da4474 100644
--- a/resources/views/v2/budgets/index.twig
+++ b/resources/views/v2/budgets/index.twig
@@ -1,7 +1,10 @@
+
 {% extends "./layout/default" %}
+
 {% block breadcrumbs %}
     {{ Breadcrumbs.render }}
 {% endblock %}
+
 {% block content %}
     <!-- Small boxes (Stat box) -->
 
diff --git a/resources/views/v2/debug.twig b/resources/views/v2/debug.twig
new file mode 100644
index 0000000000..ab629b8f23
--- /dev/null
+++ b/resources/views/v2/debug.twig
@@ -0,0 +1,78 @@
+<html>
+<head>
+    <title>{{ trans('firefly.debug_page') }}</title>
+</head>
+<body>
+
+<p style="font-family:Arial, Arial, Helvetica, sans-serif;font-size:12pt;width:600px;">
+    {{ trans('firefly.debug_submit_instructions')|raw }}
+</p>
+<p style="font-family:Arial, Arial, Helvetica, sans-serif;font-size:12pt;width:600px;">
+    <strong>{{ trans('firefly.debug_pretty_table') }}</strong>
+</p>
+<textarea rows="30" cols="100" name="debug_info" style="font-family:Menlo, Monaco, Consolas, monospace;font-size:8pt;">
+Debug information generated at {{ now }} for Firefly III version **{{ FF_VERSION }}**.
+
+| Scope | Version |
+| --- | --- |
+| Firefly III | {{ FF_VERSION }} |
+| Firefly III API | {{ config('firefly.api_version') }} |
+| PHP | {{ phpVersion }} |
+| Host | {{ phpOs }} |
+
+| System info | Value |
+| --- | --- |
+| Installation ID | {{ installationId }} |
+| Using docker? | {% if isDocker %}true{% else %}false{% endif %} |
+| Telemetry | {% if telemetry %}true{% else%}false{% endif%} |
+| Layout | {{ layout }} |
+| App environment | {{ appEnv }} |
+| App debug mode | {{ appDebug }} |
+| App cache driver | {{ cacheDriver }} |
+| App logging | {{ appLogLevel }}, {{ logChannel }} |
+| Display errors | {{ displayErrors }} |
+| Error reporting | {{ errorReporting }} |
+| Interface | {{ interface }} |
+| Default language | {{ defaultLanguage }} |
+| Default locale | {{ defaultLocale }} |
+| BCscale | {{ bcscale }} |
+| DB drivers | {{ drivers }} |
+| Current driver | {{ currentDriver }} |
+| DB version | {{ foundDBversion }} (exp. {{ expectedDBversion}}) |
+| Login provider | {{ loginProvider }}  |
+| Trusted proxies (.env) | {{ trustedProxies }} |
+
+| User info | Value |
+| --- | --- |
+| Session start | {{ session('start') }} |
+| Session end | {{ session('end') }} |
+| Session first | {{ session('first') }} |
+| User ID | {{ Auth.user.id }} |
+| User language | {{ userLanguage }} |
+| User locale | {{ userLocale }} |
+{% for code,result in localeAttempts %}
+| Attempt at "{{ code }}" | {{ result }} |
+{% endfor %}
+| User agent | {{ userAgent }} |
+</textarea>
+
+<p style="font-family:Arial, Arial, Helvetica, sans-serif;font-size:12pt;width:600px;color:#a00;">
+    <a href="{{ route('index') }}">{{ trans('firefly.back_to_index') }}</a>
+</p>
+
+<p style="font-family:Arial, Arial, Helvetica, sans-serif;font-size:12pt;width:600px;color:#a00;">
+    {{ trans('firefly.debug_additional_data')|raw }}
+</p>
+
+<textarea rows="30" cols="100" name="log_info" style="font-family:Menlo, Monaco, Consolas, monospace;font-size:7pt;">
+```
+{{ logContent }}
+```
+</textarea>
+
+<p style="font-family:Arial, Arial, Helvetica, sans-serif;font-size:12pt;width:600px;color:#a00;">
+    <a href="{{ route('index') }}">{{ trans('firefly.back_to_index') }}</a>
+</p>
+
+</body>
+</html>
diff --git a/resources/views/v2/layout/default.twig b/resources/views/v2/layout/default.twig
index fb86e2b66b..16dde4f62e 100644
--- a/resources/views/v2/layout/default.twig
+++ b/resources/views/v2/layout/default.twig
@@ -70,7 +70,15 @@
     <!-- Control Sidebar -->
     <aside class="control-sidebar control-sidebar-dark">
         <!-- Control sidebar content goes here -->
-        bla bla bla
+        {% block control %}
+            <div class="p-3 control-sidebar-content">
+                <h5>{{ 'advanced_options'|_ }}</h5>
+                <hr class="mb-2">
+                <p>
+                    {{ 'advanced_options_explain'|_ }}
+                </p>
+            </div>
+        {% endblock %}
     </aside>
     <!-- /.control-sidebar -->
 </div>
diff --git a/resources/views/v2/new-user/index.twig b/resources/views/v2/new-user/index.twig
new file mode 100644
index 0000000000..589125ceb3
--- /dev/null
+++ b/resources/views/v2/new-user/index.twig
@@ -0,0 +1,19 @@
+{% extends "./layout/default" %}
+{% block breadcrumbs %}
+    {{ Breadcrumbs.render }}
+{% endblock %}
+{% block content %}
+    <!-- Small boxes (Stat box) -->
+
+    <!-- Main row -->
+    <div id="newuser"></div>
+    <!-- /.row (main row) -->
+{% endblock %}
+
+{% block styles %}
+
+{% endblock %}
+
+{% block scripts %}
+    <script src="v2/js/new-user/index.js" nonce="{{ JS_NONCE }}"></script>
+{% endblock %}
diff --git a/resources/views/v2/partials/layout/control.twig b/resources/views/v2/partials/layout/control.twig
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/resources/views/v2/partials/layout/control.twig
@@ -0,0 +1 @@
+
diff --git a/resources/views/v2/partials/layout/navbar.twig b/resources/views/v2/partials/layout/navbar.twig
index 4ae11e8a00..fdbaa995c8 100644
--- a/resources/views/v2/partials/layout/navbar.twig
+++ b/resources/views/v2/partials/layout/navbar.twig
@@ -61,7 +61,7 @@
         </li>
         <li class="nav-item">
             <a class="nav-link" data-widget="control-sidebar" data-slide="true" href="#" role="button">
-                <i class="fas fa-th-large"></i>
+                <i class="fas fa-dragon"></i>
             </a>
         </li>
     </ul>
