diff --git a/resources/views/partials/admin/content.blade.php b/resources/views/partials/admin/content.blade.php
index 990c21787..ea51aafbe 100644
--- a/resources/views/partials/admin/content.blade.php
+++ b/resources/views/partials/admin/content.blade.php
@@ -5,6 +5,7 @@
             @yield('content')
 
         @stack('content_content_end')
+
         <notifications></notifications>
 
         <form id="form-dynamic-component" method="POST" action="#"></form>
diff --git a/resources/views/partials/admin/header.blade.php b/resources/views/partials/admin/header.blade.php
index ad0e8e486..71c01aa33 100644
--- a/resources/views/partials/admin/header.blade.php
+++ b/resources/views/partials/admin/header.blade.php
@@ -1,26 +1,26 @@
 @stack('header_start')
 
-<div id="header" class="header pb-6">
-    <div class="container-fluid content-layout">
-        <div class="header-body">
-            <div class="row py-4 align-items-center">
-                <div class="col-xs-12 col-sm-4 col-md-5 align-items-center">
-                    <h2 class="d-inline-flex mb-0 long-texts">@yield('title')</h2>
-                    @yield('dashboard_action')
-                </div>
+    <div id="header" class="header pb-6">
+        <div class="container-fluid content-layout">
+            <div class="header-body">
+                <div class="row py-4 align-items-center">
+                    <div class="col-xs-12 col-sm-4 col-md-5 align-items-center">
+                        <h2 class="d-inline-flex mb-0 long-texts">@yield('title')</h2>
+                        @yield('dashboard_action')
+                    </div>
 
-                <div class="col-xs-12 col-sm-8 col-md-7">
-                    <div class="text-right">
-                        @stack('header_button_start')
+                    <div class="col-xs-12 col-sm-8 col-md-7">
+                        <div class="text-right">
+                            @stack('header_button_start')
 
-                        @yield('new_button')
+                            @yield('new_button')
 
-                        @stack('header_button_end')
+                            @stack('header_button_end')
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
     </div>
-</div>
 
 @stack('header_end')
