diff --git a/resources/views/layouts/admin.blade.php b/resources/views/layouts/admin.blade.php
index 8ebd6fd74..28c39b831 100644
--- a/resources/views/layouts/admin.blade.php
+++ b/resources/views/layouts/admin.blade.php
@@ -3,35 +3,33 @@
     @include('partials.admin.head')
 
     <body class="g-sidenav-show g-sidenav-pinned">
-
         @stack('body_start')
 
-            @include('partials.admin.menu')
+        @include('partials.admin.menu')
 
-            <div class="main-content" id="panel">
+        <div class="main-content" id="panel">
 
-                @include('partials.admin.navbar')
+            @include('partials.admin.navbar')
 
-                <div id="main-body">
+            <div id="main-body">
 
-                    @include('partials.admin.header')
+                @include('partials.admin.header')
 
-                    <div class="container-fluid content-layout mt--6">
+                <div class="container-fluid content-layout mt--6">
 
-                        @include('partials.admin.content')
+                    @include('partials.admin.content')
 
-                        @include('partials.admin.footer')
-
-                    </div>
+                    @include('partials.admin.footer')
 
                 </div>
 
             </div>
 
+        </div>
+
         @stack('body_end')
 
         @include('partials.admin.scripts')
-
     </body>
 
 </html>
diff --git a/resources/views/layouts/auth.blade.php b/resources/views/layouts/auth.blade.php
index 3c9d85685..e13164003 100644
--- a/resources/views/layouts/auth.blade.php
+++ b/resources/views/layouts/auth.blade.php
@@ -3,69 +3,67 @@
     @include('partials.auth.head')
 
     <body class="login-page">
-
         @stack('body_start')
 
-            <div class="main-content">
-                <div class="header py-5">
-                    <div class="container">
-                        <div class="header-body text-center mb-5">
-                            <div class="row justify-content-center">
-                                <div class="col-xl-5 col-lg-6 col-md-8">
-                                    <img class="pb-5" src="{{ asset('public/img/akaunting-logo-white.png') }}" width="22%" alt="Akaunting"/>
-                                </div>
+        <div class="main-content">
+            <div class="header py-5">
+                <div class="container">
+                    <div class="header-body text-center mb-5">
+                        <div class="row justify-content-center">
+                            <div class="col-xl-5 col-lg-6 col-md-8">
+                                <img class="pb-5" src="{{ asset('public/img/akaunting-logo-white.png') }}" width="22%" alt="Akaunting"/>
                             </div>
                         </div>
                     </div>
                 </div>
+            </div>
 
-                @stack('login_box_start')
-                    <div class="container mt--7 pb-5">
-                        <div class="row justify-content-center">
-                            <div class="col-lg-5 col-md-7">
-                                <div class="card mb-0 login-card-bg">
-                                    <div class="card-body px-lg-5 py-lg-5">
-                                        <div class="text-center text-white mb-4">
-                                            <small>@yield('message')</small>
-                                        </div>
+            @stack('login_box_start')
+                <div class="container mt--7 pb-5">
+                    <div class="row justify-content-center">
+                        <div class="col-lg-5 col-md-7">
+                            <div class="card mb-0 login-card-bg">
+                                <div class="card-body px-lg-5 py-lg-5">
+                                    <div class="text-center text-white mb-4">
+                                        <small>@yield('message')</small>
+                                    </div>
 
-                                        <div id="app">
-                                            @stack('login_content_start')
+                                    <div id="app">
+                                        @stack('login_content_start')
 
-                                            @yield('content')
+                                        @yield('content')
 
-                                            @stack('login_content_end')
-                                            <notifications></notifications>
-                                        </div>
+                                        @stack('login_content_end')
+                                        <notifications></notifications>
                                     </div>
                                 </div>
                             </div>
                         </div>
                     </div>
-                @stack('login_box_end')
+                </div>
+            @stack('login_box_end')
 
-                @yield('forgotten-password')
+            @yield('forgotten-password')
 
-                <footer>
-                    <div class="container">
-                        <div class="row align-items-center justify-content-xl-between">
-                            <div class="col-xl-12">
-                                <div class="copyright text-center text-lg-center text-white">
-                                    <small>
-                                        <a>{{ trans('footer.powered') }}:</a> <a class="text-success"  href="{{ trans('footer.link') }}" target="_blank">{{ trans('footer.software') }}</a>
-                                    </small>
-                                </div>
+            <footer>
+                <div class="container">
+                    <div class="row align-items-center justify-content-xl-between">
+                        <div class="col-xl-12">
+                            <div class="copyright text-center text-lg-center text-white">
+                                <small>
+                                    <a>{{ trans('footer.powered') }}:</a> <a class="text-success"  href="{{ trans('footer.link') }}" target="_blank">{{ trans('footer.software') }}</a>
+                                </small>
                             </div>
                         </div>
                     </div>
