diff --git a/app/Http/Controllers/Admin/helpdesk/LanguageController.php b/app/Http/Controllers/Admin/helpdesk/LanguageController.php
index 8fc001c8d..858d58284 100644
--- a/app/Http/Controllers/Admin/helpdesk/LanguageController.php
+++ b/app/Http/Controllers/Admin/helpdesk/LanguageController.php
@@ -114,11 +114,11 @@ class LanguageController extends Controller
                         })
                         ->addColumn('Action', function ($model) use ($sysLanguage) {
                             if ($model === $sysLanguage) {
-                                return "<a href='change-language/".$model."' disabled><input type='button' class='btn btn-info btn-xs btn-flat' disabled value='".Lang::trans('lang.set_as_sys_lang')."'/></a>  
-                <a href='change-language/".$model."' class='btn btn-danger btn-xs btn-flat' disabled><i class='fa fa-trash' style='color:black;'> </i> ".Lang::trans('lang.delete').'</a>';
+                                return "<a href='change-language/".$model."' disabled><input type='button' class='btn btn-primary btn-xs' disabled value='".Lang::trans('lang.set_as_sys_lang')."'/></a>  
+                <button disabled class='btn btn-danger btn-xs'><i class='fas fa-trash'> </i> ".Lang::trans('lang.delete').'</button>';
                             } else {
-                                return "<a href='change-language/".$model."'><input type='button' class='btn btn-info btn-xs btn-flat' value='".Lang::trans('lang.set_as_sys_lang')."'/></a>  
-                <a href='delete-language/".$model."' class='btn btn-danger btn-xs btn-flat'><i class='fa fa-trash' style='color:black;'> </i> ".Lang::trans('lang.delete').'</a>';
+                                return "<a href='change-language/".$model."'><input type='button' class='btn btn-primary btn-xs' value='".Lang::trans('lang.set_as_sys_lang')."'/></a>  
+                <a href='delete-language/".$model."' class='btn btn-danger btn-xs'><i class='fas fa-trash'> </i> ".Lang::trans('lang.delete').'</a>';
                             }
                         })
                         ->searchColumns('language', 'id')
diff --git a/resources/views/themes/default1/admin/helpdesk/language/create.blade.php b/resources/views/themes/default1/admin/helpdesk/language/create.blade.php
index e203fe95c..a59758a83 100644
--- a/resources/views/themes/default1/admin/helpdesk/language/create.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/language/create.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('languages')
-class="active"
+class="nav-link active"
 @stop
 
 @section('HeadInclude')
@@ -29,63 +33,63 @@ class="active"
 @section('content')
 <!-- open a form -->
 {!! Form::open(array('url'=>'language/add' , 'method' => 'post', 'files'=>true) )!!}
-<div class="box box-primary">
-    <div class="box-header with-border">
-        <h3 class="box-title">{{Lang::get('lang.add-lang-package')}}</h3>
+@if(Session::has('success'))
+<div class="alert alert-success alert-dismissable">
+    <i class="fas fa-check-circle"></i>
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    <span>{{Session::get('success')}}</span>
+</div>
+@endif
+<!-- failure message -->
+@if(Session::has('fails'))
+<div class="alert alert-danger alert-dismissable">
+    <i class="fas fa-ban"></i>
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    {{Session::get('fails')}}
+    @if(Session::has('link'))
+    <a href="{{url(Session::get('link'))}}">{{Lang::get('lang.enable_lang')}}</a>
+    @endif
+    @if(Session::has('link2'))
+    <a href="{{url(Session::get('link2'))}}" target="blank">{{Lang::get('lang.read-more')}}</a>
+    @endif
+</div>
+@endif
+@if(Session::has('errors'))
+<?php //dd($errors); ?>
+<div class="alert alert-danger alert-dismissable">
+    <i class="fas fa-ban"></i>
+    <b>{!! Lang::get('lang.alert') !!}!</b>
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    <br/>
+    @if($errors->first('language-name'))
+    <li class="error-message-padding">{!! $errors->first('language-name', ':message') !!}</li>
+    @endif
+    @if($errors->first('iso-code'))
+    <li class="error-message-padding">{!! $errors->first('iso-code', ':message') !!}</li>
+    @endif
+    @if($errors->first('File'))
+    <li class="error-message-padding">{!! $errors->first('File', ':message') !!}</li>
+    @endif
+</div>
+@endif
+<div class="card card-light">
+    <div class="card-header">
+        <h3 class="card-title">{{Lang::get('lang.add-lang-package')}}</h3>
     </div>
-    <div class="box-body">
-        @if(Session::has('success'))
-        <div class="alert alert-success alert-dismissable">
-            <i class="fa  fa-check-circle"></i>
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            <p>{{Session::get('success')}}</p>
-        </div>
-        @endif
-        <!-- failure message -->
-        @if(Session::has('fails'))
-        <div class="alert alert-danger alert-dismissable">
-            <i class="fa fa-ban"></i>
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            {{Session::get('fails')}}
-            @if(Session::has('link'))
-            <a href="{{url(Session::get('link'))}}">{{Lang::get('lang.enable_lang')}}</a>
-            @endif
-            @if(Session::has('link2'))
-            <a href="{{url(Session::get('link2'))}}" target="blank">{{Lang::get('lang.read-more')}}</a>
-            @endif
-        </div>
-        @endif
-        @if(Session::has('errors'))
-        <?php //dd($errors); ?>
-        <div class="alert alert-danger alert-dismissable">
-            <i class="fa fa-ban"></i>
-            <b>{!! Lang::get('lang.alert') !!}!</b>
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            <br/>
-            @if($errors->first('language-name'))
-            <li class="error-message-padding">{!! $errors->first('language-name', ':message') !!}</li>
-            @endif
-            @if($errors->first('iso-code'))
-            <li class="error-message-padding">{!! $errors->first('iso-code', ':message') !!}</li>
-            @endif
-            @if($errors->first('File'))
-            <li class="error-message-padding">{!! $errors->first('File', ':message') !!}</li>
-            @endif
-        </div>
-        @endif
+    <div class="card-body">
         <div class="row">
             <!-- username -->
-            <div class="col-xs-4 form-group {{ $errors->has('language-name') ? 'has-error' : '' }}">
+            <div class="col-sm-4 form-group {{ $errors->has('language-name') ? 'has-error' : '' }}">
                 {!! Form::label('language-name',Lang::get('lang.language-name')) !!} <span class="text-red"> *</span>
                 {!! Form::text('language-name',null,['placeholder'=>'English','class' => 'form-control']) !!}
             </div>
-            <div class="col-xs-4 form-group {{ $errors->has('iso-code') ? 'has-error' : '' }}">
+            <div class="col-sm-4 form-group {{ $errors->has('iso-code') ? 'has-error' : '' }}">
                 {!! Form::label('iso-code',Lang::get('lang.iso-code')) !!} <span class="text-red"> *</span>
                 {!! Form::text('iso-code',null,['placeholder'=>'en','class' => 'form-control']) !!}
             </div>
         </div>
         <div class="row">
-            <div class="col-xs-4 form-group {{ $errors->has('File') ? 'has-error' : '' }}">
+            <div class="col-sm-4 form-group {{ $errors->has('File') ? 'has-error' : '' }}">
                 {!! Form::label('File',Lang::get('lang.file')) !!} <span class="text-red"> *</span>&nbsp
                 <div class="btn bg-olive btn-file" style="color:blue"> {!! Lang::get('lang.upload_file') !!}
                     {!! Form::file('File') !!}
@@ -93,8 +97,8 @@ class="active"
             </div>
         </div>
     </div>
-    <div class="box-footer">
-        {!! Form::submit(Lang::get('lang.submit'),['class'=>'form-group btn btn-primary'])!!}
+    <div class="card-footer">
+        {!! Form::submit(Lang::get('lang.submit'),['class'=>'btn btn-primary'])!!}
     </div>
 </div>
 @stop
