diff --git a/public/v2/css/adminlte.css b/public/v2/css/old-adminlte.css
similarity index 100%
rename from public/v2/css/adminlte.css
rename to public/v2/css/old-adminlte.css
diff --git a/public/v2/css/adminlte.css.map b/public/v2/css/old-adminlte.css.map
similarity index 100%
rename from public/v2/css/adminlte.css.map
rename to public/v2/css/old-adminlte.css.map
diff --git a/public/v2/css/adminlte.min.css b/public/v2/css/old-adminlte.min.css
similarity index 100%
rename from public/v2/css/adminlte.min.css
rename to public/v2/css/old-adminlte.min.css
diff --git a/public/v2/css/adminlte.min.css.map b/public/v2/css/old-adminlte.min.css.map
similarity index 100%
rename from public/v2/css/adminlte.min.css.map
rename to public/v2/css/old-adminlte.min.css.map
diff --git a/public/v2/js/adminlte.js b/public/v2/js/old-adminlte.js
similarity index 100%
rename from public/v2/js/adminlte.js
rename to public/v2/js/old-adminlte.js
diff --git a/public/v2/js/adminlte.js.map b/public/v2/js/old-adminlte.js.map
similarity index 100%
rename from public/v2/js/adminlte.js.map
rename to public/v2/js/old-adminlte.js.map
diff --git a/public/v2/js/adminlte.min.js b/public/v2/js/old-adminlte.min.js
similarity index 100%
rename from public/v2/js/adminlte.min.js
rename to public/v2/js/old-adminlte.min.js
diff --git a/public/v2/js/adminlte.min.js.map b/public/v2/js/old-adminlte.min.js.map
similarity index 100%
rename from public/v2/js/adminlte.min.js.map
rename to public/v2/js/old-adminlte.min.js.map
diff --git a/resources/assets/v2/sass/app.scss b/resources/assets/v2/sass/app.scss
index be59088937..e943c7bbf7 100644
--- a/resources/assets/v2/sass/app.scss
+++ b/resources/assets/v2/sass/app.scss
@@ -19,9 +19,27 @@
  */
 
 $color-mode-type: media-query;
+$link-decoration: none !default;
+
+.balance-box {
+    container: sidebar / inline-size;
+}
+
+.form-control {
+    appearance: auto;
+}
 
 // Bootstrap
-//@import "~bootstrap-sass/assets/stylesheets/bootstrap";
+// @import "bootstrap/scss/bootstrap";
+
+// admin LTE
+@import "admin-lte/src/scss/adminlte";
+
+// @import "~bootstrap-sass/assets/stylesheets/bootstrap";
+
+
+
+
 
 // Font awesome
 //@import "~font-awesome/css/font-awesome";
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 902af7da00..589d2ae31b 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -48,11 +48,11 @@
             <form action="{{ route('login.post') }}" method="post">
                 <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
                 @if(config('firefly.authentication_guard') === 'web')
-                <div class="input-group mb-3"> <input type="email" name="email" " class="form-control" placeholder="{{ trans('form.email') }}" value="@if(true===$IS_DEMO_SITE){{ $DEMO_USERNAME }}@else{{ $email }}@endif">
+                <div class="input-group mb-3"> <input type="email" name="email" autofocus required class="form-control" placeholder="{{ trans('form.email') }}" value="@if(true===$IS_DEMO_SITE){{ $DEMO_USERNAME }}@else{{ $email }}@endif">
                     <div class="input-group-text"> <em class="fa-solid fa-envelope"></em> </div>
                 </div>
                 @else
-                <div class="input-group mb-3"> <input type="text" autocomplete="username" " name="{{ $usernameField }}" class="form-control" placeholder="{{ trans('form.login_name') }}" value="{{ $email }}">
+                <div class="input-group mb-3"> <input type="text" autocomplete="username" autofocus required name="{{ $usernameField }}" class="form-control" placeholder="{{ trans('form.login_name') }}" value="{{ $email }}">
                     <div class="input-group-text"> <em class="fa-solid fa-user"></em> </div>
                 </div>
                 @endif
diff --git a/resources/views/errors/FireflyException.blade.php b/resources/views/errors/FireflyException.blade.php
index 51502d253a..d03b123958 100644
--- a/resources/views/errors/FireflyException.blade.php
+++ b/resources/views/errors/FireflyException.blade.php
@@ -1,108 +1,81 @@
 @extends('layout.v2.error')
 @section('content')