diff --git a/resources/views/partials/admin/scripts.blade.php b/resources/views/partials/admin/scripts.blade.php
index 9fb2ee8c1..2caec630a 100644
--- a/resources/views/partials/admin/scripts.blade.php
+++ b/resources/views/partials/admin/scripts.blade.php
@@ -18,7 +18,6 @@
         'use strict';
 
         var Layout = (function() {
-
             function pinSidenav() {
                 $('.sidenav-toggler').addClass('active');
                 $('.sidenav-toggler').data('action', 'sidenav-unpin');
@@ -43,7 +42,7 @@
 
             var $sidenavState = Cookies.get('sidenav-state') ? Cookies.get('sidenav-state') : 'pinned';
 
-            if($(window).width() > 1200) {
+            if ($(window).width() > 1200) {
                 if($sidenavState == 'pinned') {
                     pinSidenav()
                 }
diff --git a/resources/views/partials/auth/head.blade.php b/resources/views/partials/auth/head.blade.php
index cc4a38231..a8262883b 100644
--- a/resources/views/partials/auth/head.blade.php
+++ b/resources/views/partials/auth/head.blade.php
@@ -28,6 +28,8 @@
 
     @stack('stylesheet')
 
+    @livewireStyles
+
     <script type="text/javascript"><!--
         var url = '{{ url("/") }}';
         var app_url = '{{ config("app.url") }}';
diff --git a/resources/views/partials/auth/scripts.blade.php b/resources/views/partials/auth/scripts.blade.php
index 6ac4539c7..5daf78cc5 100644
--- a/resources/views/partials/auth/scripts.blade.php
+++ b/resources/views/partials/auth/scripts.blade.php
@@ -11,4 +11,6 @@
     @stack('body_js')
 
     @stack('body_scripts')
+
+    @livewireScripts
 @stack('scripts_end')
diff --git a/resources/views/partials/install/head.blade.php b/resources/views/partials/install/head.blade.php
index a78551e84..914dee964 100644
--- a/resources/views/partials/install/head.blade.php
+++ b/resources/views/partials/install/head.blade.php
@@ -26,6 +26,8 @@
 
     @stack('stylesheet')
 
+    @livewireStyles
+
     <script type="text/javascript"><!--
         var url = '{{ url("/") }}';
     //--></script>
@@ -35,7 +37,7 @@
     <script type="text/javascript"><!--
         window.Laravel = <?php echo json_encode([
             'csrfToken' => csrf_token(),
-        ]); ?>
+        ]); ?>;
 
         var flash_notification = {!! (session()->has('flash_notification')) ? json_encode(session()->get('flash_notification')) : 'false' !!};
     //--></script>
diff --git a/resources/views/partials/install/scripts.blade.php b/resources/views/partials/install/scripts.blade.php
index 702051e41..cfe6e10bf 100644
--- a/resources/views/partials/install/scripts.blade.php
+++ b/resources/views/partials/install/scripts.blade.php
@@ -14,4 +14,6 @@
 
 @stack('body_scripts')
 
+@livewireScripts
+
 @stack('scripts_end')
diff --git a/resources/views/partials/portal/content.blade.php b/resources/views/partials/portal/content.blade.php
index 990c21787..ea51aafbe 100644
--- a/resources/views/partials/portal/content.blade.php
+++ b/resources/views/partials/portal/content.blade.php
@@ -5,6 +5,7 @@
             @yield('content')
 
         @stack('content_content_end')
+
         <notifications></notifications>
 
         <form id="form-dynamic-component" method="POST" action="#"></form>
diff --git a/resources/views/partials/portal/head.blade.php b/resources/views/partials/portal/head.blade.php
index 3b31836d6..70c1dd25a 100644
--- a/resources/views/partials/portal/head.blade.php
+++ b/resources/views/partials/portal/head.blade.php
@@ -30,6 +30,8 @@
 
     @stack('stylesheet')
 
+    @livewireStyles
+
     <script type="text/javascript"><!--
         var url = '{{ url("/") }}';
         var app_url = '{{ config("app.url") }}';
diff --git a/resources/views/partials/portal/header.blade.php b/resources/views/partials/portal/header.blade.php
index aed9eb8f6..71c01aa33 100644
--- a/resources/views/partials/portal/header.blade.php
+++ b/resources/views/partials/portal/header.blade.php
@@ -1,21 +1,26 @@
 @stack('header_start')
+
     <div id="header" class="header pb-6">
         <div class="container-fluid content-layout">
             <div class="header-body">
                 <div class="row py-4 align-items-center">
-                    <div class="col-sm-4 col-md-5 align-items-center">
+                    <div class="col-xs-12 col-sm-4 col-md-5 align-items-center">
                         <h2 class="d-inline-flex mb-0 long-texts">@yield('title')</h2>
                         @yield('dashboard_action')
                     </div>
-                    <div class="col-sm-8 col-md-7">
+
+                    <div class="col-xs-12 col-sm-8 col-md-7">
                         <div class="text-right">
+                            @stack('header_button_start')
+
                             @yield('new_button')
 
-                            @stack('header_button')
+                            @stack('header_button_end')
                         </div>
                     </div>
                 </div>
             </div>
         </div>
     </div>
+
 @stack('header_end')
diff --git a/resources/views/partials/portal/scripts.blade.php b/resources/views/partials/portal/scripts.blade.php
index 7294a9999..0115b8fb1 100644
--- a/resources/views/partials/portal/scripts.blade.php
+++ b/resources/views/partials/portal/scripts.blade.php
@@ -14,12 +14,10 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/echarts/4.0.2/echarts-en.min.js" charset=utf-8></script>
 
     <!-- Argon -->
-
     <script type="text/javascript">
         'use strict';
 
         var Layout = (function() {
-
             function pinSidenav() {
                 $('.sidenav-toggler').addClass('active');
                 $('.sidenav-toggler').data('action', 'sidenav-unpin');
@@ -44,7 +42,7 @@
 
             var $sidenavState = Cookies.get('sidenav-state') ? Cookies.get('sidenav-state') : 'pinned';
 
-            if($(window).width() > 1200) {
+            if ($(window).width() > 1200) {
                 if($sidenavState == 'pinned') {
                     pinSidenav()
                 }
@@ -138,4 +136,5 @@
 
     @stack('body_scripts')
 
+    @livewireScripts
 @stack('scripts_end')
diff --git a/resources/views/partials/signed/content.blade.php b/resources/views/partials/signed/content.blade.php
index b830095f8..d0b51db79 100644
--- a/resources/views/partials/signed/content.blade.php
+++ b/resources/views/partials/signed/content.blade.php
@@ -18,6 +18,11 @@
             @yield('content')
 
         @stack('content_content_end')
+
         <notifications></notifications>
+
+        <form id="form-dynamic-component" method="POST" action="#"></form>
+
+        <component v-bind:is="component"></component>
     </div>
 @stack('content_end')
diff --git a/resources/views/partials/signed/head.blade.php b/resources/views/partials/signed/head.blade.php
index 3b31836d6..b3f2a0607 100644
--- a/resources/views/partials/signed/head.blade.php
+++ b/resources/views/partials/signed/head.blade.php
@@ -30,6 +30,8 @@
 
     @stack('stylesheet')
 
+    @livewireStyles
+
     <script type="text/javascript"><!--
         var url = '{{ url("/") }}';
         var app_url = '{{ config("app.url") }}';
@@ -50,5 +52,12 @@
 
     @stack('scripts')
 
+    <!-- Core -->
+    <script src="{{ asset('public/vendor/jquery/dist/jquery.min.js') }}"></script>
+    <script src="{{ asset('public/vendor/bootstrap/dist/js/bootstrap.bundle.min.js') }}"></script>
+    <script src="{{ asset('public/vendor/js-cookie/js.cookie.js') }}"></script>
+
+    @livewireScripts
+
     @stack('head_end')
 </head>
diff --git a/resources/views/partials/wizard/content.blade.php b/resources/views/partials/wizard/content.blade.php
index fc161692b..0e7ffc823 100644
--- a/resources/views/partials/wizard/content.blade.php
+++ b/resources/views/partials/wizard/content.blade.php
@@ -13,6 +13,10 @@
         @yield('content')
 
     @stack('content_content_end')
+
     <notifications></notifications>
+
+    <form id="form-dynamic-component" method="POST" action="#"></form>
+
     <component v-bind:is="component"></component>
 @stack('content_end')
diff --git a/resources/views/partials/wizard/head.blade.php b/resources/views/partials/wizard/head.blade.php
index 32556dce4..753fcbc8c 100644
--- a/resources/views/partials/wizard/head.blade.php
+++ b/resources/views/partials/wizard/head.blade.php
@@ -3,8 +3,8 @@
 
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <!-- Tell the browser to be responsive to screen width -->
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8; charset=ISO-8859-1"/>
 
     <title>@yield('title') - @setting('company.name')</title>
 
@@ -30,6 +30,8 @@
 
     @stack('stylesheet')
 
+    @livewireStyles
+
     <script type="text/javascript"><!--
         var url = '{{ url("/") }}';
         var app_url = '{{ config("app.url") }}';
diff --git a/resources/views/partials/wizard/scripts.blade.php b/resources/views/partials/wizard/scripts.blade.php
index 6ac4539c7..5daf78cc5 100644
--- a/resources/views/partials/wizard/scripts.blade.php
+++ b/resources/views/partials/wizard/scripts.blade.php
@@ -11,4 +11,6 @@
     @stack('body_js')
 
     @stack('body_scripts')
+
+    @livewireScripts
 @stack('scripts_end')