\ No newline at end of file
diff --git a/resources/views/themes/default1/admin/helpdesk/language/index.blade.php b/resources/views/themes/default1/admin/helpdesk/language/index.blade.php
index 02c32b4cf..00c1acfe4 100644
--- a/resources/views/themes/default1/admin/helpdesk/language/index.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/language/index.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('languages')
-class="active"
+class="nav-link active"
 @stop
 
 @section('HeadInclude')
@@ -28,27 +32,33 @@ class="active"
 <!-- content -->
 
 @section('content')
-<div class="box box-primary">
-    <div class="box-header">
-        <h2 class="box-title">{{ Lang::get('lang.language-settings') }}</h2><span class="pull-right"><a href="{{route('download')}}" title="click here to download template file" class="btn btn-primary"><i class="fa fa-download"></i> {{Lang::get('lang.download')}} </a> <a href="{{route('add-language')}}" class="btn btn-primary "><i class="fa fa-plus"></i> {{Lang::get('lang.add')}}</a></span>
+<!-- check whether success or not -->
+@if(Session::has('success'))
+<div class="alert alert-success alert-dismissable">
+    <i class="fa  fa-check-circle"></i>
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    {{Session::get('success')}} @if(Session::has('link'))<a href="{{url(Session::get('link'))}}">{{Lang::get('lang.enable_lang')}}</a> @endif
+</div>
+@endif
+<!-- failure message -->
+@if(Session::has('fails'))
+<div class="alert alert-danger alert-dismissable">
+    <i class="fa fa-ban"></i>
+    <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('lang.language-settings') }}</h3>
+        <div class="card-tools">
+            <a href="{{route('download')}}" title="click here to download template file" class="btn btn-default btn-tool">
+                <i class="fas fa-download"></i> {{Lang::get('lang.download')}} 
+            </a> 
+            <a href="{{route('add-language')}}" class="btn btn-default btn-tool"><i class="fas fa-plus"></i> {{Lang::get('lang.add')}}</a>
+        </div>
     </div>
