diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php
index 74447d614..3e0ea1119 100644
--- a/app/Http/Controllers/Agent/helpdesk/TicketController.php
+++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php
@@ -2768,7 +2768,7 @@ class TicketController extends Controller
                             return "<div class='tooltip1' id='tool".$tickets->id."'>
                             <a href='".route('ticket.thread', [$tickets->id])."'>".$string."&nbsp;<span style='color:green'>".$thread_count."</span>
                             </a> <span><i style='color:green' title='".Lang::get('lang.ticket_created_source', ['source' => $source])."' class='".$css."'></i></span>".$collabString.$attachString.$due.$tooltip_script.
-                                    "<span class='tooltiptext' id='tooltip".$tickets->id."' style='height:auto;width:300px;background-color:#fff;color:black;border-radius:3px;border:2px solid gainsboro;position:absolute;z-index:1;top:150%;left:50%;margin-left:-23px;word-wrap:break-word;'>".Lang::get('lang.loading').'</span></div>';
+                                    "<span class='tooltiptext' id='tooltip".$tickets->id."' style='height:auto;width:300px;height:200px;overflow:scroll;background-color:#fff;color:black;border-radius:3px;border:2px solid gainsboro;position:absolute;z-index:1;top:150%;left:50%;margin-left:-23px;word-wrap:break-word;padding:10px;'>".Lang::get('lang.loading').'</span></div>';
                         })
                         ->editColumn('ticket_number', function ($tickets) {
                             return "<a href='".route('ticket.thread', [$tickets->id])."' class='$".ucfirst($tickets->priority)."*' title='".Lang::get('lang.click-here-to-see-more-details')."'>#".$tickets->ticket_number.'</a>';
diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php
index d117821b6..244020d2c 100644
--- a/resources/lang/en/lang.php
+++ b/resources/lang/en/lang.php
@@ -1646,4 +1646,5 @@ return [
     'ticket-has-x-priority'                        => 'This ticket has :priority priority',
     'clean-forever'                                => 'delete permanently',
     'mail-sent-to-job-for-process'                 => 'Mail has been sent to job for process, it will appear in your mailbox once it gets processed by your selected queue service. If you don\'t recieve the mail check logs for errors or warnings.',
+    'click-here-to-see-more-details' => 'Click here to see more details',
 ];
diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/tickets.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/tickets.blade.php
index 7395cbfcf..75bc6e50b 100644
--- a/resources/views/themes/default1/agent/helpdesk/ticket/tickets.blade.php
+++ b/resources/views/themes/default1/agent/helpdesk/ticket/tickets.blade.php
@@ -8,6 +8,10 @@ class="nav-link active"
 active
 @stop
 
+@section('dept-ticket-bar')
+class="nav-link active"
+@stop
+
 @section('ticket')
 class="active"
 @stop
diff --git a/resources/views/themes/default1/agent/helpdesk/user/profile-edit.blade.php b/resources/views/themes/default1/agent/helpdesk/user/profile-edit.blade.php
index a2a78ca1b..ab0a567a7 100644
--- a/resources/views/themes/default1/agent/helpdesk/user/profile-edit.blade.php
+++ b/resources/views/themes/default1/agent/helpdesk/user/profile-edit.blade.php
@@ -1,7 +1,7 @@
 @extends('themes.default1.agent.layout.agent')
 
 @section('Dashboard')
-class="active"
+class="nav-link active"
 @stop
 
 @section('dashboard-bar')
@@ -9,7 +9,7 @@ active
 @stop
 
 @section('profile')
-class="active"
+class="nav-link active"
 @stop
 
 @section('PageHeader')
@@ -17,49 +17,67 @@ class="active"
 @stop
 
 @section('content')
+
+@if(Session::has('success1'))
+<div class="alert alert-success alert-dismissable">
+    <i class="fas fa-check-circle"></i>
+    <b>Success</b>
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    {{Session::get('success1')}}
+</div>
+@endif
+<!-- fail message -->
+@if(Session::has('fails1'))
+<div class="alert alert-danger alert-dismissable">
+    <i class="fas fa-ban"></i>
+    <b>Fail!</b>
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    {{Session::get('fails1')}}
+</div>
+@endif
+@if(Session::has('success'))
+<div class="alert alert-success alert-dismissable">
+    <i class="fas fa-check-circle"></i>
+    <b>Success</b>
+    <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="fas fa-ban"></i>
+    <b>Fail!</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('first_name'))
+    <li class="error-message-padding">{!! $errors->first('first_name', ':message') !!}</li>
+    @endif
+    @if($errors->first('mobile'))
+    <li class="error-message-padding">{!! $errors->first('mobile', ':message') !!}</li>
+    @endif
+</div>
+@endif
 <div class="row">
     <div class="col-md-6">
         {!! Form::model($user,['url'=>'agent-profile', 'id' => 'agent-profile', 'method' => 'PATCH','files'=>true]) !!}
-        <div class="box box-primary">
-            <div class="box-header with-border">
-                <h3 class="box-title">
+        <div class="card card-light">
+            <div class="card-header">
+                <h3 class="card-title">
                     {!! Lang::get('lang.profile') !!}
                 </h3>
             </div>
-            <div class="box-body">
-                @if(Session::has('success'))
-                <div class="alert alert-success alert-dismissable">
-                    <i class="fa fa-ban"></i>
-                    <b>Success</b>
-                    <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>Fail!</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('first_name'))
-                    <li class="error-message-padding">{!! $errors->first('first_name', ':message') !!}</li>
-                    @endif
-                    @if($errors->first('mobile'))
-                    <li class="error-message-padding">{!! $errors->first('mobile', ':message') !!}</li>
-                    @endif
-                </div>
-                @endif
+            <div class="card-body">
                 <!-- first name -->
                 <div class="form-group {{ $errors->has('first_name') ? 'has-error' : '' }}">
                     {!! Form::label('first_name',Lang::get('lang.first_name')) !!} <span class="text-red"> *</span>
