diff --git a/public/css/custom.css b/public/css/custom.css
index 2bb69d92f..729435bb6 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -833,6 +833,12 @@ table .align-items-center td span.badge {
         padding-right: 0;
         padding-top: 1.5rem;
     }
+
+    .el-range-editor.el-input__inner
+    {
+        width: 100% !important;
+        margin-top: 1rem;
+    }
 }
 /*--Xs Breakpoint Finish--*/
 
diff --git a/public/css/element.css b/public/css/element.css
index 3a7f8fbed..d8f740aac 100644
--- a/public/css/element.css
+++ b/public/css/element.css
@@ -15595,7 +15595,7 @@
 
 .el-range-editor.el-input__inner
 {
-    width: 55% !important;
+    width: 55%;
     align-items: baseline !important;
 }
 
diff --git a/resources/views/partials/admin/header.blade.php b/resources/views/partials/admin/header.blade.php
index 0a400a0d9..17580eded 100644
--- a/resources/views/partials/admin/header.blade.php
+++ b/resources/views/partials/admin/header.blade.php
@@ -3,11 +3,11 @@
         <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">
                             @yield('new_button')
 
diff --git a/resources/views/settings/company/edit.blade.php b/resources/views/settings/company/edit.blade.php
index 1fd32fd4c..a46b79ebe 100644
--- a/resources/views/settings/company/edit.blade.php
+++ b/resources/views/settings/company/edit.blade.php
@@ -34,7 +34,7 @@
 
         @permission('update-settings-settings')
             <div class="card-footer">
-                <div class="float-right">
+                <div class="row float-right">
                     {{ Form::saveButtons('settings.index') }}
                 </div>
             </div>
diff --git a/resources/views/settings/modules/edit.blade.php b/resources/views/settings/modules/edit.blade.php
index b248de289..0b7ef03e8 100644
--- a/resources/views/settings/modules/edit.blade.php
+++ b/resources/views/settings/modules/edit.blade.php
@@ -41,13 +41,11 @@
             </div>
 
             @permission('update-' . $module->getAlias() . '-settings')
-            <div class="card-footer">
-                <div class="float-right">
-                    <div class="row">
+                <div class="card-footer">
+                    <div class="row float-right">
                         {{ Form::saveButtons('settings.index') }}
                     </div>
                 </div>
-            </div>
             @endpermission
 
         {!! Form::close() !!}