-    <div class="box-body">
-        <!-- check whether success or not -->
-        @if(Session::has('success'))
-        <div class="alert alert-success alert-dismissable">
-            <i class="fa  fa-check-circle"></i>
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            {{Session::get('success')}} @if(Session::has('link'))<a href="{{url(Session::get('link'))}}">{{Lang::get('lang.enable_lang')}}</a> @endif
-        </div>
-        @endif
-        <!-- failure message -->
-        @if(Session::has('fails'))
-        <div class="alert alert-danger alert-dismissable">
-            <i class="fa fa-ban"></i>
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            {{Session::get('fails')}}
-        </div>
-        @endif
+    <div class="card-body">
         {!! Datatable::table()
         ->addColumn(Lang::get('lang.language'),Lang::get('lang.native-name'),Lang::get('lang.iso-code'),Lang::get('lang.system-language'),Lang::get('lang.Action'))       // these are the column headings to be shown
         ->setUrl(route('getAllLanguages'))   // this is the route where data will be retrieved
diff --git a/resources/views/themes/default1/admin/helpdesk/settings/company.blade.php b/resources/views/themes/default1/admin/helpdesk/settings/company.blade.php
index 05bdd573d..fa133dead 100644
--- a/resources/views/themes/default1/admin/helpdesk/settings/company.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/settings/company.blade.php
@@ -1,15 +1,19 @@
 @extends('themes.default1.admin.layout.admin')
 <link href="{{asset("lb-faveo/css/faveo-css.css")}}" rel="stylesheet" type="text/css" />
 @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('company')
-class="active"
+class="nav-link active"
 @stop
 
 @section('HeadInclude')
@@ -29,50 +33,48 @@ class="active"
 @section('content')
 <!-- open a form -->
 {!! Form::model($companys,['url' => 'postcompany/'.$companys->id, 'method' => 'PATCH','files'=>true]) !!}
-<!-- <div class="form-group {{ $errors->has('company_name') ? 'has-error' : '' }}"> -->
-<!-- table  -->
-<div class="box box-primary">
-    <div class="box-header with-border">
-        <h3 class="box-title">{{Lang::get('lang.company_settings')}}</h3>
+<!-- check whether success or not -->
+@if(Session::has('success'))
+<div class="alert alert-success alert-dismissable">
+    <i class="fas fa-check-circle"></i>
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    {!!Session::get('success')!!}
+</div>
+@endif
+<!-- failure message -->
+@if(Session::has('fails'))
+<div class="alert alert-danger alert-dismissable">
+    <i class="fas fa-ban"></i>
+    <b>{!! Lang::get('lang.alert') !!}!</b>
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    {!!Session::get('fails')!!}
+</div>
+@endif
+
+@if(Session::has('errors'))
+<?php //dd($errors); ?>
+<div class="alert alert-danger alert-dismissable">
+    <i class="fas fa-ban"></i>
+    <b>{!! Lang::get('lang.alert') !!}!</b>
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    <br/>
+    @if($errors->first('company_name'))
+    <li class="error-message-padding">{!! $errors->first('company_name', ':message') !!}</li>
+    @endif
+    @if($errors->first('website'))
+    <li class="error-message-padding">{!! $errors->first('website', ':message') !!}</li>
+    @endif
+    @if($errors->first('phone'))
+    <li class="error-message-padding">{!! $errors->first('phone', ':message') !!}</li>
+    @endif
+</div>
+@endif
+<div class="card card-light">
+    <div class="card-header">
+        <h3 class="card-title">{{Lang::get('lang.company_settings')}}</h3>
     </div>
     <!-- Name text form Required -->
-    <div class="box-body">
-        <!-- check whether success or not -->
-        @if(Session::has('success'))
-        <div class="alert alert-success alert-dismissable">
-            <i class="fa  fa-check-circle"></i>
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            {!!Session::get('success')!!}
-        </div>
-        @endif
-        <!-- failure message -->
-        @if(Session::has('fails'))
-        <div class="alert alert-danger alert-dismissable">
-            <i class="fa fa-ban"></i>
-            <b>{!! Lang::get('lang.alert') !!}!</b>
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            {!!Session::get('fails')!!}
-        </div>
-        @endif
-
-        @if(Session::has('errors'))
-        <?php //dd($errors); ?>
-        <div class="alert alert-danger alert-dismissable">
-            <i class="fa fa-ban"></i>
-            <b>{!! Lang::get('lang.alert') !!}!</b>
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            <br/>
-            @if($errors->first('company_name'))
-            <li class="error-message-padding">{!! $errors->first('company_name', ':message') !!}</li>
-            @endif
-            @if($errors->first('website'))
-            <li class="error-message-padding">{!! $errors->first('website', ':message') !!}</li>
-            @endif
-            @if($errors->first('phone'))
-            <li class="error-message-padding">{!! $errors->first('phone', ':message') !!}</li>
-            @endif
-        </div>
-        @endif
+    <div class="card-body">
         <div class="row">
             <div class="col-md-4">
                 <!-- comapny name -->
@@ -95,13 +97,14 @@ class="active"
                     {!! Form::text('phone',$companys->phone,['class' => 'form-control']) !!}
                 </div>
             </div>
-            <div class="col-md-12">
-                <!-- comapny address -->
-                <div class="form-group {{ $errors->has('address') ? 'has-error' : '' }}">
-                    {!! Form::label('address',Lang::get('lang.address')) !!}
-                    {!! Form::textarea('address',$companys->address,['class' => 'form-control','size' => '30x5']) !!}
-                </div>
-            </div>
+        </div>
+
+         <div class="{{ $errors->has('address') ? 'has-error' : '' }}">
+            {!! Form::label('address',Lang::get('lang.address')) !!}
+            {!! Form::textarea('address',$companys->address,['class' => 'form-control','size' => '30x5']) !!}
+        </div>
+
+        <div class="row">
             <div class="col-md-2">
                 <!-- logo -->
                 {!! Form::label('logo',Lang::get('lang.logo')) !!}
@@ -109,40 +112,41 @@ class="active"
                     {!! Form::file('logo') !!}
                 </div>
             </div>
-            <div id="logo-display" style="display: block;">
-                @if($companys->logo != null)
-                <div class="col-md-2">
-                    {!! Form::checkbox('use_logo') !!} <label> {!! Lang::get('lang.use_logo') !!}</label>
+            <div class="col-sm-10">
+                <div id="logo-display" style="display: block;">
+                    <div class="row">
+                        @if($companys->logo != null)
+                        <div class="col-sm-2">
+                            {!! Form::checkbox('use_logo') !!} <label> {!! Lang::get('lang.use_logo') !!}</label>
+                        </div>
+                        @endif
+                        <?php $company = App\Model\helpdesk\Settings\Company::where('id', '=', '1')->first(); ?>
+                        @if($companys->logo != null)
+                        <div class="col-md-3 image" data-content="{{Lang::get('lang.click-delete')}}">
+                            <img src="{{asset('uploads/company')}}{{'/'}}{{$company->logo}}" alt="User Image" id="company-logo" width="100px" style="border:1px solid #DCD1D1" />
+                        </div>
+                        @endif
+                    </div>
                 </div>
-                @endif
-                <?php $company = App\Model\helpdesk\Settings\Company::where('id', '=', '1')->first(); ?>
-                @if($companys->logo != null)
-                <div class="col-md-2 image" data-content="{{Lang::get('lang.click-delete')}}">
-                    <img src="{{asset('uploads/company')}}{{'/'}}{{$company->logo}}" alt="User Image" id="company-logo" width="100px" style="border:1px solid #DCD1D1" />
-                </div>
-                @endif
             </div>
         </div>
     </div>
-    <div class="box-footer">
-        {!! Form::submit(Lang::get('lang.submit'),['class'=>'form-group btn btn-primary'])!!}
+    <div class="card-footer">
+        {!! Form::submit(Lang::get('lang.submit'),['class'=>'btn btn-primary'])!!}
     </div>
     <!-- Modal -->   
-    <div class="modal fade in" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="false" style="display: none; padding-right: 15px;background-color: rgba(0, 0, 0, 0.7);">
+    <div class="modal fade" id="myModal">
         <div class="modal-dialog" role="document">
-            <div class="col-md-2"></div>
-            <div class="col-md-8">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close closemodal" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
-                        <h4 class="modal-title" id="myModalLabel"></h4>
-                    </div>
-                    <div class="modal-body" id="custom-alert-body" >
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-primary pull-left yes" data-dismiss="modal"></button>
-                        <button type="button" class="btn btn-default no"></button>
-                    </div>
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h4 class="modal-title" id="myModalLabel"></h4>
+                    <button type="button" class="close closemodal" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+                </div>
+                <div class="modal-body" id="custom-alert-body" >
+                </div>
+                <div class="modal-footer justify-content-between">
+                    <button type="button" class="btn btn-primary yes" data-dismiss="modal"></button>
+                    <button type="button" class="btn btn-default no"></button>
                 </div>
             </div>
         </div>
@@ -151,14 +155,14 @@ class="active"
 <script type="text/javascript">
     $(document).ready(function() {
         $(".image").on("click", function() {
-            $("#myModal").css("display", "block");
+            $('#myModal').modal('show');
             $("#myModalLabel").html("{!! Lang::get('lang.delete-logo') !!}");
             $(".yes").html("{!! Lang::get('lang.yes') !!}");
             $(".no").html("{{Lang::get('lang.cancel')}}");
             $("#custom-alert-body").html("{{Lang::get('lang.confirm')}}");
         });
         $('.no,.closemodal').on("click", function() {
-            $("#myModal").css("display", "none");
+            $('#myModal').modal('hide');
         });
         $('.yes').on('click', function() {
             var src = $('#company-logo').attr('src').split('/');
@@ -175,9 +179,9 @@ class="active"
                     if (data == "true") {
                         var msg = "Logo deleted succesfully."
                         $("#logo-display").css("display", "none");
-                        $("#myModal").css("display", "none");
+                        $('#myModal').modal('hide');
                     } else {
-                        $("#myModal").css("display", "none");
+                        $('#myModal').modal('hide');
                     }
                 }
             });
diff --git a/resources/views/themes/default1/admin/helpdesk/settings/cron/cron-new.blade.php b/resources/views/themes/default1/admin/helpdesk/settings/cron/cron-new.blade.php
index ae51536aa..4bb0369d5 100644
--- a/resources/views/themes/default1/admin/helpdesk/settings/cron/cron-new.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/settings/cron/cron-new.blade.php
@@ -1,125 +1,143 @@
 {!! Form::model($emails,['url' => 'post-scheduler', 'method' => 'PATCH']) !!}
-<div class="box box-primary">
-    <div class="box-header with-border">
-        <h3 class="box-title">{{Lang::get('lang.cron_settings')}}</h3>
+@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($warn!=="")
+<div class="alert alert-warning alert-dismissable">
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    {!!$warn!!}
+</div>
+@endif
+<!-- check whether success or not -->
+@if(Session::has('success'))
+<div class="alert alert-success alert-dismissable">
+    <i class="fas  fa-check-circle"></i>
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    {!!Session::get('success')!!}
+</div>
+@endif
+<!-- failure message -->
+@if(Session::has('fails'))
+<div class="alert alert-danger alert-dismissable">
+    <i class="fas fa-ban"></i>
+    <b>{!! Lang::get('lang.alert') !!}!</b>
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    {!!Session::get('fails')!!}
+</div>
+@endif
+<!--        <div class="alert  alert-dismissable" style="background: #F3F3F3">
+    <i class="fa  fa-info-circle"></i>&nbsp;Please set this command in your cron
+    {!! $command !!}
+</div>-->
+
+<div class="card card-light">
+    <div class="card-header">
+        <h3 class="card-title">{{Lang::get('lang.cron_settings')}}</h3>
     </div>
 
-    <div class="box-body table-responsive"style="overflow:hidden;">
-        @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($warn!=="")
-        <div class="alert alert-warning alert-dismissable">
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            {!!$warn!!}
-        </div>
-        @endif
-        <!-- check whether success or not -->
-        @if(Session::has('success'))
-        <div class="alert alert-success alert-dismissable">
-            <i class="fa  fa-check-circle"></i>
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            {!!Session::get('success')!!}
-        </div>
-        @endif
-        <!-- failure message -->
-        @if(Session::has('fails'))
-        <div class="alert alert-danger alert-dismissable">
-            <i class="fa fa-ban"></i>
-            <b>{!! Lang::get('lang.alert') !!}!</b>
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            {!!Session::get('fails')!!}
-        </div>
-        @endif
-<!--        <div class="alert  alert-dismissable" style="background: #F3F3F3">
-            <i class="fa  fa-info-circle"></i>&nbsp;Please set this command in your cron
-            {!! $command !!}
-        </div>-->
-        
-         <div class="alert  alert-dismissable" style="background: #F3F3F3">
-            <i class="fa  fa-info-circle"></i>&nbsp;Please set this command in your cron
+    <div class="card-body">
+       
+        <div class="alert  alert-dismissable" style="background: #F3F3F3">
+            <i class="fas  fa-info-circle"></i>&nbsp;Please set this command in your cron
             {!! $shared !!}
         </div>
-        
+
         <div class="alert  alert-dismissable" style="background: #F3F3F3">
-            <i class="fa  fa-info-circle"></i>&nbsp;{!!Lang::get('lang.crone-url-message')!!}
+            <i class="fas fa-info-circle"></i>&nbsp;{!!Lang::get('lang.crone-url-message')!!}
             <a href="https://www.support.faveohelpdesk.com/show/cron-job-scheduling" style="color:black" target="blank">{!!Lang::get('lang.click')!!}</a> {!!Lang::get('lang.check-cron-set')!!}
         </div>
+        
+        <div class="row">
+            
+            <div class="col-md-6">
+                
+                <div class="info-box">
+                    <!-- Apply any bg-* class to to the icon to color it -->
+                    <span class="info-box-icon bg-info"><i class="fas fa-cloud-download-alt"></i></span>
+                    
+                    <div class="info-box-content">
+
+                        <div class="row">
+                            
+                            <div class="col-md-6">
+                                <div class="form-group">
+                                    {!! Form::label('email_fetching',Lang::get('lang.email_fetch')) !!}<br>
+                                    {!! Form::checkbox('email_fetching',1,$condition->checkActiveJob()['fetching'],['id'=>'email_fetching']) !!}&nbsp;{{Lang::get('lang.fetch_auto-corn')}}
+                                </div>
+
+                            </div>
+                            <div class="col-md-6" id="fetching">
+                                {!! Form::select('fetching-commands',$commands,$condition->getConditionValue('fetching')['condition'],['class'=>'form-control','id'=>'fetching-command']) !!}
+                                <div id='fetching-daily-at'>
+                                    {!! Form::text('fetching-dailyAt',$condition->getConditionValue('fetching')['at'],['class'=>'form-control']) !!}
+
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div><!-- /.info-box-content -->
+            </div><!-- /.info-box -->
+
         <div class="col-md-6">
+
             <div class="info-box">
                 <!-- Apply any bg-* class to to the icon to color it -->
-                <span class="info-box-icon bg-aqua"><i class="fa fa-cloud-download"></i></span>
+                <span class="info-box-icon bg-info"><i class="fas fa-cloud-upload-alt"></i></span>
                 <div class="info-box-content">
-
-                    <div class="col-md-6">
-                        <div class="form-group">
-                            {!! Form::label('email_fetching',Lang::get('lang.email_fetch')) !!}<br>
-                            {!! Form::checkbox('email_fetching',1,$condition->checkActiveJob()['fetching'],['id'=>'email_fetching']) !!}&nbsp;{{Lang::get('lang.fetch_auto-corn')}}
+                    <div class="row">
+                        <div class="col-md-6">
+                            <div class="form-group">
+                                {!! Form::label('notification_cron',Lang::get('lang.notification-email')) !!}<br>
+                                {!! Form::checkbox('notification_cron',1,$condition->checkActiveJob()['notification'],['id'=>'notification_cron']) !!}&nbsp;{{Lang::get('lang.cron_notification')}}
+                            </div>
                         </div>
-
-                    </div>
-                    <div class="col-md-6" id="fetching">
-                        {!! Form::select('fetching-commands',$commands,$condition->getConditionValue('fetching')['condition'],['class'=>'form-control','id'=>'fetching-command']) !!}
-                        <div id='fetching-daily-at'>
-                            {!! Form::text('fetching-dailyAt',$condition->getConditionValue('fetching')['at'],['class'=>'form-control']) !!}
-
+                        <div class="col-md-6" id="notification">
+                            {!! Form::select('notification-commands',$commands,$condition->getConditionValue('notification')['condition'],['class'=>'form-control','id'=>'notification-command']) !!}
+                            <div id='notification-daily-at'>
+                                {!! Form::text('notification-dailyAt',$condition->getConditionValue('notification')['at'],['class'=>'form-control']) !!}
+                            </div>
                         </div>
                     </div>
-                </div>
-            </div><!-- /.info-box-content -->
+                </div><!-- /.info-box-content -->
+            </div><!-- /.info-box -->
+        </div>            
+        </div>
 
-        </div><!-- /.info-box -->
-        <div class="col-md-6">
+        <div class="row">
+            <div class="col-md-6">
             <div class="info-box">
                 <!-- Apply any bg-* class to to the icon to color it -->
-                <span class="info-box-icon bg-aqua"><i class="fa fa-cloud-upload"></i></span>
+                <span class="info-box-icon bg-info"><i class="fas fa-check-circle"></i></span>
                 <div class="info-box-content">
-                    <div class="col-md-6">
-                        <div class="form-group">
-                            {!! Form::label('notification_cron',Lang::get('lang.notification-email')) !!}<br>
-                            {!! Form::checkbox('notification_cron',1,$condition->checkActiveJob()['notification'],['id'=>'notification_cron']) !!}&nbsp;{{Lang::get('lang.cron_notification')}}
+                    <div class="row">
+                        <div class="col-md-6">
+                            <div class="form-group">
+                                {!! Form::label('condition',Lang::get('lang.auto_close_workflow')) !!}<br>
+                                {!! Form::checkbox('condition',1,$condition->checkActiveJob()['work'],['id'=>'auto_close']) !!}
+                                       {{Lang::get('lang.enable_workflow')}}
+                            </div>
                         </div>
-                    </div>
-                    <div class="col-md-6" id="notification">
-                        {!! Form::select('notification-commands',$commands,$condition->getConditionValue('notification')['condition'],['class'=>'form-control','id'=>'notification-command']) !!}
-                        <div id='notification-daily-at'>
-                            {!! Form::text('notification-dailyAt',$condition->getConditionValue('notification')['at'],['class'=>'form-control']) !!}
+                        <div class="col-md-6" id="workflow">
+                            {!! Form::select('work-commands',$commands,$condition->getConditionValue('work')['condition'],['class'=>'form-control','id'=>'workflow-command']) !!}
+                            <div id='workflow-daily-at'>
+                                {!! Form::text('workflow-dailyAt',$condition->getConditionValue('work')['at'],['class'=>'form-control']) !!}
+                            </div>
                         </div>
                     </div>
                 </div><!-- /.info-box-content -->
             </div><!-- /.info-box -->
         </div>
-        <div class="col-md-6">
-            <div class="info-box">
-                <!-- Apply any bg-* class to to the icon to color it -->
-                <span class="info-box-icon bg-aqua"><i class="fa fa-check-circle"></i></span>
-                <div class="info-box-content">
-                    <div class="col-md-6">
-                        <div class="form-group">
-                            {!! Form::label('condition',Lang::get('lang.auto_close_workflow')) !!}<br>
-                            {!! Form::checkbox('condition',1,$condition->checkActiveJob()['work'],['id'=>'auto_close']) !!}
-                                   {{Lang::get('lang.enable_workflow')}}
-                        </div>
-                    </div>
-                    <div class="col-md-6" id="workflow">
-                        {!! Form::select('work-commands',$commands,$condition->getConditionValue('work')['condition'],['class'=>'form-control','id'=>'workflow-command']) !!}
-                        <div id='workflow-daily-at'>
-                            {!! Form::text('workflow-dailyAt',$condition->getConditionValue('work')['at'],['class'=>'form-control']) !!}
-                        </div>
-                    </div>
-                </div><!-- /.info-box-content -->
-            </div><!-- /.info-box -->
         </div>
 
     </div>
-    <div class="box-footer">
+    <div class="card-footer">
         {!! Form::submit(Lang::get('lang.submit'),['class'=>'btn btn-primary'])!!}
     </div>
 </div>
diff --git a/resources/views/themes/default1/admin/helpdesk/settings/cron/cron.blade.php b/resources/views/themes/default1/admin/helpdesk/settings/cron/cron.blade.php
index 596e40f1a..4b8c416b5 100644
--- a/resources/views/themes/default1/admin/helpdesk/settings/cron/cron.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/settings/cron/cron.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('cron')
-class="active"
+class="nav-link active"
 @stop
 
 @section('HeadInclude')
@@ -27,6 +31,20 @@ class="active"
 <!-- /breadcrumbs -->
 <!-- content -->
 @section('content')
+<style type="text/css">
+    pre{
+        background-color: #f5f5f5;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    color: #333;
+    display: block;
+    font-size: 13px;
+    line-height: 1.42857;
+    margin: 0 0 10px;
+    padding: 9.5px;
+    word-break: break-all;
+    }
+</style>
 <!-- open a form -->
 
 @if($warn!=="")
diff --git a/resources/views/themes/default1/admin/helpdesk/settings/notification.blade.php b/resources/views/themes/default1/admin/helpdesk/settings/notification.blade.php
index a49427a20..46b705d1f 100644
--- a/resources/views/themes/default1/admin/helpdesk/settings/notification.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/settings/notification.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('notification')
-class="active"
+class="nav-link active"
 @stop
 
 @section('HeadInclude')
@@ -28,60 +32,53 @@ class="active"
 <!-- content -->
 @section('content')
 <!-- open a form -->
-<div class="row">
-    <div class="col-md-12">
-        <div class="box box-primary">
-            <div class="box-header with-border">
-                <h3 class="box-title">{{Lang::get('lang.notification_settings')}}</h3>
+@if(Session::has('success'))
+<div class="alert alert-success alert-dismissable">
+    <i class="fa fa-check-circle"></i>
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    {!!Session::get('success')!!}
+</div>
+@endif
+<!-- failure message -->
+@if(Session::has('fails'))
+<div class="alert alert-danger alert-dismissable">
+    <i class="fa fa-ban"></i>
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    <b> {!! Lang::get('lang.alert') !!} ! </b>
+    <li class="error-message-padding">{!!Session::get('fails')!!}</li>
+</div>
+@endif
+<div class="card card-light">
+    <div class="card-header">
+        <h3 class="card-title">{{Lang::get('lang.notification_settings')}}</h3>
+    </div>
+    <!-- check whether success or not -->
+    <div class="card-body">
+
+        <div class="row">
+            <div class="col-md-3 no-padding">
+                <div class="form-group">
+                    {!! Form::label('del_noti', Lang::get('lang.delete_noti')) !!}
+                </div>
             </div>
-            <!-- check whether success or not -->
-            <div class="box-body table-responsive"style="overflow:hidden;">
-                @if(Session::has('success'))
-                <div class="alert alert-success alert-dismissable">
-                    <i class="fa fa-check-circle"></i>
-                    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-                    {!!Session::get('success')!!}
-                </div>
-                @endif
-                <!-- failure message -->
-                @if(Session::has('fails'))
-                <div class="alert alert-danger alert-dismissable">
-                    <i class="fa fa-ban"></i>
-                    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-                    <b> {!! Lang::get('lang.alert') !!} ! </b>
-                    <li class="error-message-padding">{!!Session::get('fails')!!}</li>
-                </div>
-                @endif
-                <div class="row">
-                    <!-- Default System Email:	DROPDOWN value from emails table : Required -->
-                    <div class="col-md-12">
-                        <div class="col-md-3 no-padding">
-                            <div class="form-group">
-                                {!! Form::label('del_noti', Lang::get('lang.delete_noti')) !!}
-                            </div>
-                        </div>
-                        <div class="col-md-6">
-                            <a href="{{ url('delete-read-notification') }}" class="btn btn-danger">{!! Lang::get('lang.del_all_read') !!}</a>
-                        </div>
-                    </div>
-                    <br>
-                    <div class="col-md-12">
-                        <div class="col-md-3 no-padding">
-                            <div class="form-group">
-                                {!! Form::label('del_noti', Lang::get('lang.noti_msg1')) !!}<span class="text-red"> *</span>
-                            </div>
-                        </div>
-                        <div class="col-md-6">
-                            <form action="{{ url('delete-notification-log') }}" method="post">
-                            {{ csrf_field() }}
-                                <div class="callout callout-default" style="font-style: oblique;">{!! Lang::get('lang.noti_msg2') !!}</div>
-                                <input type="number" class="form-control" name='no_of_days' placeholder="{!! lang::get('lang.enter_no_of_days') !!}" min='1'>
-                                <button type="submit" class="btn btn-primary">{!! Lang::get('lang.submit') !!}</button>
-                            </form>
-                        </div>
-                    </div>
+            <div class="col-md-6">
+                <a href="{{ url('delete-read-notification') }}" class="btn btn-danger">{!! Lang::get('lang.del_all_read') !!}</a>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-3 no-padding">
+                <div class="form-group">
+                    {!! Form::label('del_noti', Lang::get('lang.noti_msg1')) !!}<span class="text-red"> *</span>
                 </div>
             </div>
+            <div class="col-md-6">
+                <form action="{{ url('delete-notification-log') }}" method="post">
+                {{ csrf_field() }}
+                    <div class="callout callout-default" style="font-style: oblique;">{!! Lang::get('lang.noti_msg2') !!}</div>
+                    <input type="number" class="form-control" name='no_of_days' placeholder="{!! lang::get('lang.enter_no_of_days') !!}" min='1'>
+                    <button type="submit" class="btn btn-primary">{!! Lang::get('lang.submit') !!}</button>
+                </form>
+            </div>
         </div>
     </div>
 </div>
diff --git a/resources/views/themes/default1/admin/helpdesk/settings/security/index.blade.php b/resources/views/themes/default1/admin/helpdesk/settings/security/index.blade.php
index 68ecdeb47..429109fd9 100644
--- a/resources/views/themes/default1/admin/helpdesk/settings/security/index.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/settings/security/index.blade.php
@@ -1,11 +1,19 @@
 @extends('themes.default1.admin.layout.admin')
 
 @section('Settings')
-active
+class="nav-link active"
+@stop
+
+@section('settings-menu-parent')
+class="nav-item menu-open"
+@stop
+
+@section('settings-menu-open')
+class="nav nav-treeview menu-open"
 @stop
 
 @section('security')
-class="active"
+class="nav-link active"
 @stop
 
 @section('PageHeader')
@@ -16,43 +24,43 @@ class="active"
 @stop
 
 @section('content')
-<div class="box box-primary">
-    <div class="box-header with-border">
-        <h3 class="box-title">{!! Lang::get('lang.security_settings') !!}</h3>
-    </div><!-- /.box-header -->
-    <div class="box-body">
-        @if(Session::has('success'))
-        <div class="alert alert-success alert-dismissable">
-            <i class="fa fa-check-circle"></i>
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            {!! Session::get('success') !!}
-        </div>
-        @endif
-        @if(Session::has('failed'))
-        <div class="alert alert-danger alert-dismissable">
-            <i class="fa fa-ban"></i>
-            <b>{!! Lang::get('lang/alert') !!}!</b>
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            <p>{{Session::get('failed')}}</p>                
-        </div>
-        @endif
-        @if(Session::has('errors'))
-        <div class="alert alert-danger alert-dismissable">
-            <i class="fa fa-ban"></i>
-            <b>{!! Lang::get('lang.alert') !!}!</b>
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            <br/>
-            @if($errors->first('lockout_message'))
-            <li class="error-message-padding">{!! $errors->first('lockout_message', ':message') !!}</li>
-            @endif
-            @if($errors->first('backlist_threshold'))
-            <li class="error-message-padding">{!! $errors->first('backlist_threshold', ':message') !!}</li>
-            @endif
-            @if($errors->first('lockout_period'))
-            <li class="error-message-padding">{!! $errors->first('lockout_period', ':message') !!}</li>
-            @endif
-        </div>
-        @endif
+@if(Session::has('success'))
+<div class="alert alert-success alert-dismissable">
+    <i class="fas fa-check-circle"></i>
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    {!! Session::get('success') !!}
+</div>
+@endif
+@if(Session::has('failed'))
+<div class="alert alert-danger alert-dismissable">
+    <i class="fas fa-ban"></i>
+    <b>{!! Lang::get('lang/alert') !!}!</b>
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    <p>{{Session::get('failed')}}</p>                
+</div>
+@endif
+@if(Session::has('errors'))
+<div class="alert alert-danger alert-dismissable">
+    <i class="fas fa-ban"></i>
+    <b>{!! Lang::get('lang.alert') !!}!</b>
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    <br/>
+    @if($errors->first('lockout_message'))
+    <li class="error-message-padding">{!! $errors->first('lockout_message', ':message') !!}</li>
+    @endif
+    @if($errors->first('backlist_threshold'))
+    <li class="error-message-padding">{!! $errors->first('backlist_threshold', ':message') !!}</li>
+    @endif
+    @if($errors->first('lockout_period'))
+    <li class="error-message-padding">{!! $errors->first('lockout_period', ':message') !!}</li>
+    @endif
+</div>
+@endif
+<div class="card card-light">
+    <div class="card-header">
+        <h3 class="card-title">{!! Lang::get('lang.security_settings') !!}</h3>
+    </div><!-- /.card-header -->
+    <div class="card-body">
         {!! Form::model($security,['route'=>['securitys.update', $security->id],'method'=>'PATCH','files' => true]) !!}
         <div class="form-group {{ $errors->has('lockout_message') ? 'has-error' : '' }}">
             <div class="row">
@@ -87,8 +95,8 @@ class="active"
                 </div>
             </div>
         </div>
-    </div><!-- /.box-body -->
-    <div class="box-footer">
+    </div><!-- /.card-body -->
+    <div class="card-footer">
         <button type="submit" class="btn btn-primary">{!! lang::get('lang.submit') !!}</button>
     </div>
     {!! Form::close() !!}
diff --git a/resources/views/themes/default1/admin/helpdesk/settings/social-media/index.blade.php b/resources/views/themes/default1/admin/helpdesk/settings/social-media/index.blade.php
index 239c37137..c05d2ba00 100644
--- a/resources/views/themes/default1/admin/helpdesk/settings/social-media/index.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/settings/social-media/index.blade.php
@@ -1,22 +1,26 @@
 @extends('themes.default1.admin.layout.admin')
-<link href="{{asset("lb-faveo/css/faveo-css.css")}}" rel="stylesheet" type="text/css" />
+
 @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('social-login')
-class="active"
+class="nav-link active"
 @stop
 
 @section('HeadInclude')
 @stop
 <!-- header -->
 @section('PageHeader')
-<h2></h2>
+<h1>Social Media</h1>
 @stop
 <!-- /header -->
 <!-- breadcrumbs -->
@@ -26,136 +30,130 @@ class="active"
 </ol>
 @stop
 @section('content')
-<div class="box box-primary">
-    <div class="box-header with-border">
-        <h3 class="box-title">Social Media</h3>
+@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
+<!-- check whether success or not -->
+@if(Session::has('success'))
+<div class="alert alert-success alert-dismissable">
+    <i class="fas fa-check-circle"></i>
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    {!!Session::get('success')!!}
+</div>
+@endif
+<!-- failure message -->
+@if(Session::has('fails'))
+<div class="alert alert-danger alert-dismissable">
+    <i class="fas fa-ban"></i>
+    <b>{!! Lang::get('lang.alert') !!}!</b>
+    <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">Social Media</h3>
     </div>
 
-    <div class="box-body table-responsive">
-        @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
-        <!-- check whether success or not -->
-        @if(Session::has('success'))
-        <div class="alert alert-success alert-dismissable">
-            <i class="fa  fa-check-circle"></i>
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            {!!Session::get('success')!!}
-        </div>
-        @endif
-        <!-- failure message -->
-        @if(Session::has('fails'))
-        <div class="alert alert-danger alert-dismissable">
-            <i class="fa fa-ban"></i>
-            <b>{!! Lang::get('lang.alert') !!}!</b>
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            {!!Session::get('fails')!!}
-        </div>
-        @endif
-
+    <div class="card-body">
         <div class="row">
-            <div class="col-md-12">
-                <table class="table table-responsive table-hover">
-                    <thead>
-                        <tr>
-                            <th>Provider</th>
-                            <th>Status</th>
-                            <th>Action</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr>
-                            <td>Facebook</td>
-                            <td>
-                                @if($social->checkActive('facebook')===true)
-                                <span style="color: green">Active</span>
-                                @else 
-                                <span style="color: red">Inactive</span>
-                                @endif
-                            </td>
-                            <td>
-                                <a href="{{url('social/media/facebook')}}" class="btn btn-primary">Settings</a>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>Google</td>
-                            <td>
-                                @if($social->checkActive('google')===true)
-                                <span style="color: green">Active</span>
-                                @else 
-                                <span style="color: red">Inactive</span>
-                                @endif
-                            </td>
-                            <td>
-                                <a href="{{url('social/media/google')}}" class="btn btn-primary">Settings</a>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>Github</td>
-                            <td>
-                                @if($social->checkActive('github')===true)
-                                <span style="color: green">Active</span>
-                                @else 
-                                <span style="color: red">Inactive</span>
-                                @endif
-                            </td>
-                            <td>
-                                <a href="{{url('social/media/github')}}" class="btn btn-primary">Settings</a>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>Twitter</td>
-                            <td>
-                                @if($social->checkActive('twitter')===true)
-                                <span style="color: green">Active</span>
-                                @else 
-                                <span style="color: red">Inactive</span>
-                                @endif
-                            </td>
-                            <td>
-                                <a href="{{url('social/media/twitter')}}" class="btn btn-primary">Settings</a>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>Linkedin</td>
-                            <td>
-                                @if($social->checkActive('linkedin')===true)
-                                <span style="color: green">Active</span>
-                                @else 
-                                <span style="color: red">Inactive</span>
-                                @endif
-                            </td>
-                            <td>
-                                <a href="{{url('social/media/linkedin')}}" class="btn btn-primary">Settings</a>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>Bitbucket</td>
-                            <td>
-                                @if($social->checkActive('bitbucket')===true)
-                                <span style="color: green">Active</span>
-                                @else 
-                                <span style="color: red">Inactive</span>
-                                @endif
-                            </td>
-                            <td>
-                                <a href="{{url('social/media/bitbucket')}}" class="btn btn-primary">Settings</a>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-
-            </div>
+            <table class="table table-bordered table-striped">
+                <thead>
+                    <tr>
+                        <th>Provider</th>
+                        <th>Status</th>
+                        <th>Action</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>Facebook</td>
+                        <td>
+                            @if($social->checkActive('facebook')===true)
+                            <span style="color: green">Active</span>
+                            @else 
+                            <span style="color: red">Inactive</span>
+                            @endif
+                        </td>
+                        <td>
+                            <a href="{{url('social/media/facebook')}}" class="btn btn-primary">Settings</a>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Google</td>
+                        <td>
+                            @if($social->checkActive('google')===true)
+                            <span style="color: green">Active</span>
+                            @else 
+                            <span style="color: red">Inactive</span>
+                            @endif
+                        </td>
+                        <td>
+                            <a href="{{url('social/media/google')}}" class="btn btn-primary">Settings</a>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Github</td>
+                        <td>
+                            @if($social->checkActive('github')===true)
+                            <span style="color: green">Active</span>
+                            @else 
+                            <span style="color: red">Inactive</span>
+                            @endif
+                        </td>
+                        <td>
+                            <a href="{{url('social/media/github')}}" class="btn btn-primary">Settings</a>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Twitter</td>
+                        <td>
+                            @if($social->checkActive('twitter')===true)
+                            <span style="color: green">Active</span>
+                            @else 
+                            <span style="color: red">Inactive</span>
+                            @endif
+                        </td>
+                        <td>
+                            <a href="{{url('social/media/twitter')}}" class="btn btn-primary">Settings</a>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Linkedin</td>
+                        <td>
+                            @if($social->checkActive('linkedin')===true)
+                            <span style="color: green">Active</span>
+                            @else 
+                            <span style="color: red">Inactive</span>
+                            @endif
+                        </td>
+                        <td>
+                            <a href="{{url('social/media/linkedin')}}" class="btn btn-primary">Settings</a>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Bitbucket</td>
+                        <td>
+                            @if($social->checkActive('bitbucket')===true)
+                            <span style="color: green">Active</span>
+                            @else 
+                            <span style="color: red">Inactive</span>
+                            @endif
+                        </td>
+                        <td>
+                            <a href="{{url('social/media/bitbucket')}}" class="btn btn-primary">Settings</a>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
         </div>
-
     </div>
-
 </div>
 @stop
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 75750208d..b970f0dbf 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
@@ -1,22 +1,26 @@
 @extends('themes.default1.admin.layout.admin')
-<link href="{{asset("lb-faveo/css/faveo-css.css")}}" rel="stylesheet" type="text/css" />
+
 @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('social-login')
-class="active"
+class="nav-link active"
 @stop
 
 @section('HeadInclude')
 @stop
 <!-- header -->
 @section('PageHeader')
-<h3>Social media settings</h3>
+<h1>Social media settings</h1>
 @stop
 <!-- /header -->
 <!-- breadcrumbs -->
@@ -27,77 +31,76 @@ class="active"
 @stop
 @section('content')
 {!! Form::open(['url' => 'social/media/'.$provider, 'method' => 'POST']) !!}
-<div class="box box-primary">
-    <div class="box-header with-border">
-        <h3 class="box-title">{{ucfirst($provider)}}</h3>
+@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
+
+<!-- check whether success or not -->
+@if(Session::has('warn'))
+<div class="alert alert-warning alert-dismissable">
+    <i class="fas fa-check-circle"></i>
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    {!!Session::get('warn')!!}
+</div>
+@endif
+@if(Session::has('success'))
+<div class="alert alert-success alert-dismissable">
+    <i class="fas fa-check-circle"></i>
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    {!!Session::get('success')!!}
+</div>
+@endif
+<!-- failure message -->
+@if(Session::has('fails'))
+<div class="alert alert-danger alert-dismissable">
+    <i class="fas fa-ban"></i>
+    <b>{!! Lang::get('lang.alert') !!}!</b>
+    <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">{{ucfirst($provider)}}</h3>
     </div>
 
-    <div class="box-body table-responsive">
-        @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
-        
-        <!-- check whether success or not -->
-        @if(Session::has('warn'))
-        <div class="alert alert-warning alert-dismissable">
-            <i class="fa  fa-check-circle"></i>
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            {!!Session::get('warn')!!}
-        </div>
-        @endif
-        @if(Session::has('success'))
-        <div class="alert alert-success alert-dismissable">
-            <i class="fa  fa-check-circle"></i>
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            {!!Session::get('success')!!}
-        </div>
-        @endif
-        <!-- failure message -->
-        @if(Session::has('fails'))
-        <div class="alert alert-danger alert-dismissable">
-            <i class="fa fa-ban"></i>
-            <b>{!! Lang::get('lang.alert') !!}!</b>
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            {!!Session::get('fails')!!}
-        </div>
-        @endif
-
+    <div class="card-body">
         <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')) !!}
-                    {!! $errors->first('client_id', '<spam class="help-block">:message</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')) !!}
-                    {!! $errors->first('client_secret', '<spam class="help-block">:message</spam>') !!}
                     {!! Form::text('client_secret',$social->getvalueByKey($provider,'client_secret'),['class' => 'form-control']) !!}
+                     {!! $errors->first('client_secret', '<spam class="help-block">:message</spam>') !!}
                 </div>
             </div>
+        </div> 
+        <div class="row">
             <div class="col-md-6">
                 <div class="form-group {{ $errors->has('redirect') ? 'has-error' : '' }}">
                     {!! Form::label('redirect',Lang::get('lang.redirect')) !!}
-                    {!! $errors->first('redirect', '<spam class="help-block">:message</spam>') !!}
                     {!! Form::text('redirect',$social->getvalueByKey($provider,'redirect'),['class' => 'form-control']) !!}
+                    {!! $errors->first('redirect', '<spam class="help-block">:message</spam>') !!}
                 </div>
             </div>
             <div class="col-md-6">
                 <div class="form-group {{ $errors->has('status') ? 'has-error' : '' }}">
                     <div class="row">
                         <div class="col-md-12">
-                            {!! Form::label('status',Lang::get('lang.status')) !!}
-                            {!! $errors->first('status', '<spam class="help-block">:message</spam>') !!}
-                            
+                            {!! Form::label('status',Lang::get('lang.status')) !!} 
                         </div>
                         <div class="col-md-6">
                             <p>{!! Form::radio('status',1,$social->checkActive($provider))!!} Active</p>
@@ -108,14 +111,14 @@ class="active"
                         <div class="col-md-12">
                             <i>Activate login via {{ucfirst($provider)}}</i>
                         </div>
+                         {!! $errors->first('status', '<spam class="help-block">:message</spam>') !!}
                     </div>
                 </div>
             </div>
-
         </div>
 
     </div>
-    <div class="box-footer">
+    <div class="card-footer">
         {!! Form::submit(Lang::get('lang.submit'),['class'=>'btn btn-primary'])!!}
     </div>
 </div>
diff --git a/resources/views/themes/default1/admin/helpdesk/settings/system.blade.php b/resources/views/themes/default1/admin/helpdesk/settings/system.blade.php
index 2157cc3c4..5ded2377e 100644
--- a/resources/views/themes/default1/admin/helpdesk/settings/system.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/settings/system.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('system')
-class="active"
+class="nav-link active"
 @stop
 
 @section('HeadInclude')
@@ -29,49 +33,49 @@ class="active"
 @section('content')
 <!-- open a form -->
 {!! Form::model($systems,['url' => 'postsystem/'.$systems->id, 'method' => 'PATCH' , 'id'=>'formID']) !!}
-<div class="box box-primary">
-    <div class="box-header with-border">
-        <h3 class="box-title">{{Lang::get('lang.system-settings')}}</h3> 
+<!-- check whether success or not -->
+@if(Session::has('success'))
+<div class="alert alert-success alert-dismissable">
+    <i class="fas fa-check-circle"></i>
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    {!!Session::get('success')!!}
+</div>
+@endif
+<!-- failure message -->
+@if(Session::has('fails'))
+<div class="alert alert-danger alert-dismissable">
+    <i class="fas fa-ban"></i><button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    <b>{!! Lang::get('lang.alert') !!}!</b><br/>
+    <li class="error-message-padding">{!!Session::get('fails')!!}</li>
+</div>
+@endif
+@if(Session::has('errors'))
+<?php //dd($errors); ?>
+<div class="alert alert-danger alert-dismissable">
+    <i class="fas fa-ban"></i>
+    <b>{!! Lang::get('lang.alert') !!}!</b>
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    <br/>
+    @if($errors->first('user_name'))
+    <li class="error-message-padding">{!! $errors->first('user_name', ':message') !!}</li>
+    @endif
+    @if($errors->first('first_name'))
+    <li class="error-message-padding">{!! $errors->first('first_name', ':message') !!}</li>
+    @endif
+    @if($errors->first('last_name'))
+    <li class="error-message-padding">{!! $errors->first('last_name', ':message') !!}</li>
+    @endif
+    @if($errors->first('email'))
+    <li class="error-message-padding">{!! $errors->first('email', ':message') !!}</li>
+    @endif
+</div>
+@endif
+<div class="card card-light">
+    <div class="card-header">
+        <h3 class="card-title">{{Lang::get('lang.system-settings')}}</h3> 
     </div>
     <!-- Helpdesk Status: radio Online Offline -->
-    <div class="box-body">
-        <!-- check whether success or not -->
-        @if(Session::has('success'))
-        <div class="alert alert-success alert-dismissable">
-            <i class="fa fa-check-circle"></i>
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            {!!Session::get('success')!!}
-        </div>
-        @endif
-        <!-- failure message -->
-        @if(Session::has('fails'))
-        <div class="alert alert-danger alert-dismissable">
-            <i class="fa fa-ban"></i><button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            <b>{!! Lang::get('lang.alert') !!}!</b><br/>
-            <li class="error-message-padding">{!!Session::get('fails')!!}</li>
-        </div>
-        @endif
-        @if(Session::has('errors'))
-        <?php //dd($errors); ?>
-        <div class="alert alert-danger alert-dismissable">
-            <i class="fa fa-ban"></i>
-            <b>{!! Lang::get('lang.alert') !!}!</b>
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            <br/>
-            @if($errors->first('user_name'))
-            <li class="error-message-padding">{!! $errors->first('user_name', ':message') !!}</li>
-            @endif
-            @if($errors->first('first_name'))
-            <li class="error-message-padding">{!! $errors->first('first_name', ':message') !!}</li>
-            @endif
-            @if($errors->first('last_name'))
-            <li class="error-message-padding">{!! $errors->first('last_name', ':message') !!}</li>
-            @endif
-            @if($errors->first('email'))
-            <li class="error-message-padding">{!! $errors->first('email', ':message') !!}</li>
-            @endif
-        </div>
-        @endif
+    <div class="card-body">
         <div class="row">
            
             <!-- Helpdesk Name/Title: text Required   -->
@@ -113,10 +117,10 @@ class="active"
                 <div class="form-group">
                     {!! Form::label('status',Lang::get('lang.status')) !!}
                     <div class="row">
-                        <div class="col-xs-5">
+                        <div class="col-sm-5">
                             {!! Form::radio('status','1',true) !!} {{Lang::get('lang.online')}}
                         </div>
-                        <div class="col-xs-6">
+                        <div class="col-sm-6">
                             {!! Form::radio('status','0') !!} {{Lang::get('lang.offline')}}
                         </div>
                     </div>
@@ -126,10 +130,10 @@ class="active"
                 <div class="form-group">
                     {!! Form::label('user_set_ticket_status',Lang::get('lang.user_set_ticket_status')) !!}
                     <div class="row">
-                        <div class="col-xs-5">
+                        <div class="col-sm-5">
                             <input type="radio" name="user_set_ticket_status" value="0" @if($common_setting->status == '0')checked="true" @endif>&nbsp;{{Lang::get('lang.no')}}
                         </div>
-                        <div class="col-xs-6">
+                        <div class="col-sm-6">
                             <input type="radio" name="user_set_ticket_status" value="1" @if($common_setting->status == '1')checked="true" @endif>&nbsp;{{Lang::get('lang.yes')}}
                         </div>
                     </div>
@@ -141,7 +145,7 @@ class="active"
                 <div class="form-group">
                     {!! Form::label('status',Lang::get('lang.rtl')) !!}
                     <div class="row">
-                        <div class="col-xs-12">
+                        <div class="col-sm-12">
                             <?php
                             $rtl = App\Model\helpdesk\Settings\CommonSettings::where('option_name', '=', 'enable_rtl')->first();
                             ?>
@@ -154,10 +158,10 @@ class="active"
                 <div class="form-group">
                     {!! Form::label('send_otp',Lang::get('lang.allow_unverified_users_to_create_ticket')) !!}
                     <div class="row">
-                        <div class="col-xs-5">
+                        <div class="col-sm-5">
                             <input type="radio" name="send_otp" value="0" @if($send_otp->status == '0')checked="true" @endif>&nbsp;{{Lang::get('lang.yes')}}
                         </div>
-                        <div class="col-xs-6">
+                        <div class="col-sm-6">
                             <input type="radio" name="send_otp" value="1" @if($send_otp->status == '1')checked="true" @endif>&nbsp;{{Lang::get('lang.no')}}
                         </div>
                     </div>
@@ -167,10 +171,10 @@ class="active"
                 <div class="form-group">
                     {!! Form::label('email_mandatory',Lang::get('lang.make-email-mandatroy')) !!}
                     <div class="row">
-                        <div class="col-xs-5">
+                        <div class="col-sm-5">
                             <input type="radio" name="email_mandatory" value="1" @if($email_mandatory->status == '1')checked="true" @endif>&nbsp;{{Lang::get('lang.yes')}}
                         </div>
-                        <div class="col-xs-6">
+                        <div class="col-sm-6">
                             <input type="radio" name="email_mandatory" value="0" @if($email_mandatory->status == '0')checked="true" @endif>&nbsp;{{Lang::get('lang.no')}}
                         </div>
                     </div>
@@ -180,7 +184,7 @@ class="active"
             
         </div>
     </div>
-    <div class="box-footer">
+    <div class="card-footer">
         {!! Form::submit(Lang::get('lang.submit'),['onclick'=>'sendForm()','class'=>'btn btn-primary'])!!}
     </div>
 </div>
diff --git a/resources/views/themes/default1/admin/layout/admin.blade.php b/resources/views/themes/default1/admin/layout/admin.blade.php
index d3ab96783..bcf280eaa 100644
--- a/resources/views/themes/default1/admin/layout/admin.blade.php
+++ b/resources/views/themes/default1/admin/layout/admin.blade.php
@@ -310,7 +310,7 @@
             <aside class="main-sidebar elevation-4 sidebar-dark-orange">
 
                 <a href="http://www.faveohelpdesk.com" class="brand-link navbar-orange" style="text-align: center;">
-                    <img src="{{ asset('lb-faveo/media/images/logo.png')}}" class="brand-image" alt="Company Log0" style="opacity: .8">
+                    <img src="{{ asset('lb-faveo/media/images/logo.png')}}" class="brand-image" alt="Company Log0">
                 </a>
 
                 <!-- sidebar: style can be found in sidebar.less -->
@@ -536,14 +536,14 @@
                                 </ul>
                             </li>
 
-                            <li class="nav-item">
+                            <li @yield('settings-menu-parent') class="nav-item">
                                 
                                 <a href="#" @yield('Settings') class="nav-link">
                                     <i class="nav-icon fas fa-cog"></i>
                                     <p>{!! Lang::get('lang.settings') !!} <i class="fas fa-angle-left right"></i></p>
                                 </a>
                                 
-                                <ul class="nav nav-treeview">
+                                <ul @yield('settings-menu-open') class="nav nav-treeview">
 
                                     <li class="nav-item">
                                         <a href="{{url('getcompany')}}" @yield('company') class="nav-link">
@@ -593,13 +593,6 @@
                                             <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/layout/agent.blade.php b/resources/views/themes/default1/agent/layout/agent.blade.php
index 211681aae..f3c28e5f0 100644
--- a/resources/views/themes/default1/agent/layout/agent.blade.php
+++ b/resources/views/themes/default1/agent/layout/agent.blade.php
@@ -345,7 +345,7 @@
             <aside class="main-sidebar elevation-4 sidebar-dark-lightblue">
 
                 <a href="http://www.faveohelpdesk.com" class="brand-link navbar-lightblue" style="text-align: center;">
-                    <img src="{{ asset('lb-faveo/media/images/logo.png')}}" class="brand-image" alt="Company Log0" style="opacity: .8">
+                    <img src="{{ asset('lb-faveo/media/images/logo.png')}}" class="brand-image" alt="Company Log0">
                 </a>
 
                 <div class="sidebar">