@@ -74,10 +92,10 @@ class="active"
                 <div class="form-group">
                     {!! Form::label('gender',Lang::get('lang.gender')) !!}
                     <div class="row">
-                        <div class="col-xs-3">
+                        <div class="col-sm-3">
                             {!! Form::radio('gender','1',true) !!} {{Lang::get('lang.male')}}
                         </div>
-                        <div class="col-xs-3">
+                        <div class="col-sm-3">
                             {!! Form::radio('gender','0') !!} {{Lang::get('lang.female')}}
                         </div>
                     </div>
@@ -96,16 +114,16 @@ class="active"
                 </div>
                 <div class="row">
                     <!-- phone extension -->
-                    <div class="col-xs-2 form-group {{ Session::has('country_code_error') ? 'has-error' : '' }}">
+                    <div class="col-sm-2 form-group {{ Session::has('country_code_error') ? 'has-error' : '' }}">
                         {!! Form::label('country_code',Lang::get('lang.country-code')) !!}
                         {!! Form::text('country_code',null,['class' => 'form-control', 'placeholder' => $phonecode, 'title' => Lang::get('lang.enter-country-phone-code'), 'id' => 'code']) !!}
                     </div>
                     <!-- phone number -->
-                    <div class="col-xs-8 form-group {{ $errors->has('phone_number') ? 'has-error' : '' }}">
+                    <div class="col-sm-8 form-group {{ $errors->has('phone_number') ? 'has-error' : '' }}">
                         {!! Form::label('phone_number',Lang::get('lang.phone')) !!}
                         {!! Form::text('phone_number',null,['class' => 'form-control']) !!}
                     </div>
-                    <div class="col-xs-2 form-group {{ $errors->has('ext') ? 'has-error' : '' }}">
+                    <div class="col-sm-2 form-group {{ $errors->has('ext') ? 'has-error' : '' }}">
                         {!! Form::label('ext',Lang::get('lang.ext')) !!}
                         {!! Form::text('ext',null,['class' => 'form-control']) !!}
                     </div>
@@ -123,79 +141,62 @@ class="active"
                     <!-- profile pic -->
                     <div type="file" class="btn btn-default btn-file" style="color:orange">
                         <i class="fa fa-user"> </i>
-                        {!! Form::label('profile_pic',Lang::get('lang.profile_pic')) !!}
+                        {!! Form::label('profile_pic',Lang::get('lang.profile_pic'),['style'=>'font-weight:400;margin-bottom:0px;']) !!}
                         {!! Form::file('profile_pic',['class' => 'form-file']) !!}
                     </div>  
                 </div>
                 {!! Form::token() !!}
                 {!! Form::close() !!}
             </div>
