diff --git a/app/assets/sass/partials/_base.scss b/app/assets/sass/partials/_base.scss
index c910f91d..7edfdb46 100644
--- a/app/assets/sass/partials/_base.scss
+++ b/app/assets/sass/partials/_base.scss
@@ -37,7 +37,7 @@ body.dashboard {
         }
     }
 
-    @media(min-width: $screen-sm-max) {
+    @media (min-width: $screen-sm-max) {
         .wrapper {
             padding-left: $sidebar-normal-width;
         }
diff --git a/app/assets/sass/partials/_sidebar.scss b/app/assets/sass/partials/_sidebar.scss
index d2c29766..365b74d0 100644
--- a/app/assets/sass/partials/_sidebar.scss
+++ b/app/assets/sass/partials/_sidebar.scss
@@ -178,7 +178,7 @@ body.dashboard {
         left: 0;
         top: 0;
         bottom: 0;
-        position: absolute;
+        position: fixed;
         margin-left: 228px;
         width: 22%;
         background: #fcfcfc;
@@ -227,8 +227,8 @@ body.dashboard {
         + .content-wrapper {
             top: 0;
             position: relative;
-            margin-left: 25%;
-            padding-right: 20px !important;
+            margin-left: 26%;
+            padding-right: 40px !important;
         }
 
     }
@@ -241,6 +241,7 @@ body.dashboard {
             width: 100%;
             + .content-wrapper {
                 margin-left: 0;
+                padding-left: 40px !important;
                 width: 100%;
             }
         }
@@ -251,6 +252,9 @@ body.dashboard {
         .sub-sidebar {
             margin-left: 80px;
             width: 25%;
+            + .content-wrapper {
+                padding-left: 45px !important;
+            }
         }
     }
 }
diff --git a/app/views/dashboard/settings/app-setup.blade.php b/app/views/dashboard/settings/app-setup.blade.php
index 59288af5..4156f186 100644
--- a/app/views/dashboard/settings/app-setup.blade.php
+++ b/app/views/dashboard/settings/app-setup.blade.php
@@ -6,11 +6,15 @@
         @include('partials.dashboard.sub-sidebar')
         @endif
         <div class="content-wrapper">
+            <div class="header sub-header" id="application-setup">
+                <span class="uppercase">
+                    {{ trans('dashboard.settings.app-setup.app-setup') }}
+                </span>
+            </div>
             <div class="row">
                 <div class="col-sm-12">
                     <form id="settings-form" name="SettingsForm" class="form-horizontal" role="form" action="/dashboard/settings" method="POST" enctype="multipart/form-data">
                         {{ Form::token() }}
-                        <h4 class="sub-header" id="application-setup">{{ trans('dashboard.settings.app-setup.app-setup') }}</h4>
                         @include('partials.dashboard.errors')
                         <fieldset>
                             <div class="row">
diff --git a/app/views/dashboard/settings/security.blade.php b/app/views/dashboard/settings/security.blade.php
index c02f9533..f33a403e 100644
--- a/app/views/dashboard/settings/security.blade.php
+++ b/app/views/dashboard/settings/security.blade.php
@@ -6,11 +6,15 @@
         @include('partials.dashboard.sub-sidebar')
         @endif
         <div class="content-wrapper">
+            <div class="header sub-header" id="security">
+                <span class="uppercase">
+                    {{ trans('dashboard.settings.security.security') }}
+                </span>
+            </div>
             <div class="row">
                 <div class="col-sm-12">
                     <form name="SettingsForm" class="form-horizontal" role="form" action="/dashboard/settings" method="POST">
                         {{ Form::token() }}
-                        <h4 class="sub-header" id="security">{{ trans('dashboard.settings.security.security') }}</h4>
                         @include('partials.dashboard.errors')
                         <fieldset>
                             <div class="row">
diff --git a/app/views/dashboard/settings/stylesheet.blade.php b/app/views/dashboard/settings/stylesheet.blade.php
index ccdf5a49..281b7249 100644
--- a/app/views/dashboard/settings/stylesheet.blade.php
+++ b/app/views/dashboard/settings/stylesheet.blade.php
@@ -6,11 +6,15 @@
         @include('partials.dashboard.sub-sidebar')
         @endif
         <div class="content-wrapper">
+            <div class="header sub-header" id="stylesheet">
+                <span class="uppercase">
+                    {{ trans('dashboard.settings.stylesheet.stylesheet') }}
+                </span>
+            </div>
             <div class="row">
                 <div class="col-sm-12">
                     <form name="SettingsForm" class="form-horizontal" role="form" action="/dashboard/settings" method="POST">
                         {{ Form::token() }}
-                        <h4 class="sub-header" id="stylesheet">{{ trans('dashboard.settings.stylesheet.stylesheet') }}</h4>
                         @include('partials.dashboard.errors')
                         <fieldset>
                             <div class="row">
diff --git a/app/views/dashboard/settings/theme.blade.php b/app/views/dashboard/settings/theme.blade.php
index cf5ba259..876ed7be 100644
--- a/app/views/dashboard/settings/theme.blade.php
+++ b/app/views/dashboard/settings/theme.blade.php
@@ -6,11 +6,15 @@
         @include('partials.dashboard.sub-sidebar')
         @endif
         <div class="content-wrapper">
+            <div class="header sub-header" id="theme">
+                <span class="uppercase">
+                    {{ trans('dashboard.settings.theme.theme') }}
+                </span>
+            </div>
             <div class="row">
                 <div class="col-sm-12">
                     <form name="SettingsForm" class="form-horizontal" role="form" action="/dashboard/settings" method="POST">
                         {{ Form::token() }}
-                        <h4 class="sub-header" id="theme">{{ trans('dashboard.settings.theme.theme') }}</h4>
                         @include('partials.dashboard.errors')
                         <fieldset>
                             <div class="row">