-<div class="row">
-    <div class="col">
-        <h1><a href="{{ route('index') }}"><strong>Firefly</strong> III</a></h1>
-    </div>
-</div>
-
-
-@endsection
-
-<!DOCTYPE html>
-<html lang="{{ trans('config.html_language') }}">
-<head>
-    <meta charset="UTF-8">
-    <meta name="robots" content="noindex, nofollow, noarchive, noodp, NoImageIndex, noydir">
+    <!--
     <title>Firefly III Exception :(</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
-    <base href="{{ route('index') }}/">
 
-    {# CSS things #}
 
-    {# libraries #}
-    <link href="v1/lib/bs/css/bootstrap.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"
-          nonce="{{ JS_NONCE }}">
-    <link href="v1/lib/fa/css/font-awesome.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"
-          nonce="{{ JS_NONCE }}">
-    <link href="v1/css/daterangepicker.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">
 
-    {# the theme #}
-    <link href="v1/lib/adminlte/css/AdminLTE.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"
-          nonce="{{ JS_NONCE }}">
+-->
 
-    {# favicons #}
-    {% include('partials.favicons') %}
 
-</head>
-<body class="container">
-<div class="row">
-    <div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
-        <h1><a href="{{ route('index') }}"><strong>Firefly</strong>III</a></h1>xxxxxx
+    <div class="row">
+        <div class="col">
+            <h1><a href="{{ route('index') }}"><strong>Firefly</strong> III</a></h1>
+        </div>
     </div>
-</div>
-<div class="row">
-    <div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
-        <h3 class="text-info">{{ trans('errors.error_occurred') }}</h3>
+    <div class="row">
+        <div class="col">
+            <h3 class="text-danger">{{ trans('errors.error_occurred') }}</h3>
+        </div>
     </div>
-</div>
-<div class="row">
-    <div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
-        <p>
-            {{ trans('errors.error_not_recoverable') }}
-        </p>
-        <p class="text-danger">
-            {{ exception.getMessage |default('General unknown errror') }}
-        </p>
-        <p>
-            {{ trans('errors.error_location', {file: exception.getFile, line: exception.getLine, code: exception.getCode })|raw }}
-        </p>
+
+    <div class="row">
+        <div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
+            <p>
+                {{ trans('errors.error_not_recoverable') }}
+            </p>
+            <p class="text-danger">
+                {{ $exception->getMessage() ?? 'General unknown error' }}
+            </p>
+            <p>
+                {!! trans('errors.error_location', ['file' => $exception->getFile(), 'line' =>  $exception->getLine(), 'code' => $exception->getCode() ]) !!}
+            </p>
+        </div>
     </div>
-</div>
-{% if not debug %}
+
+    @if(!$debug)
     <div class="row">
         <div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
             <h4>
                 {{ trans('errors.more_info') }}
             </h4>
             <p>
-                {{ trans('errors.collect_info')|raw }}
-                {{ trans('errors.collect_info_more')|raw }}
+                {!! trans('errors.collect_info')  !!}
+                {!! trans('errors.collect_info_more')  !!}
             </p>
             <h4>
                 {{ trans('errors.github_help') }}
             </h4>
             <p>
-                {{ trans('errors.github_instructions')|raw }}
+                {{ trans('errors.github_instructions') }} |raw
             </p>
             <ol>
                 <li>{{ trans('errors.use_search') }}</li>
-                <li>{{ trans('errors.include_info', { link: route('debug') })|raw }}</li>
+                <li>{{ trans('errors.include_info', ['link' => route('debug') ]) }}</li> |raw
                 <li>{{ trans('errors.tell_more') }}</li>
                 <li>{{ trans('errors.include_logs') }}</li>
                 <li>{{ trans('errors.what_did_you_do') }}</li>
             </ol>
         </div>
     </div>
-{% endif %}
-
-{% if debug %}
-    <div class="row">
-        <div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
-            <h4>{{ trans('errors.error') }}</h4>
-            <p>
-                {{ trans('errors.error_location', {file: exception.getFile, line: exception.getLine, code: exception.getCode })|raw }}
-            </p>
-            <h4>
-                {{ trans('errors.stacktrace') }}
-            </h4>
-            <div style="font-family: monospace;font-size:11px;">
-                {{ exception.getTraceAsString|nl2br }}
+    @endif
+    @if($debug)
+        <div class="row">
+            <div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
+                <h4>{{ trans('errors.error') }}</h4>
+                <p>
+                    {!! trans('errors.error_location', ['file' => $exception->getFile(), 'line' =>  $exception->getLine(), 'code' => $exception->getCode() ]) !!}
+                </p>
+                <h4>
+                    {{ trans('errors.stacktrace') }}
+                </h4>
+                <div style="font-family: monospace;font-size:11px;">
+                    {!!  nl2br($exception->getTraceAsString())  !!}
+                </div>
             </div>
         </div>
-    </div>
-{% endif %}
+    @endif
+
+@endsection
+
 
-</body>
-</html>
diff --git a/resources/views/v2/partials/layout/head.blade.php b/resources/views/v2/partials/layout/head.blade.php
index beedf5fbbe..dac01efd19 100644
--- a/resources/views/v2/partials/layout/head.blade.php
+++ b/resources/views/v2/partials/layout/head.blade.php
@@ -66,16 +66,11 @@
         Firefly III
     </title>
 
-    <!--begin::Primary Meta Tags-->
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <!--begin::Fonts-->
+    <!--
     <link href="v2/css/fonts.css" rel="stylesheet">
-    <!--end::Fonts-->
-
-    <!--begin::Required Plugin(AdminLTE)-->
     <link rel="stylesheet" href="v2/css/adminlte.css">
-    <!--end::Required Plugin(AdminLTE)-->
+    -->
     @yield('vite')
 
 </head>