-            <div class="box-footer">
-                {!! Form::submit(Lang::get('lang.update'),['class'=>'form-group btn btn-primary'])!!}
+            <div class="card-footer">
+                {!! Form::submit(Lang::get('lang.update'),['class'=>'btn btn-primary'])!!}
             </div>
         </div>
     </div>
     <div class="col-md-6">
         {!! Form::model($user,['url'=>'agent-profile-password/'.$user->id , 'method' => 'PATCH']) !!}
-        <div class="box box-primary">
-            <div class="box-header with-border">
-                <h4 class="box-title">{!! Lang::get('lang.change_password') !!}</h4> 
+        <div class="card card-light">
+            <div class="card-header">
+                <h3 class="card-title">{!! Lang::get('lang.change_password') !!}</h3> 
             </div>
-            <div class="box-body">
-                @if(Session::has('success1'))
-                <div class="alert alert-success alert-dismissable">
-                    <i class="fa fa-ban"></i>
-                    <b>Success</b>
-                    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-                    {{Session::get('success1')}}
-                </div>
-                @endif
-                <!-- fail message -->
-                @if(Session::has('fails1'))
-                <div class="alert alert-danger alert-dismissable">
-                    <i class="fa fa-ban"></i>
-                    <b>Fail!</b>
-                    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-                    {{Session::get('fails1')}}
-                </div>
-                @endif
+            <div class="card-body pb-0">
                 <!-- old password -->
                 <div class="form-group has-feedback {{ $errors->has('old_password') ? 'has-error' : '' }}">
                     {!! Form::label('old_password',Lang::get('lang.old_password')) !!} <span class="text-red"> *</span>
                     {!! Form::password('old_password',['class' => 'form-control']) !!}
                     {!! $errors->first('old_password', '<spam class="help-block">:message</spam>') !!}
-                    <span class="glyphicon glyphicon-lock form-control-feedback"></span>
+                    <span class="glyphicon glyphicon-lock form-control-feedback" style="float: right;top: -46px;left: -10px;"></span>
                 </div>
                 <!-- new password -->
                 <div class="form-group has-feedback {{ $errors->has('new_password') ? 'has-error' : '' }}">
                     {!! Form::label('new_password',Lang::get('lang.new_password')) !!} <span class="text-red"> *</span>
                     {!! Form::password('new_password',['class' => 'form-control']) !!}
                     {!! $errors->first('new_password', '<spam class="help-block">:message</spam>') !!}
-                    <span class="glyphicon glyphicon-lock form-control-feedback"></span>
+                    <span class="glyphicon glyphicon-lock form-control-feedback" style="float: right;top: -46px;left: -10px;"></span>
                 </div>
                 <!-- confirm password -->
                 <div class="form-group has-feedback {{ $errors->has('confirm_password') ? 'has-error' : '' }}">
                     {!! Form::label('confirm_password',Lang::get('lang.confirm_password')) !!} <span class="text-red"> *</span>
                     {!! Form::password('confirm_password',['class' => 'form-control']) !!}
                     {!! $errors->first('confirm_password', '<spam class="help-block">:message</spam>') !!}
-                    <span class="glyphicon glyphicon-lock form-control-feedback"></span>
+                    <span class="glyphicon glyphicon-lock form-control-feedback" style="float: right;top: -46px;left: -10px;"></span>
                 </div>
             </div>
-            <div class="box-footer">
-                {!! Form::submit(Lang::get('lang.update'),['class'=>'form-group btn btn-primary'])!!}
+            <div class="card-footer">
+                {!! Form::submit(Lang::get('lang.update'),['class'=>'btn btn-primary'])!!}
             </div>
         </div>
     </div>
 </div>
 {!! Form::close() !!}
 <!-- Modal for last step of setting -->
-<div class="modal fade in" id="last-modal" 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="last-modal">
     <div class="modal-dialog" role="document">
         <div class="col-md-2"></div>
         <div class="col-md-12" style="height:40%">
             <div class="modal-content">
                 <div class="modal-header">
-                    <span style="font-size:1.2em">{{Lang::get('lang.verify-number')}}</span> 
+                    <h4 class="modal-title">{{Lang::get('lang.verify-number')}}</h4> 
                     <button type="button" class="close closemodal" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
                 </div>
                 <div class="modal-body">