-                </footer>
+                </div>
+            </footer>
 
-            </div>
+        </div>
 
         @stack('body_end')
 
         @include('partials.auth.scripts')
-
     </body>
 
 </html>
diff --git a/resources/views/layouts/modules.blade.php b/resources/views/layouts/modules.blade.php
index 92c912d61..27798483e 100644
--- a/resources/views/layouts/modules.blade.php
+++ b/resources/views/layouts/modules.blade.php
@@ -3,35 +3,33 @@
     @include('partials.modules.head')
 
     <body class="g-sidenav-show g-sidenav-pinned">
-
         @stack('body_start')
 
-            @include('partials.admin.menu')
+        @include('partials.admin.menu')
 
-            <div class="main-content" id="panel">
+        <div class="main-content" id="panel">
 
-                @include('partials.admin.navbar')
+            @include('partials.admin.navbar')
 
-                <div id="main-body">
+            <div id="main-body">
 
-                    @include('partials.admin.header')
+                @include('partials.admin.header')
 
-                    <div class="container-fluid content-layout mt--6">
+                <div class="container-fluid content-layout mt--6">
 
-                        @include('partials.admin.content')
+                    @include('partials.admin.content')
 
-                        @include('partials.admin.footer')
-
-                    </div>
+                    @include('partials.admin.footer')
 
                 </div>
 
             </div>
 
+        </div>
+
         @stack('body_end')
 
         @include('partials.admin.scripts')
-
     </body>
 
 </html>
diff --git a/resources/views/layouts/portal.blade.php b/resources/views/layouts/portal.blade.php
index 37a1fd6db..303d98910 100644
--- a/resources/views/layouts/portal.blade.php
+++ b/resources/views/layouts/portal.blade.php
@@ -3,35 +3,33 @@
     @include('partials.portal.head')
 
     <body class="g-sidenav-show g-sidenav-pinned">
-
         @stack('body_start')
 
-            @include('partials.portal.menu')
+        @include('partials.portal.menu')
 
-            <div class="main-content" id="panel">
+        <div class="main-content" id="panel">
 
-                @include('partials.portal.navbar')
+            @include('partials.portal.navbar')
 
-                <div id="main-body">
+            <div id="main-body">
 
-                    @include('partials.portal.header')
+                @include('partials.portal.header')
 
-                    <div class="container-fluid content-layout mt--6">
+                <div class="container-fluid content-layout mt--6">
 
-                        @include('partials.portal.content')
+                    @include('partials.portal.content')
 
-                        @include('partials.portal.footer')
-
-                    </div>
+                    @include('partials.portal.footer')
 
                 </div>
 
             </div>
 
+        </div>
+
         @stack('body_end')
 
         @include('partials.portal.scripts')
-
     </body>
 
 </html>
diff --git a/resources/views/layouts/print.blade.php b/resources/views/layouts/print.blade.php
index b0140ff23..7d4b2e7cb 100644
--- a/resources/views/layouts/print.blade.php
+++ b/resources/views/layouts/print.blade.php
@@ -9,13 +9,11 @@
     </style>
 
     <body onload="window.print();">
-
         @stack('body_start')
 
-            @yield('content')
+        @yield('content')
 
         @stack('body_end')
-
     </body>
 
 </html>
diff --git a/resources/views/layouts/signed.blade.php b/resources/views/layouts/signed.blade.php
index ff12b1d42..2d3401c3b 100644
--- a/resources/views/layouts/signed.blade.php
+++ b/resources/views/layouts/signed.blade.php
@@ -2,19 +2,17 @@
     @include('partials.signed.head')
 
     <body>
-
         @stack('body_start')
 
-            <div class="container-fluid content-layout mt-4">
+        <div class="container-fluid content-layout mt-4">
 
-                @include('partials.signed.content')
+            @include('partials.signed.content')
 
-                @include('partials.signed.footer')
+            @include('partials.signed.footer')
 
-            </div>
+        </div>
 
         @stack('body_end')
-
     </body>
 
 </html>
diff --git a/resources/views/layouts/wizard.blade.php b/resources/views/layouts/wizard.blade.php
index 4db760932..720fe0c4d 100644
--- a/resources/views/layouts/wizard.blade.php
+++ b/resources/views/layouts/wizard.blade.php
@@ -4,21 +4,18 @@
     <body class="wizard-page">
 
         <div class="container mt--5">
-
             @stack('body_start')
 
-                <div id="app">
+            <div id="app">
 
-                    @include('partials.wizard.content')
+                @include('partials.wizard.content')
 
-                </div>
+            </div>
 
             @stack('body_end')
-
         </div>
 
         @include('partials.wizard.scripts')
-
     </body>
 
 </html>
