diff --git a/app/FaveoStorage/Controllers/SettingsController.php b/app/FaveoStorage/Controllers/SettingsController.php
index 31d057b2e..f5637cc79 100644
--- a/app/FaveoStorage/Controllers/SettingsController.php
+++ b/app/FaveoStorage/Controllers/SettingsController.php
@@ -15,16 +15,17 @@ class SettingsController extends Controller
 {
     public function settingsIcon()
     {
+
         return ' <div class="col-md-2 col-sm-6">
                     <div class="settingiconblue">
                         <div class="settingdivblue">
                             <a href="'.url('storage').'">
                                 <span class="fa-stack fa-2x">
-                                    <i class="fa fa-save fa-stack-1x"></i>
+                                    <i class="fas fa-save fa-stack-1x"></i>
                                 </span>
                             </a>
                         </div>
-                        <p class="box-title" >'.Lang::get('storage::lang.storage').'</p>
+                        <div class="text-center text-sm">'.Lang::get('storage::lang.storage').'</div>
                     </div>
                 </div>';
     }
diff --git a/app/FaveoStorage/views/settings.blade.php b/app/FaveoStorage/views/settings.blade.php
index ba5b0d5e9..e5372e139 100644
--- a/app/FaveoStorage/views/settings.blade.php
+++ b/app/FaveoStorage/views/settings.blade.php
@@ -1,15 +1,19 @@
 @extends('themes.default1.admin.layout.admin')
 
 @section('Settings')
-active
+class="nav-link active"
 @stop
 
-@section('settings-bar')
-active
+@section('settings-menu-parent')
+class="nav-item menu-open"
+@stop
+
+@section('settings-menu-open')
+class="nav nav-treeview menu-open"
 @stop
 
 @section('storage')
-class="active"
+class="nav-link active"
 @stop
 
 @section('PageHeader')
@@ -19,40 +23,43 @@ class="active"
 @section('HeadInclude')
 @stop
 @section('content')
-<div class="box box-primary">
 
-    <div class="box-header with-border">
-        <h4> {{Lang::get('storage::lang.storage')}} </h4>
-        @if (count($errors) > 0)
-        <div class="alert alert-danger">
-            <strong>Whoops!</strong> There were some problems with your input.<br><br>
-            <ul>
-                @foreach ($errors->all() as $error)
-                <li>{{ $error }}</li>
-                @endforeach
-            </ul>
-        </div>
-        @endif
+ @if (count($errors) > 0)
+<div class="alert alert-danger">
+    <strong>Whoops!</strong> There were some problems with your input.<br><br>
+    <ul>
+        @foreach ($errors->all() as $error)
+        <li>{{ $error }}</li>
+        @endforeach
+    </ul>
+</div>
+@endif
 
-        @if(Session::has('success'))
-        <div class="alert alert-success alert-dismissable">
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            {{Session::get('success')}}
-        </div>
-        @endif
-        <!-- fail message -->
-        @if(Session::has('fails'))
-        <div class="alert alert-danger alert-dismissable">
-            <i class="fa fa-ban"></i>
-            <b>{{Lang::get('message.alert')}}!</b> {{Lang::get('message.failed')}}.
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            {{Session::get('fails')}}
-        </div>
-        @endif
+@if(Session::has('success'))
+<div class="alert alert-success alert-dismissable">
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    {{Session::get('success')}}
+</div>
+@endif
+<!-- fail message -->
+@if(Session::has('fails'))
+<div class="alert alert-danger alert-dismissable">
+    <i class="fa fa-ban"></i>
+    <b>{{Lang::get('message.alert')}}!</b> {{Lang::get('message.failed')}}.
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    {{Session::get('fails')}}
+</div>
+@endif
+
+<div class="card card-light">
+
+    <div class="card-header">
+        <h3 class="card-title"> {{Lang::get('storage::lang.storage')}} </h3>
+       
         {!! Form::open(['url'=>'storage','method'=>'post']) !!}
     </div><!-- /.box-header -->
     <!-- /.box-header -->
-    <div class="box-body">
+    <div class="card-body">
         <div class="row">
             <div class="form-group col-md-8 {{ $errors->has('default') ? 'has-error' : '' }}">
                 {!! Form::label('default',Lang::get('storage::lang.default')) !!}
@@ -106,7 +113,7 @@ class="active"
         </div>
         <!-- /.box-body -->
     </div>
-    <div class="box-footer">
+    <div class="card-footer">
         {!! Form::submit('Save',['class'=>'btn btn-success']) !!}
         {!! Form::close() !!}
     </div>
diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php
index 4719644db..cd02c98cc 100644
--- a/resources/lang/en/lang.php
+++ b/resources/lang/en/lang.php
@@ -533,7 +533,7 @@ return [
     'priority'          => 'Priority',
     'last_updated'      => 'Last updated',
     'create_help_topic' => 'Create help topic',
-    'action'            => 'Action',
+    'action'            => 'Actions',
     /*
       |--------------------------------------
       |  Help Topic Create Page
diff --git a/resources/views/themes/default1/admin/helpdesk/setting.blade.php b/resources/views/themes/default1/admin/helpdesk/setting.blade.php
index 0bccce185..8b92e02b8 100644
--- a/resources/views/themes/default1/admin/helpdesk/setting.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/setting.blade.php
@@ -511,7 +511,7 @@
                             </span>
                         </a>
                     </div>
-                    <div class="text-center text-sm">{!! Lang::get('lang.notification') !!}</div>
+                    <div class="text-center text-sm">{!! Lang::get('lang.notifications') !!}</div>
                 </div>
             </div>
             
diff --git a/resources/views/themes/default1/admin/helpdesk/settings/social-media/settings.blade.php b/resources/views/themes/default1/admin/helpdesk/settings/social-media/settings.blade.php
index b970f0dbf..746172b99 100644
--- a/resources/views/themes/default1/admin/helpdesk/settings/social-media/settings.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/settings/social-media/settings.blade.php
@@ -75,14 +75,14 @@ class="nav-link active"
         <div class="row">
             <div class="col-md-6">
                 <div class="form-group {{ $errors->has('client_id') ? 'has-error' : '' }}">
-                    {!! Form::label('client_id',Lang::get('lang.client_id')) !!}
+                    {!! Form::label('client_id',Lang::get('lang.client_id')) !!}<spam class="help-block"> *</spam>
                     {!! Form::text('client_id',$social->getvalueByKey($provider,'client_id'),['class' => 'form-control']) !!}
                     {!! $errors->first('client_id', '<spam class="help-block">:message</spam>') !!}
                 </div>
             </div>
             <div class="col-md-6">
                 <div class="form-group {{ $errors->has('client_secret') ? 'has-error' : '' }}">
-                    {!! Form::label('client_secret',Lang::get('lang.client_secret')) !!}
+                    {!! Form::label('client_secret',Lang::get('lang.client_secret')) !!}<spam class="help-block"> *</spam>
                     {!! Form::text('client_secret',$social->getvalueByKey($provider,'client_secret'),['class' => 'form-control']) !!}
                      {!! $errors->first('client_secret', '<spam class="help-block">:message</spam>') !!}
                 </div>
diff --git a/resources/views/themes/default1/admin/layout/admin.blade.php b/resources/views/themes/default1/admin/layout/admin.blade.php
index a6b78ad70..645ee2354 100644
--- a/resources/views/themes/default1/admin/layout/admin.blade.php
+++ b/resources/views/themes/default1/admin/layout/admin.blade.php
@@ -66,6 +66,22 @@
              .nav-sidebar .nav-header:not(:first-of-type) {
                 padding: 0.5rem;
             }
+
+           .has-error label {
+                color: #dd4b39 !important;
+            }
+
+            .has-error .form-control {
+                border-color: #dd4b39 !important;
+                box-shadow: none;
+            }
+
+            .btn.disabled, .btn[disabled], fieldset[disabled] .btn {
+                box-shadow: none;
+                cursor: not-allowed;
+                opacity: 0.65;
+                pointer-events: none;
+            }
         </style>
     </head>
     <body class="skin-yellow sidebar-mini layout-fixed layout-navbar-fixed text-sm">
@@ -370,7 +386,7 @@
 
                                     <li class="nav-item">
                                         <a href="{{ url('groups') }}" @yield('groups') class="nav-link">
-                                            <i class="nav-icon fas fa-users"></i>
+                                            <i class="nav-icon fas fa-object-group"></i>
                                             <p>{!! Lang::get('lang.groups') !!}</p>
                                         </a>
                                     </li>
@@ -593,6 +609,13 @@
                                             <p>{!! Lang::get('lang.notifications') !!}</p>
                                         </a>
                                     </li>
+
+                                    <li class="nav-item">
+                                        <a href="{{url('storage')}}" @yield('storage') class="nav-link">
+                                            <i class="nav-icon fas fa-save"></i>
+                                            <p>{!! Lang::get('storage::lang.storage') !!}</p>
+                                        </a>
+                                    </li>
                                 </ul>
                             </li>
 
diff --git a/resources/views/themes/default1/agent/helpdesk/organization/show.blade.php b/resources/views/themes/default1/agent/helpdesk/organization/show.blade.php
index 9bdc8ee8a..4d080e22d 100644
--- a/resources/views/themes/default1/agent/helpdesk/organization/show.blade.php
+++ b/resources/views/themes/default1/agent/helpdesk/organization/show.blade.php
@@ -102,7 +102,7 @@ class="nav-link active"
 
                         <label>{!! Lang::get('lang.address') !!}</label> 
                         <br>
-                        <center>{!! $orgs->address !!}</center>
+                        {!! $orgs->address !!}
                     </li>
                     @endif
 
@@ -111,7 +111,7 @@ class="nav-link active"
 
                         <label>{!! Lang::get('lang.internal_notes') !!}</label> 
                         <br>
-                        <center>{!! $orgs->internal_notes !!}</center>
+                        {!! $orgs->internal_notes !!}
                     </li>
                     @endif
                 </ul>
diff --git a/resources/views/themes/default1/agent/layout/agent.blade.php b/resources/views/themes/default1/agent/layout/agent.blade.php
index a2da5c8c3..37ed45ea3 100644
--- a/resources/views/themes/default1/agent/layout/agent.blade.php
+++ b/resources/views/themes/default1/agent/layout/agent.blade.php
@@ -71,6 +71,22 @@
              .nav-sidebar .nav-header:not(:first-of-type) {
                 padding: 0.5rem;
             }
+
+            .has-error label {
+                color: #dd4b39 !important;
+            }
+
+            .has-error .form-control {
+                border-color: #dd4b39 !important;
+                box-shadow: none;
+            }
+
+            .btn.disabled, .btn[disabled], fieldset[disabled] .btn {
+                box-shadow: none;
+                cursor: not-allowed;
+                opacity: 0.65;
+                pointer-events: none;
+            }
         </style>
     </head>
     
diff --git a/resources/views/vendor/Chumper/template.blade.php b/resources/views/vendor/Chumper/template.blade.php
index 00714902b..137e99d06 100644
--- a/resources/views/vendor/Chumper/template.blade.php
+++ b/resources/views/vendor/Chumper/template.blade.php
@@ -1,4 +1,4 @@
-<table id="{!! $id !!}" class="{!! $class !!}" style="width:100%">
+<table id="{!! $id !!}" class="{!! $class !!}" style="width:100%;display:block !important;">
     <colgroup>
         @for ($i = 0; $i < count($columns); $i++)
         <col class="con{!! $i !!}" />