@@ -228,9 +229,9 @@ class="active"
                         </div>
                     </div>
                 </div>
-                <div class="modal-footer">
-                    <button type="button" id="close-last" class="btn btn-default closemodal pull-left">{{Lang::get('lang.close')}}</button>
-                    <div id="last-submit"><input  type="submit" id="merge-btn" class="btn btn-primary pull-right" value="{!! Lang::get('lang.verify') !!}"></input></div>
+                <div class="modal-footer justify-content-between">
+                    <button type="button" id="close-last" class="btn btn-default closemodal">{{Lang::get('lang.close')}}</button>
+                    <div id="last-submit"><input  type="submit" id="merge-btn" class="btn btn-primary" value="{!! Lang::get('lang.verify') !!}"></input></div>
                 </div>
                 {!! Form::close() !!}
             </div>
diff --git a/resources/views/themes/default1/agent/helpdesk/user/profile.blade.php b/resources/views/themes/default1/agent/helpdesk/user/profile.blade.php
index e893349e9..09bd18a32 100644
--- a/resources/views/themes/default1/agent/helpdesk/user/profile.blade.php
+++ b/resources/views/themes/default1/agent/helpdesk/user/profile.blade.php
@@ -1,7 +1,7 @@
 @extends('themes.default1.agent.layout.agent')
 
 @section('Dashboard')
-class="active"
+class="nav-link active"
 @stop
 
 @section('dashboard-bar')
@@ -17,31 +17,35 @@ class="active"
 @stop
 
 @section('profileimg')
-<img src="{{Auth::user()->profile_pic}}" class="img-circle" alt="User Image" width="100%"/>
+<img src="{{Auth::user()->profile_pic}}" id="sidebar-profile-img" class="img-circle elevation-2" alt="User Image" width="auto" height="auto" />
 @stop
 
 @section('content')
-<div class="box box-primary">
-    <div class="box-header with-border">
-        <h3 class="box-title"><b>{!! Lang::get('lang.profile') !!}</b>&nbsp;&nbsp;<a href="{{URL::route('agent-profile-edit')}}"><i class="fa fa-fw fa-edit"> </i></a></h3>
-        @if(Session::has('success'))
-        <br><br>
-        <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
-        <!-- fail 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('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
+<!-- fail 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 card-light">
+    <div class="card-header">
+        <h3 class="card-title">{!! Lang::get('lang.profile') !!}&nbsp;&nbsp;
+            <a href="{{URL::route('agent-profile-edit')}}"><i class="fas fa-fw fa-edit"> </i></a>
+        </h3>
     </div>
+
     <?php
     if ($user->primary_dpt) {
         $dept = App\Model\helpdesk\Agent\Department::where('id', '=', $user->primary_dpt)->first();
@@ -62,46 +66,59 @@ class="active"
         $timezone = "";
     }
     ?>
-    <div class="row">
-        <div class="col-md-6">
-            <div class="box-header  with-border">
-                <h3 class="box-title"><b>{!! Lang::get('lang.user_information') !!}</b></h3>
-            </div>
-            <div class="box-body">
-                <div class="form-group row">
-                    @if($user->gender == 1)
-                    <div class='col-xs-4'><label>{!! Lang::get('lang.gender') !!}:</label></div> <div class='col-xs-7'>{{ 'Male' }}</div>
-                    @else
-                    <div class='col-xs-4'><label>{!! Lang::get('lang.gender') !!}:</label></div> <div class='col-xs-7'>{{ 'Female' }}</div>
-                    @endif
-                </div>
-                <div class="form-group  row">
-                    <div class='col-xs-4'><label>{!! Lang::get('lang.department') !!}:</label></div> <div class='col-xs-7'> {{ $dept }}</div>
-                </div>
-                <div class="form-group  row">
-                    <div class='col-xs-4'><label>{!! Lang::get('lang.group') !!}:</label></div> <div class='col-xs-7'> {{ $grp }}</div>
-                </div>
-                <div class="form-group  row">
-                    <div class='col-xs-4'><label>{!! Lang::get('lang.company') !!}:</label></div> <div class='col-xs-7'> {{ $user->company }}</div>
-                </div>
-                <div class="form-group  row">
-                    <div class='col-xs-4'><label>{!! Lang::get('lang.role') !!}:</label></div> <div class='col-xs-7'>  {{ $user->role }}</div>
+    
+    <div class="card-body">
+        
+        <div class="row">
+            <div class="col-md-6">
+                
+                <div class="card card-light">
+                    
+                    <div class="card-header">
+                        <h3 class="card-title">{!! Lang::get('lang.user_information') !!}</h3>
+                    </div>
+                    <div class="card-body">
+                        <div class="form-group row">
+                            @if($user->gender == 1)
+                            <div class='col-sm-4'><label>{!! Lang::get('lang.gender') !!}:</label></div> <div class='col-sm-7'>{{ 'Male' }}</div>
+                            @else
+                            <div class='col-sm-4'><label>{!! Lang::get('lang.gender') !!}:</label></div> <div class='col-sm-7'>{{ 'Female' }}</div>
+                            @endif
+                        </div>
+                        <div class="form-group  row">
+                            <div class='col-sm-4'><label>{!! Lang::get('lang.department') !!}:</label></div> <div class='col-sm-7'> {{ $dept }}</div>
+                        </div>
+                        <div class="form-group  row">
+                            <div class='col-sm-4'><label>{!! Lang::get('lang.group') !!}:</label></div> <div class='col-sm-7'> {{ $grp }}</div>
+                        </div>
+                        <div class="form-group  row">
+                            <div class='col-sm-4'><label>{!! Lang::get('lang.company') !!}:</label></div> <div class='col-sm-7'> {{ $user->company }}</div>
+                        </div>
+                        <div class="form-group  row">
+                            <div class='col-sm-4'><label>{!! Lang::get('lang.role') !!}:</label></div> <div class='col-sm-7'>  {{ $user->role }}</div>
+                        </div>
+                    </div>
                 </div>
             </div>
-        </div>
-        <div class="col-md-6">
-            <div class="box-header  with-border">
-                <h3 class="box-title"><b>{!! Lang::get('lang.contact_information') !!}</b></h3>
-            </div>
-            <div class="box-body">
-                <div class="form-group row">
-                    <div class='col-xs-4'><label>{!! Lang::get('lang.email') !!}:</label></div> <div class='col-xs-7'> {{ $user->email }}</div>
-                </div>
-                <div class="form-group row">
-                    <div class='col-xs-4'><label>{!! Lang::get('lang.phone_number') !!}:</label></div> <div class='col-xs-7'> {{ $user->ext }}{{ $user->phone_number }}</div>
-                </div>
-                <div class="form-group row">
-                    <div class='col-xs-4'><label>{!! Lang::get('lang.mobile') !!}:</label></div> <div class='col-xs-7'> {{ $user->mobile }}</div>
+
+            <div class="col-md-6">
+                
+                <div class="'card card-light">
+                    
+                    <div class="card-header">
+                        <h3 class="card-title">{!! Lang::get('lang.contact_information') !!}</h3>
+                    </div>
+                    <div class="card-body">
+                        <div class="form-group row">
+                            <div class='col-sm-4'><label>{!! Lang::get('lang.email') !!}:</label></div> <div class='col-sm-7'> {{ $user->email }}</div>
+                        </div>
+                        <div class="form-group row">
+                            <div class='col-sm-4'><label>{!! Lang::get('lang.phone_number') !!}:</label></div> <div class='col-sm-7'> {{ $user->ext }}{{ $user->phone_number }}</div>
+                        </div>
+                        <div class="form-group row">
+                            <div class='col-sm-4'><label>{!! Lang::get('lang.mobile') !!}:</label></div> <div class='col-sm-7'> {{ $user->mobile }}</div>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/resources/views/themes/default1/agent/layout/agent.blade.php b/resources/views/themes/default1/agent/layout/agent.blade.php
index c65806362..3f43f3627 100644
--- a/resources/views/themes/default1/agent/layout/agent.blade.php
+++ b/resources/views/themes/default1/agent/layout/agent.blade.php
@@ -352,7 +352,9 @@
         
                     <div class="user-panel mt-3 pb-3 mb-3 d-flex">
                         @if (trim($__env->yieldContent('profileimg')))
-                        <h1>@yield('profileimg')</h1>
+                        <div class="image">
+                            @yield('profileimg')
+                        </div>
                         @else
                        <div class="image">
 
@@ -375,40 +377,40 @@
                             @yield('sidebar')
                             <li class="nav-header">{!! Lang::get('lang.Tickets') !!}</li>
 
-                            <li @yield('inbox') class="nav-item">
-                                <a href="{{ url('tickets')}}" id="load-inbox" class="nav-link">
+                            <li class="nav-item">
+                                <a href="{{ url('tickets')}}" id="load-inbox" @yield('inbox') class="nav-link">
                                     <i class="fas fa-envelope"></i> 
                                     <p>{!! Lang::get('lang.inbox') !!}</p> 
                                     <small class="right badge badge-success">{{$tickets -> count()}}</small>
                                 </a>
                             </li>
 
-                            <li @yield('myticket') class="nav-item">
-                                <a href="{{url('/tickets?show=mytickets')}}" id="load-myticket" class="nav-link">
+                            <li class="nav-item">
+                                <a href="{{url('/tickets?show=mytickets')}}" id="load-myticket" @yield('myticket') class="nav-link">
                                     <i class="fas fa-user"></i> 
                                     <p>{!! Lang::get('lang.my_tickets') !!} </p>
                                     <small class="right badge badge-success">{{$myticket -> count()}}</small>
                                 </a>
                             </li>
 
-                            <li @yield('unassigned') class="nav-item">
-                                 <a href="{{url('/tickets?assigned[]=0')}}" id="load-unassigned" class="nav-link">
+                            <li class="nav-item">
+                                 <a href="{{url('/tickets?assigned[]=0')}}" id="load-unassigned" @yield('unassigned')  class="nav-link">
                                     <i class="fas fa-th"></i> 
                                     <p>{!! Lang::get('lang.unassigned') !!}</p>
                                     <small class="right badge badge-success">{{$unassigned -> count()}}</small>
                                 </a>
                             </li>
 
-                            <li @yield('overdue') class="nav-item">
-                                 <a href="{{url('/tickets?show=overdue')}}" id="load-unassigned" class="nav-link">
+                            <li class="nav-item">
+                                 <a href="{{url('/tickets?show=overdue')}}" id="load-unassigned" @yield('overdue') class="nav-link">
                                     <i class="fas fa-calendar-times"></i> 
                                     <p>{!! Lang::get('lang.overdue') !!}</p>
                                     <small class="right badge badge-success">{{$overdues->count()}}</small>
                                 </a>
                             </li>
 
-                            <li @yield('trash') class="nav-item">
-                                 <a href="{{url('/tickets?show=trash')}}" class="nav-link">
+                            <li class="nav-item">
+                                 <a href="{{url('/tickets?show=trash')}}" @yield('trash') class="nav-link">
                                     <i class="fas fa-trash"></i> 
                                     <p>{!! Lang::get('lang.trash') !!}</p>
                                     <small class="right badge badge-success">{{$deleted -> count()}}</small>
@@ -440,9 +442,9 @@
 
                             @foreach($department as $name=>$dept)
 
-                            <li class="nav-item @if($dept2 === $name) @yield('ticket-bar') @endif ">
+                            <li class="nav-item">
                                 
-                                <a href="#" class="nav-link">
+                                <a href="#" @if($dept2 === $name) @yield('ticket-bar') @endif class="nav-link">
                                     <i class="nav-icon fas fa-folder-open"></i>
                                     <p>{!! $name !!}<i class="right fas fa-angle-left"></i></p>
                                 </a>
@@ -452,8 +454,8 @@
 
                                 <ul class="nav nav-treeview">
 
-                                    <li class="nav-item" @if($status2 == $dept->get($status)->status && $dept2 === $name) @yield('inbox') @endif>
-                                        <a href="{!! url('tickets?departments='.$name.'&status='.$dept->get($status)->status) !!}" class="nav-link">
+                                    <li class="nav-item">
+                                        <a href="{!! url('tickets?departments='.$name.'&status='.$dept->get($status)->status) !!}" @if($status2 == $dept->get($status)->status && $dept2 === $name) @yield('inbox') @endif class="nav-link">
                                             <i class="far fa-circle nav-icon"></i>
                                             <p>{!!$dept->get($status)->status !!}</p>
                                             <small class="right badge badge-success">{{$dept->get($status)->count}}</small>