From 0afcdf8f0981a8250ceb065bfe77333a4da1e524 Mon Sep 17 00:00:00 2001
From: Sakthi002 <alerts@ladybirdweb.com>
Date: Fri, 1 Jan 2021 16:50:38 +0530
Subject: [PATCH] Bootstrap4 :: Manage Modules UI updated

---
 .../Admin/helpdesk/PriorityController.php     |   4 +-
 .../Admin/helpdesk/WorkflowController.php     |   2 +-
 .../helpdesk/manage/form/add-child.blade.php  |  22 +-
 .../helpdesk/manage/form/childpopup.blade.php |  10 +-
 .../admin/helpdesk/manage/form/edit.blade.php | 193 ++---
 .../admin/helpdesk/manage/form/form.blade.php | 201 ++---
 .../helpdesk/manage/form/index.blade.php      |  45 +-
 .../helpdesk/manage/form/preview.blade.php    |  44 +-
 .../manage/helptopic/create.blade.php         | 248 +++---
 .../helpdesk/manage/helptopic/edit.blade.php  | 139 +--
 .../helpdesk/manage/helptopic/index.blade.php |  79 +-
 .../helpdesk/manage/sla/create.blade.php      |  66 +-
 .../admin/helpdesk/manage/sla/edit.blade.php  | 120 +--
 .../admin/helpdesk/manage/sla/index.blade.php | 113 +--
 .../manage/ticket_priority/create.blade.php   | 125 ++-
 .../manage/ticket_priority/edit.blade.php     | 163 ++--
 .../manage/ticket_priority/index.blade.php    |  59 +-
 .../helpdesk/manage/workflow/create.blade.php | 410 +++++----
 .../helpdesk/manage/workflow/edit.blade.php   | 796 +++++++++---------
 .../helpdesk/manage/workflow/index.blade.php  |  98 +--
 .../helpdesk/settings/url/settings.blade.php  | 110 ++-
 .../default1/admin/layout/admin.blade.php     |  11 +-
 22 files changed, 1532 insertions(+), 1526 deletions(-)

diff --git a/app/Http/Controllers/Admin/helpdesk/PriorityController.php b/app/Http/Controllers/Admin/helpdesk/PriorityController.php
index b1fb5ba2b..625a44fd9 100644
--- a/app/Http/Controllers/Admin/helpdesk/PriorityController.php
+++ b/app/Http/Controllers/Admin/helpdesk/PriorityController.php
@@ -91,9 +91,9 @@ class PriorityController extends Controller
                             })
                             ->addColumn('action', function ($model) {
                                 if ($model->is_default > 0) {
-                                    return '<a href='.url('ticket/priority/'.$model->priority_id.'/edit')." class='btn btn-info btn-xs' disabled='disabled'>Edit</a>&nbsp;<a href=".url('ticket/priority/'.$model->priority_id.'/destroy')." class='btn btn-warning btn-info btn-xs' disabled='disabled' > delete </a>";
+                                    return '<button class="btn btn-primary btn-xs" disabled> Edit </button>&nbsp;<button class="btn btn-danger btn-xs" disabled> Delete </button>';
                                 } else {
-                                    return '<a href='.url('ticket/priority/'.$model->priority_id.'/edit')." class='btn btn-info btn-xs'>Edit</a>&nbsp;<a class='btn btn-danger btn-xs' onclick='confirmDelete(".$model->priority_id.")'>Delete </a>";
+                                    return '<a href='.url('ticket/priority/'.$model->priority_id.'/edit')." class='btn btn-primary btn-xs'>Edit</a>&nbsp;<a class='btn btn-danger btn-xs' onclick='confirmDelete(".$model->priority_id.")' href='javascript:;'>Delete </a>";
                                 }
                             })
                             ->searchColumns('priority')
diff --git a/app/Http/Controllers/Admin/helpdesk/WorkflowController.php b/app/Http/Controllers/Admin/helpdesk/WorkflowController.php
index 44eab8b0d..982461107 100644
--- a/app/Http/Controllers/Admin/helpdesk/WorkflowController.php
+++ b/app/Http/Controllers/Admin/helpdesk/WorkflowController.php
@@ -132,7 +132,7 @@ class WorkflowController extends Controller
                         ->addColumn('Actions', function ($model) {
                             $confirmation = 'Are you sure?';
 
-                            return "<a class='btn btn-info btn-xs btn-flat' href='".route('workflow.edit', $model->id)."'><i class='fa fa-edit text-black'></i> Edit</a>  <a class='btn btn-danger btn-xs btn-flat' href='".route('workflow.delete', $model->id)."'><i class='fa fa-trash text-black'></i> Delete</a>";
+                            return "<a class='btn btn-primary btn-xs' href='".route('workflow.edit', $model->id)."'><i class='fas fa-edit'></i> Edit</a>  <a class='btn btn-danger btn-xs' href='".route('workflow.delete', $model->id)."'><i class='fas fa-trash'></i> Delete</a>";
                         })
                         ->make();
     }
diff --git a/resources/views/themes/default1/admin/helpdesk/manage/form/add-child.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/form/add-child.blade.php
index b1c7c460b..ee7b7e15c 100644
--- a/resources/views/themes/default1/admin/helpdesk/manage/form/add-child.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/manage/form/add-child.blade.php
@@ -1,15 +1,19 @@
 @extends('themes.default1.admin.layout.admin')
 
 @section('Manage')
-active
+class="nav-link active"
 @stop
 
-@section('manage-bar')
-active
+@section('manage-menu-parent')
+class="nav-item menu-open"
+@stop
+
+@section('manage-menu-open')
+class="nav nav-treeview menu-open"
 @stop
 
 @section('forms')
-class="active"
+class="nav-link active"
 @stop
 
 @section('HeadInclude')
@@ -20,8 +24,14 @@ class="active"
 @stop
 @section('content')
 
-<div class="box box-primary">
-    <div class="box-body">
+<div class="card card-light">
+
+    <div class="card-header">
+        
+        <h3 class="card-title">Add Child</h3>    
+    </div>
+    
+    <div class="card-body">
         <div class="row">
                 @foreach($fields as $field)
                 <?php
diff --git a/resources/views/themes/default1/admin/helpdesk/manage/form/childpopup.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/form/childpopup.blade.php
index 7cfbef800..46a91a877 100644
--- a/resources/views/themes/default1/admin/helpdesk/manage/form/childpopup.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/manage/form/childpopup.blade.php
@@ -1,10 +1,12 @@
-<a href="#child"  data-toggle="modal" class="btn btn-primary" data-target="#child{{$field->id}}">Add Child</a>
+<a href="#child"  data-toggle="modal" class="btn btn-primary" data-target="#child{{$field->id}}" style="margin-top: 29px;">
+    <i class="fas fa-plus"></i> Add Child
+</a>
 <div class="modal fade" id="child{{$field->id}}">
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
+                <h4 class="modal-title">Add Child</h4>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title"></h4>
                 {!! Form::model($field,['url'=>'forms/field/'.$field->id.'/child','method'=>'POST']) !!}
             </div>
             <div class="modal-body">
@@ -23,8 +25,8 @@
                 </div>
 
             </div>
-            <div class="modal-footer">
-                <button type="button" id="close" class="btn btn-default pull-left" data-dismiss="modal">Close</button>
+            <div class="modal-footer justify-content-between">
+                <button type="button" id="close" class="btn btn-default" data-dismiss="modal">Close</button>
                 <input type="submit" class="btn btn-primary" value="{{Lang::get('lang.save')}}">
                 {!! Form::close() !!}
             </div>
diff --git a/resources/views/themes/default1/admin/helpdesk/manage/form/edit.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/form/edit.blade.php
index fd54f6b58..c8a891dad 100644
--- a/resources/views/themes/default1/admin/helpdesk/manage/form/edit.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/manage/form/edit.blade.php
@@ -1,15 +1,19 @@
 @extends('themes.default1.admin.layout.admin')
 
 @section('Manage')
-active
+class="nav-link active"
 @stop
 
-@section('manage-bar')
-active
+@section('manage-menu-parent')
+class="nav-item menu-open"
+@stop
+
+@section('manage-menu-open')
+class="nav nav-treeview menu-open"
 @stop
 
 @section('forms')
-class="active"
+class="nav-link active"
 @stop
 
 @section('HeadInclude')
@@ -27,103 +31,104 @@ class="active"
 <!-- /breadcrumbs -->
 <!-- content -->
 @section('content')
-<div class="box">
-    <div class="box-header with-border">
-        <h3 class="box-title">{!! Lang::get('lang.edit') !!}</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(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('fails'))
+<div class="alert alert-danger alert-dismissable">
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    {{Session::get('fails')}}
+</div>
+@endif
+@if(Session::has('warn'))
+<div class="alert alert-warning alert-dismissable">
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    {{Session::get('warn')}}
+</div>
+@endif
+<div class="card card-light">
+
+    <div class="card-header">
+        <h3 class="card-title">{!! Lang::get('lang.edit') !!}</h3>
     </div>
-    <div class="box-header with-border">
-        <h3 class="box-title">{!! Lang::get('lang.instructions') !!}</h3>
-        <div class="callout callout-default" style="font-style: oblique;">{!! Lang::get('lang.instructions_on_creating_form') !!}.</div>
-    </div>
-    <div class="box-body with-border">
-        @if (count($errors) > 0)
-        <div class="alert alert-danger">
-            <strong>Whoops!</strong> There were some problems with your input.<br><br>
-            <ul>
-                @foreach ($errors->all() as $error)
-                <li>{{ $error }}</li>
-                @endforeach
-            </ul>
-        </div>
-        @endif
-        @if(Session::has('success'))
-        <div class="alert alert-success alert-dismissable">
-            <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('fails'))
-        <div class="alert alert-danger alert-dismissable">
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            {{Session::get('fails')}}
-        </div>
-        @endif
-        @if(Session::has('warn'))
-        <div class="alert alert-warning alert-dismissable">
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            {{Session::get('warn')}}
-        </div>
-        @endif
-        <h3 class="box-title">{!! Lang::get('lang.form_properties') !!}</h3>
+
+    <div class="card-body">
+        
         {!! Form::model($form,['route'=>['forms.update',$form->id],'method'=>'PATCH']) !!}
-        <div class="form-group">
-            <div class="row">
-                <div class="col-md-4">    
-                </div>  
-            </div>
-        </div>
-        <div class="form-group">
-            <div class="row" style="margin-top: 10px;">
-                <div class="col-md-4">
-                    <h4 style="text-align: center">{!! Lang::get('lang.form_name') !!}: <span class="text-red"> *</span></h4>
-                </div>
-                <div class="col-md-4">
-                    {!! Form::text('formname',null,['class'=>'form-control']) !!}
-                    <!--<input type="text" name="formname" class="form-control">-->
-                </div>
-            </div>
-        </div>
-        <h3 class="box-title">{!! Lang::get('lang.adding_fields') !!}</h3>
-        <div class="callout callout-default col-md-4"> {!! Lang::get('lang.click_add_fields_button_to_add_fields') !!} </div>
-        <div class="col-md-4"> 
-            <button type="button" class="btn btn-primary addField" value="Show Div" onclick="showDiv()" ><i class="fa fa-plus"></i>&nbsp; {!! Lang::get('lang.add_fields') !!}</button>
-        </div>
+        
         <div class="row">
+
+            <div class="form-group col-sm-6">
+
+                <label>{!! Lang::get('lang.form_name') !!}: <span class="text-red"> *</span></label>
+                 {!! Form::text('formname',null,['class'=>'form-control']) !!}
+            </div>
         </div>
-        <div class="box-body" id="welcomeDiv">
-            <table id="example2" class="table table-bordered table-striped">
-                <thead>
-                <th>{!! Lang::get('lang.label') !!} </th>
-                <th>{!! Lang::get('lang.name') !!} </th>
-                <th>{!! Lang::get('lang.type') !!} </th>
-                <th>{!! Lang::get('lang.values(selected_fields)') !!} </th>
-                <th>{!! Lang::get('lang.required') !!} </th>
-                <th>{!! Lang::get('lang.action') !!} </th>
-                </thead>
-                <tbody class="inputField">
+        
+        <div class="callout callout-default" style="font-style: oblique;">{!! Lang::get('lang.instructions_on_creating_form') !!}.</div>
+        <div class="callout callout-default"> {!! Lang::get('lang.click_add_fields_button_to_add_fields') !!} </div>
 
-                    @forelse($fields as $key=>$field)
+        <div class="card card-light">
+            
+            <div class="card-header">
+            
+                <h3 class="card-title">{!! Lang::get('lang.adding_fields') !!}</h3> 
 
-                    <tr>
-                        <td><input type="text" name="label[]" value="{{$field->label}}" class="form-control"></td>
-                        <td><input type="text" name="name[]" value="{{$field->name}}" class="form-control"></td>
-                        
-                        <td>{!! Form::select('type[]',['text'=>'text','email'=>'email','password'=>'password','textarea'=>'textarea','select'=>'select','radio'=>'radio','checkbox'=>'checkbox','hidden'=>'hidden'],$field->type,['class'=>'form-control']) !!}</td>
-                        <td><input type="text" name="value[]" value="{{$field->valuesAsString()}}" class="form-control"></td>
-                        
-                        <td>{!! Lang::get("lang.yes") !!}&nbsp;&nbsp;{!! Form::radio('required['.$key.']',1,true) !!}&nbsp;&nbsp;{!! Lang::get("lang.no") !!}&nbsp;&nbsp;{!! Form::radio('required['.$key.']',0,$field->nonRequiredFieldForCheck()) !!}</td>
-                        <td><button type="button" class="remove_field btn btn-danger"><i class="fa fa-trash-o"></i>&nbsp {!! Lang::get("lang.remove") !!}</button></td>
-                    </tr> 
-                    @empty 
+                <div class="card-tools"> 
+                    <button type="button" class="btn btn-default btn-tool addField" value="Show Div" onclick="showDiv()" >
+                        <i class="fas fa-plus"></i>&nbsp;{!! Lang::get('lang.add_fields') !!}
+                    </button>
+                </div>    
+            </div> 
+     
+            <div class="card-body" id="welcomeDiv">
+                <table id="example2" class="table table-bordered table-striped">
+                    <thead>
+                    <th>{!! Lang::get('lang.label') !!} </th>
+                    <th>{!! Lang::get('lang.name') !!} </th>
+                    <th>{!! Lang::get('lang.type') !!} </th>
+                    <th>{!! Lang::get('lang.values(selected_fields)') !!} </th>
+                    <th>{!! Lang::get('lang.required') !!} </th>
+                    <th>{!! Lang::get('lang.action') !!} </th>
+                    </thead>
+                    <tbody class="inputField">
 
-                    @endforelse
+                        @forelse($fields as $key=>$field)
 
-                </tbody>
-            </table>
-        </div>  
+                        <tr>
+                            <td><input type="text" name="label[]" value="{{$field->label}}" class="form-control"></td>
+                            <td><input type="text" name="name[]" value="{{$field->name}}" class="form-control"></td>
+                            
+                            <td>{!! Form::select('type[]',['text'=>'text','email'=>'email','password'=>'password','textarea'=>'textarea','select'=>'select','radio'=>'radio','checkbox'=>'checkbox','hidden'=>'hidden'],$field->type,['class'=>'form-control']) !!}</td>
+                            <td><input type="text" name="value[]" value="{{$field->valuesAsString()}}" class="form-control"></td>
+                            
+                            <td>{!! Form::radio('required['.$key.']',1,true) !!}&nbsp;&nbsp;{!! Lang::get("lang.yes") !!}&nbsp;&nbsp;{!! Form::radio('required['.$key.']',0,$field->nonRequiredFieldForCheck()) !!}&nbsp;&nbsp;{!! Lang::get("lang.no") !!}</td>
+                            <td><button type="button" class="remove_field btn btn-danger"><i class="fas fa-trash"></i></button></td>
+                        </tr> 
+                        @empty 
+
+                        @endforelse
+
+                    </tbody>
+                </table>
+            </div> 
+        </div> 
     </div>
-    <div class="box-footer">
+    <div class="card-footer">
         <input type="submit" class="btn btn-primary" value="{!! Lang::get('lang.save_form') !!}">
     </div>
 </div>
@@ -147,8 +152,8 @@ class="active"
     <td><input type="text" class="form-control" name="name[]"></td>\n\
     <td><select name="type[]" class="form-control"><option>text</option><option>email</option><option>password</option><option>textarea</option><option>select</option><option>radio</option><option>checkbox</option><option>hidden</option></select>\n\
     </td><td><input type="text" name="value[]" class="form-control"></td>\n\
-    <td>{!! Lang::get("lang.yes") !!}&nbsp;&nbsp;<input type=radio name="required[]" value=1 checked>&nbsp;&nbsp;{!! Lang::get("lang.no") !!}&nbsp;&nbsp;<input type=radio name="required[]" value=0></td>\n\
-    <td><button type="button" class="remove_field btn btn-danger"><i class="fa fa-trash-o"></i>&nbsp {!! Lang::get("lang.remove") !!}</button></td></tr>');
+    <td><input type=radio name="required[]" value=1 checked>&nbsp;&nbsp;{!! Lang::get("lang.yes") !!}&nbsp;&nbsp;<input type=radio name="required[]" value=0>&nbsp;&nbsp;{!! Lang::get("lang.no") !!}</td>\n\
+    <td><button type="button" class="remove_field btn btn-danger"><i class="fas fa-trash"></i></button></td></tr>');
             }
         });
         $(wrapper).on("click", ".remove_field", function (e)
diff --git a/resources/views/themes/default1/admin/helpdesk/manage/form/form.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/form/form.blade.php
index 4af1b3029..9b7ff4df7 100644
--- a/resources/views/themes/default1/admin/helpdesk/manage/form/form.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/manage/form/form.blade.php
@@ -1,15 +1,19 @@
 @extends('themes.default1.admin.layout.admin')
 
 @section('Manage')
-active
+class="nav-link active"
 @stop
 
-@section('manage-bar')
-active
+@section('manage-menu-parent')
+class="nav-item menu-open"
+@stop
+
+@section('manage-menu-open')
+class="nav nav-treeview menu-open"
 @stop
 
 @section('forms')
-class="active"
+class="nav-link active"
 @stop
 
 @section('HeadInclude')
@@ -27,106 +31,103 @@ class="active"
 <!-- /breadcrumbs -->
 <!-- content -->
 @section('content')
-<div class="box">
-    <div class="box-header with-border">
-        <h3 class="box-title">{!! Lang::get('lang.create') !!}</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(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('fails'))
+<div class="alert alert-danger alert-dismissable">
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    {{Session::get('fails')}}
+</div>
+@endif
+@if(Session::has('warn'))
+<div class="alert alert-warning alert-dismissable">
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    {{Session::get('warn')}}
+</div>
+@endif
+<div class="card card-light">
+    <div class="card-header">
+        <h3 class="card-title">{!! Lang::get('lang.create') !!}</h3>
     </div>
-    <div class="box-header with-border">
-        <h3 class="box-title">{!! Lang::get('lang.instructions') !!}</h3>
-        <div class="callout callout-default" style="font-style: oblique;">{!! Lang::get('lang.instructions_on_creating_form') !!}.</div>
-    </div>
-    <div class="box-body with-border">
-        @if (count($errors) > 0)
-        <div class="alert alert-danger">
-            <strong>Whoops!</strong> There were some problems with your input.<br><br>
-            <ul>
-                @foreach ($errors->all() as $error)
-                <li>{{ $error }}</li>
-                @endforeach
-            </ul>
-        </div>
-        @endif
-        @if(Session::has('success'))
-        <div class="alert alert-success alert-dismissable">
-            <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('fails'))
-        <div class="alert alert-danger alert-dismissable">
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            {{Session::get('fails')}}
-        </div>
-        @endif
-        @if(Session::has('warn'))
-        <div class="alert alert-warning alert-dismissable">
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            {{Session::get('warn')}}
-        </div>
-        @endif
-        <h3 class="box-title">{!! Lang::get('lang.form_properties') !!}</h3>
+    <div class="card-body">
+
         {!! Form::open(['route'=>'forms.store']) !!}
-        <div class="form-group">
-            <div class="row">
-                <div class="col-md-4">    
-                </div>  
-            </div>
-        </div>
-        <div class="form-group">
-            <div class="row" style="margin-top: 10px;">
-                <div class="col-md-4">
-                    <h4 style="text-align: center">{!! Lang::get('lang.form_name') !!}: <span class="text-red"> *</span></h4>
-                </div>
-                <div class="col-md-4">
-                    <input type="text" name="formname" class="form-control">
-                </div>
-            </div>
-        </div>
-        <h3 class="box-title">{!! Lang::get('lang.adding_fields') !!}</h3>
-        <div class="callout callout-default col-md-4"> {!! Lang::get('lang.click_add_fields_button_to_add_fields') !!} </div>
-        <div class="col-md-4"> 
-            <button type="button" class="btn btn-primary addField" value="Show Div" onclick="showDiv()" ><i class="fa fa-plus"></i>&nbsp; {!! Lang::get('lang.add_fields') !!}</button>
-        </div>
+
         <div class="row">
+            <div class="form-group col-sm-6">
+                <label>{!! Lang::get('lang.form_name') !!}: <span class="text-red"> *</span></label>
+                <input type="text" name="formname" class="form-control">
+            </div>
         </div>
-        <div class="box-body" id="welcomeDiv">
-            <table id="example2" class="table table-bordered table-striped">
-                <thead>
-                <th>{!! Lang::get('lang.label') !!} </th>
-                <th>{!! Lang::get('lang.name') !!} </th>
-                <th>{!! Lang::get('lang.type') !!} </th>
-                <th>{!! Lang::get('lang.values(selected_fields)') !!} </th>
-                <th>{!! Lang::get('lang.required') !!} </th>
-                <th>{!! Lang::get('lang.action') !!} </th>
-                </thead>
-                <tbody class="inputField">
-                    
-                    <tr>
-                        <td><input type="text" class="form-control" name="label[]"></td>
-                        <td><input type="text" class="form-control" name="name[]"></td>
-                        <td>
-                            <select name="type[]" class="form-control">
-                                <option>text</option>
-                                <option>email</option>
-                                <option>password</option>
-                                <option>textarea</option>
-                                <option>select</option>
-                                <option>radio</option>
-                                <option>checkbox</option>
-                                <option>hidden</option>
-                            </select>
-                        </td>
-                        <td><input type="text" name="value[]" class="form-control"></td>
-                        <td>{!! Lang::get("lang.yes") !!}&nbsp;&nbsp;<input type=radio name="required[0]" value=1 checked>&nbsp;&nbsp;{!! Lang::get("lang.no") !!}&nbsp;&nbsp;<input type=radio name="required[0]" value=0></td>
-                        <td><button type="button" class="remove_field btn btn-danger"><i class="fa fa-trash-o"></i>&nbsp {!! Lang::get("lang.remove") !!}</button></td>
-                    </tr>
-                    
-                </tbody>
-            </table>
-        </div>  
+        
+        <div class="callout callout-default" style="font-style: oblique;">{!! Lang::get('lang.instructions_on_creating_form') !!}.</div>
+
+        <div class="callout callout-default"> {!! Lang::get('lang.click_add_fields_button_to_add_fields') !!} </div>
+
+        <div class="card card-light">
+            
+            <div class="card-header">
+                <h3 class="card-title">{!! Lang::get('lang.adding_fields') !!}</h3>
+                <div class="card-tools"> 
+                    <button type="button" class="btn btn-default btn-tool addField" value="Show Div" onclick="showDiv()" >
+                        <i class="fas fa-plus"></i>&nbsp; {!! Lang::get('lang.add_fields') !!}
+                    </button>
+                </div>
+            </div>
+
+             <div class="card-body" id="welcomeDiv">
+                <table id="example2" class="table table-bordered">
+                    <thead>
+                    <th>{!! Lang::get('lang.label') !!} </th>
+                    <th>{!! Lang::get('lang.name') !!} </th>
+                    <th>{!! Lang::get('lang.type') !!} </th>
+                    <th>{!! Lang::get('lang.values(selected_fields)') !!} </th>
+                    <th>{!! Lang::get('lang.required') !!} </th>
+                    <th>{!! Lang::get('lang.action') !!} </th>
+                    </thead>
+                    <tbody class="inputField">
+                        
+                        <tr>
+                            <td><input type="text" class="form-control" name="label[]"></td>
+                            <td><input type="text" class="form-control" name="name[]"></td>
+                            <td>
+                                <select name="type[]" class="form-control">
+                                    <option>text</option>
+                                    <option>email</option>
+                                    <option>password</option>
+                                    <option>textarea</option>
+                                    <option>select</option>
+                                    <option>radio</option>
+                                    <option>checkbox</option>
+                                    <option>hidden</option>
+                                </select>
+                            </td>
+                            <td><input type="text" name="value[]" class="form-control"></td>
+                            <td><input type=radio name="required[0]" value=1 checked>&nbsp;&nbsp;{!! Lang::get("lang.yes") !!}&nbsp;&nbsp;<input type=radio name="required[0]" value=0>&nbsp;&nbsp;{!! Lang::get("lang.no") !!}</td>
+                            <td><button type="button" class="remove_field btn btn-danger"><i class="fas fa-trash"></i></button></td>
+                        </tr>
+                        
+                    </tbody>
+                </table>
+            </div> 
+        </div> 
     </div>
-    <div class="box-footer">
+    <div class="card-footer">
         <input type="submit" class="btn btn-primary" value="{!! Lang::get('lang.save_form') !!}">
     </div>
 </div>
@@ -145,7 +146,7 @@ class="active"
             e.preventDefault();
             if (x < max_fields) {
                 x++;
-                $(wrapper).append('<tr><td><input type="text" class="form-control" name="label[]"></td><td><input type="text" class="form-control" name="name[]"></td><td><select name="type[]" class="form-control"><option>text</option><option>email</option><option>password</option><option>textarea</option><option>select</option><option>radio</option><option>checkbox</option><option>hidden</option></select></td><td><input type="text" name="value[]" class="form-control"></td><td>{!! Lang::get("lang.yes") !!}&nbsp;&nbsp;<input type=radio name="required['+x+']" value=1 checked>&nbsp;&nbsp;{!! Lang::get("lang.no") !!}&nbsp;&nbsp;<input type=radio name="required['+x+']" value=0></td><td><button type="button" class="remove_field btn btn-danger"><i class="fa fa-trash-o"></i>&nbsp {!! Lang::get("lang.remove") !!}</button></td></tr>');
+                $(wrapper).append('<tr><td><input type="text" class="form-control" name="label[]"></td><td><input type="text" class="form-control" name="name[]"></td><td><select name="type[]" class="form-control"><option>text</option><option>email</option><option>password</option><option>textarea</option><option>select</option><option>radio</option><option>checkbox</option><option>hidden</option></select></td><td><input type="text" name="value[]" class="form-control"></td><td><input type=radio name="required['+x+']" value=1 checked>&nbsp;&nbsp;{!! Lang::get("lang.yes") !!}&nbsp;&nbsp;<input type=radio name="required['+x+']" value=0>&nbsp;&nbsp;{!! Lang::get("lang.no") !!}</td><td><button type="button" class="remove_field btn btn-danger"><i class="fas fa-trash"></i></button></td></tr>');
             }
         });
         $(wrapper).on("click", ".remove_field", function(e)
diff --git a/resources/views/themes/default1/admin/helpdesk/manage/form/index.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/form/index.blade.php
index b9a244cd3..dcbe60409 100644
--- a/resources/views/themes/default1/admin/helpdesk/manage/form/index.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/manage/form/index.blade.php
@@ -1,15 +1,19 @@
 @extends('themes.default1.admin.layout.admin')
 
 @section('Manage')
-active
+class="nav-link active"
 @stop
 
-@section('manage-bar')
-active
+@section('manage-menu-parent')
+class="nav-item menu-open"
+@stop
+
+@section('manage-menu-open')
+class="nav nav-treeview menu-open"
 @stop
 
 @section('forms')
-class="active"
+class="nav-link active"
 @stop
 
 @section('HeadInclude')
@@ -30,19 +34,23 @@ class="active"
 
 @if(Session::has('success'))
 <div class="alert alert-success alert-dismissable">
-    <i class="fa fa-check-circle"></i>
+    <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
-<div class="box">
-    <div class="box-header">
-        <div class="box-title">
-            {!! Lang::get('lang.forms') !!}
+
+<div class="card card-light">
+    <div class="card-header">
+        <h3 class="card-title">{!! Lang::get('lang.forms') !!}</h3>
+        <div class="card-tools">
+            <a href="{!! url('forms/create') !!}" class="btn btn-default btn-tool">
+                <span class="fas fa-plus"></span>&nbsp;{!! Lang::get('lang.create_form') !!}
+            </a>
         </div>
-        <a href="{!! url('forms/create') !!}" class="pull-right"><button class="btn btn-primary"><span class="glyphicon glyphicon-plus"></span> &nbsp;{!! Lang::get('lang.create_form') !!}</button></a> 
     </div>
-    <div class="box-body">
+
+    <div class="card-body">
         <table id="example2" class="table table-bordered table-striped">
             <thead>
                 <tr>
@@ -68,21 +76,22 @@ class="active"
                             {!! link_to_route('forms.add.child', 'Add Child' ,[$form->id],['id'=>'add-child','class'=>'btn btn-primary btn-sm']) !!}
                         </div>
                         <div class="btn-group">
-                            <button class="btn btn-danger btn-sm" data-toggle="modal" data-target="#{{$form->id}}delete">{!! Lang::get('lang.delete_from') !!}</button>
+                            <button class="btn btn-danger btn-sm" data-toggle="modal" data-target="#delete{{$form->id}}">{!! Lang::get('lang.delete_from') !!}
+                            </button>
                         </div>
-                        <div class="modal fade" id="{{$form->id}}delete">
+                        <div class="modal fade" id="delete{{$form->id}}">
                             <div class="modal-dialog">
                                 <div class="modal-content">
                                     <div class="modal-header">
-                                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                                         <h4 class="modal-title">{!! Lang::get('lang.delete') !!}</h4>
+                                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                                     </div>
                                     <div class="modal-body">
-                                        <p>{!! Lang::get('lang.are_you_sure_you_want_to_delete') !!} ?</p>
+                                        <span>{!! Lang::get('lang.are_you_sure_you_want_to_delete') !!} ?</span>
                                     </div>
-                                    <div class="modal-footer">
-                                        <button type="button" class="btn btn-default pull-left" data-dismiss="modal">{!! Lang::get('lang.close') !!}</button>
-                                        {!! link_to_route('forms.delete', Lang::get('lang.delete'),[$form->id],['id'=>'delete','class'=>'btn btn-danger btn-sm']) !!}
+                                    <div class="modal-footer justify-content-between">
+                                        <button type="button" class="btn btn-default" data-dismiss="modal">{!! Lang::get('lang.close') !!}</button>
+                                        {!! link_to_route('forms.delete', Lang::get('lang.delete'),[$form->id],['id'=>'delete','class'=>'btn btn-danger']) !!}
                                     </div>
                                 </div> 
                             </div> 
diff --git a/resources/views/themes/default1/admin/helpdesk/manage/form/preview.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/form/preview.blade.php
index 33a800055..dcfba0acf 100644
--- a/resources/views/themes/default1/admin/helpdesk/manage/form/preview.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/manage/form/preview.blade.php
@@ -1,15 +1,19 @@
 @extends('themes.default1.admin.layout.admin')
 
 @section('Manage')
-active
+class="nav-link active"
 @stop
 
-@section('manage-bar')
-active
+@section('manage-menu-parent')
+class="nav-item menu-open"
+@stop
+
+@section('manage-menu-open')
+class="nav nav-treeview menu-open"
 @stop
 
 @section('forms')
-class="active"
+class="nav-link active"
 @stop
 
 <!-- header -->
@@ -28,24 +32,24 @@ class="active"
 @section('content')
 @if(Session::has('success'))
 <div class="alert alert-success alert-dismissable">
-    <i class="fa fa-check-circle"></i>
+    <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('fails'))
 <div class="alert alert-success alert-dismissable">
-    <i class="fa fa-ban"></i><button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    <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
 <!-- -->    
-<div class="box">
-    <div class="box-header">
-        <h3 class="box-title">{!! Lang::get('lang.form_name') !!} : {!! $form->formname !!}</h3>
+<div class="card card-light">
+    <div class="card-header">
+        <h3 class="card-title">{!! Lang::get('lang.form_name') !!} : {!! $form->formname !!}</h3>
     </div>
-    <div class="box-body">
+    <div class="card-body">
         @foreach($fields as $field)
         <?php
         $form = App\Http\Controllers\Admin\helpdesk\FormController::getForm($field);
@@ -53,26 +57,6 @@ class="active"
 
         {!! $form !!}
           
-<!--        <script>
-            $("[name='{{$field->name}}']").on('change', function () {
-                var valueid = $("[name='{{$field->name}}']").val();
-                alert(valueid);
-                send(valueid);
-            });
-            function send(valueid) {
-                $.ajax({
-                    url: "{{url('forms/render/child/'.$field->id)}}",
-                    dataType: "html",
-                    data: {'valueid': valueid},
-                    success: function (response) {
-                        $("#{{$field->name}}").html(response);
-                    },
-                    error: function (response) {
-                        $("#{{$field->name}}").html(response);
-                    }
-                });
-            }
-        </script>-->
         @endforeach         
     </div>
 </div>
diff --git a/resources/views/themes/default1/admin/helpdesk/manage/helptopic/create.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/helptopic/create.blade.php
index e126e518d..aa2990862 100644
--- a/resources/views/themes/default1/admin/helpdesk/manage/helptopic/create.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/manage/helptopic/create.blade.php
@@ -1,15 +1,19 @@
 @extends('themes.default1.admin.layout.admin')
 
 @section('Manage')
-active
+class="nav-link active"
 @stop
 
-@section('manage-bar')
-active
+@section('manage-menu-parent')
+class="nav-item menu-open"
+@stop
+
+@section('manage-menu-open')
+class="nav nav-treeview menu-open"
 @stop
 
 @section('help')
-class="active"
+class="nav-link active"
 @stop
 
 @section('HeadInclude')
@@ -29,132 +33,132 @@ class="active"
 @section('content')
 <!-- open a form -->
 {!! Form::open(['action' => 'Admin\helpdesk\HelptopicController@store', 'method' => 'post']) !!}
-<div class="box box-primary">
-    <div class="box-header with-border">
-        <h3 class="box-title">{{Lang::get('lang.create')}}</h3>
+@if(Session::has('errors'))
+<?php //dd($errors); ?>
+<div class="alert alert-danger alert-dismissable">
+    <i class="fas fa-ban"></i>
+    <b>Alert!</b>
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    <br/>
+    @if($errors->first('status'))
+    <li class="error-message-padding">{!! $errors->first('status', ':message') !!}</li>
+    @endif
+    @if($errors->first('type'))
+    <li class="error-message-padding">{!! $errors->first('type', ':message') !!}</li>
+    @endif
+    @if($errors->first('topic'))
+    <li class="error-message-padding">{!! $errors->first('topic', ':message') !!}</li>
+    @endif
+    @if($errors->first('parent_topic'))
+    <li class="error-message-padding">{!! $errors->first('parent_topic', ':message') !!}</li>
+    @endif
+    @if($errors->first('custom_form'))
+    <li class="error-message-padding">{!! $errors->first('custom_form', ':message') !!}</li>
+    @endif
+    @if($errors->first('department'))
+    <li class="error-message-padding">{!! $errors->first('department', ':message') !!}</li>
+    @endif
+    @if($errors->first('priority'))
+    <li class="error-message-padding">{!! $errors->first('priority', ':message') !!}</li>
+    @endif
+    @if($errors->first('sla_plan'))
+    <li class="error-message-padding">{!! $errors->first('sla_plan', ':message') !!}</li>
+    @endif
+    @if($errors->first('auto_assign'))
+    <li class="error-message-padding">{!! $errors->first('auto_assign', ':message') !!}</li>
+    @endif
+</div>
+@endif
+<div class="card card-light">
+    <div class="card-header">
+        <h3 class="card-title">{{Lang::get('lang.create')}}</h3>
     </div>
-    <div class="box-body">
-        @if(Session::has('errors'))
-        <?php //dd($errors); ?>
-        <div class="alert alert-danger alert-dismissable">
-            <i class="fa fa-ban"></i>
-            <b>Alert!</b>
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            <br/>
-            @if($errors->first('status'))
-            <li class="error-message-padding">{!! $errors->first('status', ':message') !!}</li>
-            @endif
-            @if($errors->first('type'))
-            <li class="error-message-padding">{!! $errors->first('type', ':message') !!}</li>
-            @endif
-            @if($errors->first('topic'))
-            <li class="error-message-padding">{!! $errors->first('topic', ':message') !!}</li>
-            @endif
-            @if($errors->first('parent_topic'))
-            <li class="error-message-padding">{!! $errors->first('parent_topic', ':message') !!}</li>
-            @endif
-            @if($errors->first('custom_form'))
-            <li class="error-message-padding">{!! $errors->first('custom_form', ':message') !!}</li>
-            @endif
-            @if($errors->first('department'))
-            <li class="error-message-padding">{!! $errors->first('department', ':message') !!}</li>
-            @endif
-            @if($errors->first('priority'))
-            <li class="error-message-padding">{!! $errors->first('priority', ':message') !!}</li>
-            @endif
-            @if($errors->first('sla_plan'))
-            <li class="error-message-padding">{!! $errors->first('sla_plan', ':message') !!}</li>
-            @endif
-            @if($errors->first('auto_assign'))
-            <li class="error-message-padding">{!! $errors->first('auto_assign', ':message') !!}</li>
-            @endif
+    <div class="card-body">
+
+        <div class="row">
+            <!-- Topic text form Required -->
+            <div class="col-md-6">
+                <div class="form-group {{ $errors->has('topic') ? 'has-error' : '' }}">
+                    {!! Form::label('topic',Lang::get('lang.topic')) !!} <span class="text-red"> *</span>
+                    {!! Form::text('topic',null,['class' => 'form-control']) !!}
+                </div>
+            </div> 
+            <!-- status radio: required: Active|Dissable -->
+            <div class="col-md-3">
+                <div class="form-group {{ $errors->has('ticket_status') ? 'has-error' : '' }}">
+                    {!! Form::label('ticket_status',Lang::get('lang.status')) !!}&nbsp;&nbsp;<br/>
+                    {!! Form::radio('status','1',true) !!} {{Lang::get('lang.active')}}&nbsp;&nbsp;&nbsp;
+                    {!! Form::radio('status','0') !!} {{Lang::get('lang.inactive')}}
+                </div>
+            </div>
+            <!-- Type : Radio : required : Public|private -->
+            <div class="col-md-3">
+                <div class="form-group {{ $errors->has('type') ? 'has-error' : '' }}">
+                    {!! Form::label('type',Lang::get('lang.type')) !!}&nbsp;&nbsp;<br/>
+                    {!! Form::radio('type','1',true) !!} {{Lang::get('lang.public')}}&nbsp;&nbsp;&nbsp;
+                    {!! Form::radio('type','0') !!} {{Lang::get('lang.private')}}
+                </div>
+            </div>   
         </div>
-        @endif
-        <div class="form-group">
-            <div class="box-body table-responsive no-padding" style="overflow:hidden">
-                <!-- status radio: required: Active|Dissable -->
-                <div class="row">
-                    <div class="col-md-6">
-                        <div class="form-group {{ $errors->has('ticket_status') ? 'has-error' : '' }}">
-                            {!! Form::label('ticket_status',Lang::get('lang.status')) !!}&nbsp;&nbsp;
-                            {!! Form::radio('status','1',true) !!} {{Lang::get('lang.active')}}&nbsp;&nbsp;&nbsp;
-                            {!! Form::radio('status','0') !!} {{Lang::get('lang.inactive')}}
-                        </div>
-                    </div>
-                    <!-- Type : Radio : required : Public|private -->
-                    <div class="col-md-6">
-                        <div class="form-group {{ $errors->has('type') ? 'has-error' : '' }}">
-                            {!! Form::label('type',Lang::get('lang.type')) !!}&nbsp;&nbsp;
-                            {!! Form::radio('type','1',true) !!} {{Lang::get('lang.public')}}&nbsp;&nbsp;&nbsp;
-                            {!! Form::radio('type','0') !!} {{Lang::get('lang.private')}}
-                        </div>
-                    </div>
-                    <!-- Topic text form Required -->
-                    <div class="col-md-6">
-                        <div class="form-group {{ $errors->has('topic') ? 'has-error' : '' }}">
-                            {!! Form::label('topic',Lang::get('lang.topic')) !!} <span class="text-red"> *</span>
-                            {!! Form::text('topic',null,['class' => 'form-control']) !!}
-                        </div>
-                    </div>
-                    <!-- Parent Topic: Drop down: value from helptopic table -->
-                    <div class="col-md-6">
-                        <div class="form-group {{ $errors->has('parent_topic') ? 'has-error' : '' }}">
-                            {!! Form::label('parent_topic',Lang::get('lang.parent_topic')) !!}
-                            {!!Form::select('parent_topic', [''=>Lang::get('lang.select_a_parent_topic'),Lang::get('lang.help_topic')=>$topics->pluck('topic','topic')->toArray()],1,['class' => 'form-control']) !!}
-                        </div>
-                    </div>
-                    <!-- Custom Form: Drop down: value from form table -->
-                    <div class="col-md-6">
-                        <div class="form-group {{ $errors->has('custom_form') ? 'has-error' : '' }}">
-                            {!! Form::label('custom_form',Lang::get('lang.Custom_form')) !!}
-                            {!!Form::select('custom_form', [''=>Lang::get('lang.select_a_form'),Lang::get('lang.custom_form')=>$forms->pluck('formname','id')->toArray()],1,['class' => 'form-control']) !!}
-                        </div>
-                    </div>
-                    <!-- Department:	Drop down: value Department form table -->
-                    <div class="col-md-6">
-                        <div class="form-group {{ $errors->has('department') ? 'has-error' : '' }}">
-                            {!! Form::label('department',Lang::get('lang.department')) !!}
-                            {!!Form::select('department', [''=>Lang::get('lang.select_a_department'),Lang::get('lang.departments')=>$departments->pluck('name','id')->toArray()],1,['class' => 'form-control']) !!}
-                        </div>
-                    </div>
+
+        <div class="row">
+            <!-- Parent Topic: Drop down: value from helptopic table -->
+            <div class="col-md-4">
+                <div class="form-group {{ $errors->has('parent_topic') ? 'has-error' : '' }}">
+                    {!! Form::label('parent_topic',Lang::get('lang.parent_topic')) !!}
+                    {!!Form::select('parent_topic', [''=>Lang::get('lang.select_a_parent_topic'),Lang::get('lang.help_topic')=>$topics->pluck('topic','topic')->toArray()],1,['class' => 'form-control']) !!}
                 </div>
-                <!-- Priority:	Drop down: value from Priority  table -->
-                <div class="row">
-                    <div class="col-md-4">
-                        <div class="form-group {{ $errors->has('priority') ? 'has-error' : '' }}">
-                            {!! Form::label('priority',Lang::get('lang.priority')) !!} <span class="text-red"> *</span>
-                            {!!Form::select('priority', [''=>Lang::get('lang.select_a_priority'),Lang::get('lang.priorities')=>$priority->pluck('priority_desc','priority_id')->toArray()],null,['class' => 'form-control']) !!}
-                        </div>
-                    </div>
-                    <!-- SLA Plan:	 Drop down: value SLA Plan  table-->
-                    <div class="col-md-4">
-                        <div class="form-group {{ $errors->has('sla_plan') ? 'has-error' : '' }}">
-                            {!! Form::label('sla_plan',Lang::get('lang.SLA_plan')) !!}
-                            {!!Form::select('sla_plan', [''=>Lang::get('lang.select_a_sla_plan'),Lang::get('lang.sla_plans')=>$slas->pluck('name','id')->toArray()],1,['class' => 'form-control']) !!}
-                        </div>
-                    </div>
-                    <!-- Auto-assign To:	Drop Down: value  from Agent table   -->
-                    <div class="col-md-4">
-                        <div class="form-group {{ $errors->has('auto_assign') ? 'has-error' : '' }}">
-                            {!! Form::label('auto_assign',Lang::get('lang.auto_assign')) !!}
-                            {!!Form::select('auto_assign', [''=>Lang::get('lang.select_an_agent'),Lang::get('lang.agents')=>$agents->pluck('full_name','id')->toArray()],null,['class' => 'form-control']) !!}
-                        </div>
-                    </div>
+            </div>
+            <!-- Custom Form: Drop down: value from form table -->
+            <div class="col-md-4">
+                <div class="form-group {{ $errors->has('custom_form') ? 'has-error' : '' }}">
+                    {!! Form::label('custom_form',Lang::get('lang.Custom_form')) !!}
+                    {!!Form::select('custom_form', [''=>Lang::get('lang.select_a_form'),Lang::get('lang.custom_form')=>$forms->pluck('formname','id')->toArray()],1,['class' => 'form-control']) !!}
                 </div>
-                <!-- Auto-response:	checkbox : Disable new ticket auto-response  -->
-                <div class="row">
-                    <!-- intrnal Notes : Textarea :  -->
-                    <div class="col-md-12">
-                        <div class="form-group">
-                            {!! Form::label('internal_notes',Lang::get('lang.internal_notes')) !!}
-                            {!! Form::textarea('internal_notes',null,['class' => 'form-control','size' => '10x5']) !!}
-                        </div>
-                    </div>
+            </div>
+            <!-- Department:    Drop down: value Department form table -->
+            <div class="col-md-4">
+                <div class="form-group {{ $errors->has('department') ? 'has-error' : '' }}">
+                    {!! Form::label('department',Lang::get('lang.department')) !!}
+                    {!!Form::select('department', [''=>Lang::get('lang.select_a_department'),Lang::get('lang.departments')=>$departments->pluck('name','id')->toArray()],1,['class' => 'form-control']) !!}
+                </div>
+            </div>
+        </div>
+        <!-- Priority:	Drop down: value from Priority  table -->
+        <div class="row">
+            <div class="col-md-4">
+                <div class="form-group {{ $errors->has('priority') ? 'has-error' : '' }}">
+                    {!! Form::label('priority',Lang::get('lang.priority')) !!} <span class="text-red"> *</span>
+                    {!!Form::select('priority', [''=>Lang::get('lang.select_a_priority'),Lang::get('lang.priorities')=>$priority->pluck('priority_desc','priority_id')->toArray()],null,['class' => 'form-control']) !!}
+                </div>
+            </div>
+            <!-- SLA Plan:	 Drop down: value SLA Plan  table-->
+            <div class="col-md-4">
+                <div class="form-group {{ $errors->has('sla_plan') ? 'has-error' : '' }}">
+                    {!! Form::label('sla_plan',Lang::get('lang.SLA_plan')) !!}
+                    {!!Form::select('sla_plan', [''=>Lang::get('lang.select_a_sla_plan'),Lang::get('lang.sla_plans')=>$slas->pluck('name','id')->toArray()],1,['class' => 'form-control']) !!}
+                </div>
+            </div>
+            <!-- Auto-assign To:	Drop Down: value  from Agent table   -->
+            <div class="col-md-4">
+                <div class="form-group {{ $errors->has('auto_assign') ? 'has-error' : '' }}">
+                    {!! Form::label('auto_assign',Lang::get('lang.auto_assign')) !!}
+                    {!!Form::select('auto_assign', [''=>Lang::get('lang.select_an_agent'),Lang::get('lang.agents')=>$agents->pluck('full_name','id')->toArray()],null,['class' => 'form-control']) !!}
+                </div>
+            </div>
+        </div>
+        <!-- Auto-response:	checkbox : Disable new ticket auto-response  -->
+        <div class="row">
+            <!-- intrnal Notes : Textarea :  -->
+            <div class="col-md-12">
+                <div class="form-group">
+                    {!! Form::label('internal_notes',Lang::get('lang.internal_notes')) !!}
+                    {!! Form::textarea('internal_notes',null,['class' => 'form-control','size' => '10x5']) !!}
                 </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/manage/helptopic/edit.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/helptopic/edit.blade.php
index 3c0a6c4ee..3c91014be 100644
--- a/resources/views/themes/default1/admin/helpdesk/manage/helptopic/edit.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/manage/helptopic/edit.blade.php
@@ -1,15 +1,19 @@
 @extends('themes.default1.admin.layout.admin')
 
 @section('Manage')
-active
+class="nav-link active"
 @stop
 
-@section('manage-bar')
-active
+@section('manage-menu-parent')
+class="nav-item menu-open"
+@stop
+
+@section('manage-menu-open')
+class="nav nav-treeview menu-open"
 @stop
 
 @section('help')
-class="active"
+class="nav-link active"
 @stop
 
 @section('HeadInclude')
@@ -29,64 +33,48 @@ class="active"
 @section('content')
 <!-- open a form -->
 {!! Form::model($topics,['url' => 'helptopic/'.$topics->id, 'method' => 'PATCH']) !!}
-<div class="box box-primary">
-    <div class="box-header with-border">
-        <h3 class="box-title">{{Lang::get('lang.edit')}}</h3>
+@if(Session::has('errors'))
+<?php //dd($errors); ?>
+<div class="alert alert-danger alert-dismissable">
+    <i class="fas fa-ban"></i>
+    <b>Alert!</b>
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    <br/>
+    @if($errors->first('status'))
+    <li class="error-message-padding">{!! $errors->first('status', ':message') !!}</li>
+    @endif
+    @if($errors->first('type'))
+    <li class="error-message-padding">{!! $errors->first('type', ':message') !!}</li>
+    @endif
+    @if($errors->first('topic'))
+    <li class="error-message-padding">{!! $errors->first('topic', ':message') !!}</li>
+    @endif
+    @if($errors->first('parent_topic'))
+    <li class="error-message-padding">{!! $errors->first('parent_topic', ':message') !!}</li>
+    @endif
+    @if($errors->first('custom_form'))
+    <li class="error-message-padding">{!! $errors->first('custom_form', ':message') !!}</li>
+    @endif
+    @if($errors->first('department'))
+    <li class="error-message-padding">{!! $errors->first('department', ':message') !!}</li>
+    @endif
+    @if($errors->first('priority'))
+    <li class="error-message-padding">{!! $errors->first('priority', ':message') !!}</li>
+    @endif
+    @if($errors->first('sla_plan'))
+    <li class="error-message-padding">{!! $errors->first('sla_plan', ':message') !!}</li>
+    @endif
+    @if($errors->first('auto_assign'))
+    <li class="error-message-padding">{!! $errors->first('auto_assign', ':message') !!}</li>
+    @endif
+</div>
+@endif
+<div class="card card-light">
+    <div class="card-header">
+        <h3 class="card-title">{{Lang::get('lang.edit')}}</h3>
     </div>
-    <div class="box-body">
-        @if(Session::has('errors'))
-        <?php //dd($errors); ?>
-        <div class="alert alert-danger alert-dismissable">
-            <i class="fa fa-ban"></i>
-            <b>Alert!</b>
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            <br/>
-            @if($errors->first('status'))
-            <li class="error-message-padding">{!! $errors->first('status', ':message') !!}</li>
-            @endif
-            @if($errors->first('type'))
-            <li class="error-message-padding">{!! $errors->first('type', ':message') !!}</li>
-            @endif
-            @if($errors->first('topic'))
-            <li class="error-message-padding">{!! $errors->first('topic', ':message') !!}</li>
-            @endif
-            @if($errors->first('parent_topic'))
-            <li class="error-message-padding">{!! $errors->first('parent_topic', ':message') !!}</li>
-            @endif
-            @if($errors->first('custom_form'))
-            <li class="error-message-padding">{!! $errors->first('custom_form', ':message') !!}</li>
-            @endif
-            @if($errors->first('department'))
-            <li class="error-message-padding">{!! $errors->first('department', ':message') !!}</li>
-            @endif
-            @if($errors->first('priority'))
-            <li class="error-message-padding">{!! $errors->first('priority', ':message') !!}</li>
-            @endif
-            @if($errors->first('sla_plan'))
-            <li class="error-message-padding">{!! $errors->first('sla_plan', ':message') !!}</li>
-            @endif
-            @if($errors->first('auto_assign'))
-            <li class="error-message-padding">{!! $errors->first('auto_assign', ':message') !!}</li>
-            @endif
-        </div>
-        @endif
-        <!-- status radio: required: Active|Dissable -->
+    <div class="card-body">
         <div class="row">
-            <div class="col-md-6">
-                <div class="form-group {{ $errors->has('ticket_status') ? 'has-error' : '' }}">
-                    {!! Form::label('ticket_status',Lang::get('lang.status')) !!}&nbsp;&nbsp;
-                    {!! Form::radio('status','1',true) !!} {{Lang::get('lang.active')}}&nbsp;&nbsp;&nbsp;
-                    {!! Form::radio('status','0') !!} {{Lang::get('lang.inactive')}}
-                </div>
-            </div>
-            <!-- Type : Radio : required : Public|private -->
-            <div class="col-md-6">
-                <div class="form-group {{ $errors->has('type') ? 'has-error' : '' }}">
-                    {!! Form::label('type',Lang::get('lang.type')) !!}&nbsp;&nbsp;
-                    {!! Form::radio('type','1',true) !!} {{Lang::get('lang.public')}}&nbsp;&nbsp;&nbsp;
-                    {!! Form::radio('type','0') !!} {{Lang::get('lang.private')}}
-                </div>
-            </div>
             <!-- Topic text form Required -->
             <div class="col-md-6">
                 <div class="form-group {{ $errors->has('topic') ? 'has-error' : '' }}">
@@ -94,22 +82,40 @@ class="active"
                     {!! Form::text('topic',null,['class' => 'form-control']) !!}
                 </div>
             </div>
+            <!-- status radio: required: Active|Dissable -->
+            <div class="col-md-3">
+                <div class="form-group {{ $errors->has('ticket_status') ? 'has-error' : '' }}">
+                    {!! Form::label('ticket_status',Lang::get('lang.status')) !!}&nbsp;&nbsp;<br/>
+                    {!! Form::radio('status','1',true) !!} {{Lang::get('lang.active')}}&nbsp;&nbsp;&nbsp;
+                    {!! Form::radio('status','0') !!} {{Lang::get('lang.inactive')}}
+                </div>
+            </div>
+            <!-- Type : Radio : required : Public|private -->
+            <div class="col-md-3">
+                <div class="form-group {{ $errors->has('type') ? 'has-error' : '' }}">
+                    {!! Form::label('type',Lang::get('lang.type')) !!}&nbsp;&nbsp;<br/>
+                    {!! Form::radio('type','1',true) !!} {{Lang::get('lang.public')}}&nbsp;&nbsp;&nbsp;
+                    {!! Form::radio('type','0') !!} {{Lang::get('lang.private')}}
+                </div>
+            </div>
+        </div>
+        <div class="row">
             <!-- Parent Topic: Drop down: value from helptopic table -->
-            <div class="col-md-6">
+            <div class="col-md-4">
                 <div class="form-group {{ $errors->has('parent_topic') ? 'has-error' : '' }}">
                     {!! Form::label('parent_topic',Lang::get('lang.parent_topic')) !!}
                     {!!Form::select('parent_topic', [''=>Lang::get('lang.select_a_parent_topic'),Lang::get('lang.help_topic')=>$topics->pluck('topic','id')->toArray()],null,['class' => 'form-control']) !!}
                 </div>
             </div>
             <!-- Custom Form: Drop down: value from form table -->
-            <div class="col-md-6">
+            <div class="col-md-4">
                 <div class="form-group {{ $errors->has('custom_form') ? 'has-error' : '' }}">
                     {!! Form::label('custom_form',Lang::get('lang.Custom_form')) !!}
                     {!!Form::select('custom_form', [''=>Lang::get('lang.select_a_form'),Lang::get('lang.custom_form')=>$forms->pluck('formname','id')->toArray()],null,['class' => 'form-control']) !!}
                 </div>
             </div>
             <!-- Department:	Drop down: value Department form table -->
-            <div class="col-md-6">
+            <div class="col-md-4">
                 <div class="form-group {{ $errors->has('department') ? 'has-error' : '' }}">
                     {!! Form::label('department',Lang::get('lang.department')) !!}
                     {!!Form::select('department', [''=>Lang::get('lang.select_a_department'),Lang::get('lang.departments')=>$departments->pluck('name','id')->toArray()],null,['class' => 'form-control']) !!}
@@ -150,11 +156,12 @@ class="active"
             </div>
             <!-- Submit button -->
         </div>
-    </div>
-    <div class="box-footer">
-        <div class="form-group">
+
+        <div>
             <input type="checkbox" name="sys_help_tpoic" @if($sys_help_topic->help_topic == $topics->id) checked disabled @endif> {{ Lang::get('lang.make-default-helptopic')}}
         </div>
+    </div>
+    <div class="card-footer">
         {!! Form::submit(Lang::get('lang.update'),['class'=>'btn btn-primary'])!!}
     </div>
 </div>
diff --git a/resources/views/themes/default1/admin/helpdesk/manage/helptopic/index.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/helptopic/index.blade.php
index d8a286016..c60d69983 100644
--- a/resources/views/themes/default1/admin/helpdesk/manage/helptopic/index.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/manage/helptopic/index.blade.php
@@ -1,15 +1,19 @@
 @extends('themes.default1.admin.layout.admin')
 
 @section('Manage')
-active
+class="nav-link active"
 @stop
 
-@section('manage-bar')
-active
+@section('manage-menu-parent')
+class="nav-item menu-open"
+@stop
+
+@section('manage-menu-open')
+class="nav nav-treeview menu-open"
 @stop
 
 @section('help')
-class="active"
+class="nav-link active"
 @stop
 
 @section('HeadInclude')
@@ -28,29 +32,34 @@ class="active"
 <!-- /breadcrumbs -->
 <!-- content -->
 @section('content')
-<div class="box box-primary">
-    <div class="box-header with-border">
-        <h3 class="box-title">{{Lang::get('lang.help_topic')}}</h3>
-        <a href="{{route('helptopic.create')}}" class="btn btn-primary pull-right"><span class="glyphicon glyphicon-plus"></span> &nbsp;{{Lang::get('lang.create_help_topic')}}</a>
+<!-- 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 card-light">
+    <div class="card-header">
+        <h3 class="card-title">{{Lang::get('lang.help_topic')}}</h3>
+        <div class="card-tools">
+            <a href="{{route('helptopic.create')}}" class="btn btn-default btn-tool">
+                <span class="fas fa-plus"></span>&nbsp;{{Lang::get('lang.create_help_topic')}}
+            </a>        
+        </div>
     </div>
-    <div class="box-body table-responsive">
-        <!-- 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">
+        
         <table class="table table-bordered dataTable">
             <tr>
                 <th width="100px">{{Lang::get('lang.topic')}}</th>
@@ -118,13 +127,19 @@ class="active"
                 <!-- Deleting Fields -->
                 <td>
                     {!! Form::open(['route'=>['helptopic.destroy', $topic->id],'method'=>'DELETE']) !!}
-                    <a href="{{route('helptopic.edit',$topic->id)}}" class="btn btn-info btn-xs btn-flat"><i class="fa fa-trash" style="color:black;"> </i> {!! Lang::get('lang.edit') !!}</a>
+                    <a href="{{route('helptopic.edit',$topic->id)}}" class="btn btn-primary btn-xs"><i class="fas fa-edit"> </i> {!! Lang::get('lang.edit') !!}</a>
                     <!-- To pop up a confirm Message -->
-                    {!! Form::button('<i class="fa fa-trash" style="color:black;"> </i> '.Lang::get('lang.delete'),
-                    ['type' => 'submit',
-                    'class'=> 'btn btn-warning btn-xs btn-flat '.$disable,
-                    'onclick'=>'return confirm("Are you sure?")'])
-                    !!}
+                    @if($topic->id == $default_helptopic)
+                        {!! Form::button('<i class="fas fa-trash"> </i> '.Lang::get('lang.delete'),
+                        ['class'=> 'btn btn-danger btn-xs '.$disable])
+                        !!}
+                    @else
+                        {!! Form::button('<i class="fas fa-trash"> </i> '.Lang::get('lang.delete'),
+                        ['type' => 'submit',
+                        'class'=> 'btn btn-danger btn-xs',
+                        'onclick'=>'return confirm("Are you sure?")'])
+                        !!}
+                    @endif
                     </div>
                     {!! Form::close() !!}
                 </td>
diff --git a/resources/views/themes/default1/admin/helpdesk/manage/sla/create.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/sla/create.blade.php
index 23498bcf0..e64975d3c 100644
--- a/resources/views/themes/default1/admin/helpdesk/manage/sla/create.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/manage/sla/create.blade.php
@@ -1,15 +1,19 @@
 @extends('themes.default1.admin.layout.admin')
 
 @section('Manage')
-active
+class="nav-link active"
 @stop
 
-@section('manage-bar')
-active
+@section('manage-menu-parent')
+class="nav-item menu-open"
+@stop
+
+@section('manage-menu-open')
+class="nav nav-treeview menu-open"
 @stop
 
 @section('sla')
-class="active"
+class="nav-link active"
 @stop
 
 @section('HeadInclude')
@@ -29,48 +33,48 @@ class="active"
 @section('content')
 <!-- open a form -->
 {!! Form::open(['action' => 'Admin\helpdesk\SlaController@store', 'method' => 'post']) !!}
-<div class="box box-primary">
-    <div class="box-header with-border">
-        <h2 class="box-title">{{Lang::get('lang.create')}}</h2>
+@if(Session::has('errors'))
+<?php //dd($errors); ?>
+<div class="alert alert-danger alert-dismissable">
+    <i class="fa fa-ban"></i>
+    <b>Alert!</b>
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    <br/>
+    @if($errors->first('name'))
+    <li class="error-message-padding">{!! $errors->first('name', ':message') !!}</li>
+    @endif
+    @if($errors->first('grace_period'))
+    <li class="error-message-padding">{!! $errors->first('grace_period', ':message') !!}</li>
+    @endif
+    @if($errors->first('status'))
+    <li class="error-message-padding">{!! $errors->first('status', ':message') !!}</li>
+    @endif
+</div>
+@endif
+<div class="card card-light">
+    <div class="card-header">
+        <h3 class="card-title">{{Lang::get('lang.create')}}</h3>
     </div>
-    <div class="box-body">
-        @if(Session::has('errors'))
-        <?php //dd($errors); ?>
-        <div class="alert alert-danger alert-dismissable">
-            <i class="fa fa-ban"></i>
-            <b>Alert!</b>
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            <br/>
-            @if($errors->first('name'))
-            <li class="error-message-padding">{!! $errors->first('name', ':message') !!}</li>
-            @endif
-            @if($errors->first('grace_period'))
-            <li class="error-message-padding">{!! $errors->first('grace_period', ':message') !!}</li>
-            @endif
-            @if($errors->first('status'))
-            <li class="error-message-padding">{!! $errors->first('status', ':message') !!}</li>
-            @endif
-        </div>
-        @endif
+    <div class="card-body">
         <!-- <table class="table table-hover" style="overflow:hidden;"> -->
         <div class="row">
-            <div class="col-md-6">
+            <div class="col-md-4">
                 <div class="form-group {{ $errors->has('name') ? 'has-error' : '' }}">
                     {!! Form::label('name',Lang::get('lang.name')) !!} <span class="text-red"> *</span>
                     {!! Form::text('name',null,['class' => 'form-control']) !!}
                 </div>
             </div>
             <!-- Grace Period text form Required -->
-            <div class="col-md-6">
+            <div class="col-md-4">
                 <div class="form-group {{ $errors->has('grace_period') ? 'has-error' : '' }}">
                     {!! Form::label('grace_period',Lang::get('lang.grace_period')) !!}
                     {!! Form::select('grace_period',['6 Hours'=>'6 Hours', '12 Hours'=>'12 Hours', '18 Hours'=>'18 Hours', '24 Hours'=>'24 Hours', '36 Hours'=>'36 Hours', '48 Hours'=>'48 Hours'],null,['class' => 'form-control']) !!}
                 </div>
             </div>
             <!-- status radio: required: Active|Dissable -->
-            <div class="col-md-6">
+            <div class="col-md-4">
                 <div class="form-group {{ $errors->has('status') ? 'has-error' : '' }}">
-                    {!! Form::label('status',Lang::get('lang.status')) !!}&nbsp;
+                    {!! Form::label('status',Lang::get('lang.status')) !!}&nbsp;<br/>
                     {!! Form::radio('status','1',true) !!} {{Lang::get('lang.active')}}&nbsp;&nbsp;
                     {!! Form::radio('status','0') !!} {{Lang::get('lang.inactive')}}
                 </div>
@@ -86,7 +90,7 @@ class="active"
             </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/manage/sla/edit.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/sla/edit.blade.php
index bc6ca7638..731994b1a 100644
--- a/resources/views/themes/default1/admin/helpdesk/manage/sla/edit.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/manage/sla/edit.blade.php
@@ -1,15 +1,19 @@
 @extends('themes.default1.admin.layout.admin')
 
 @section('Manage')
-active
+class="nav-link active"
 @stop
 
-@section('manage-bar')
-active
+@section('manage-menu-parent')
+class="nav-item menu-open"
+@stop
+
+@section('manage-menu-open')
+class="nav nav-treeview menu-open"
 @stop
 
 @section('sla')
-class="active"
+class="nav-link active"
 @stop
 
 @section('HeadInclude')
@@ -29,70 +33,68 @@ class="active"
 @section('content')
 <!-- open a form -->
 {!! Form::model($slas,['url' => 'sla/'.$slas->id, 'method' => 'PATCH']) !!}
-<div class="box box-primary">
-    <div class="box-header with-border">
-        <h2 class="box-title">{{Lang::get('lang.edit')}}</h2>
+@if(Session::has('errors'))
+<?php //dd($errors); ?>
+<div class="alert alert-danger alert-dismissable">
+    <i class="fa fa-ban"></i>
+    <b>Alert!</b>
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    <br/>
+    @if($errors->first('name'))
+    <li class="error-message-padding">{!! $errors->first('name', ':message') !!}</li>
+    @endif
+    @if($errors->first('grace_period'))
+    <li class="error-message-padding">{!! $errors->first('grace_period', ':message') !!}</li>
+    @endif
+    @if($errors->first('status'))
+    <li class="error-message-padding">{!! $errors->first('status', ':message') !!}</li>
+    @endif
+</div>
+@endif
+<div class="card card-light">
+    <div class="card-header">
+        <h3 class="card-title">{{Lang::get('lang.edit')}}</h3>
     </div>
-    <div class="box-body">
-        @if(Session::has('errors'))
-        <?php //dd($errors); ?>
-        <div class="alert alert-danger alert-dismissable">
-            <i class="fa fa-ban"></i>
-            <b>Alert!</b>
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            <br/>
-            @if($errors->first('name'))
-            <li class="error-message-padding">{!! $errors->first('name', ':message') !!}</li>
-            @endif
-            @if($errors->first('grace_period'))
-            <li class="error-message-padding">{!! $errors->first('grace_period', ':message') !!}</li>
-            @endif
-            @if($errors->first('status'))
-            <li class="error-message-padding">{!! $errors->first('status', ':message') !!}</li>
-            @endif
-        </div>
-        @endif
+    <div class="card-body"> 
         <!-- Name text form Required -->
-        <div class="box-body table-responsive no-padding"style="overflow:hidden;">
-        <!-- <table class="table table-hover" style="overflow:hidden;"> -->
-            <div class="row">
-                <div class="col-md-6">
-                    <div class="form-group {{ $errors->has('name') ? 'has-error' : '' }}">
-                        {!! Form::label('name',Lang::get('lang.name')) !!} <span class="text-red"> *</span>
-                        {!! Form::text('name',null,['class' => 'form-control']) !!}
-                    </div>
-                </div>
-                <!-- Grace Period text form Required -->
-                <div class="col-md-6">
-                    <div class="form-group {{ $errors->has('grace_period') ? 'has-error' : '' }}">
-                        {!! Form::label('grace_period',Lang::get('lang.grace_period')) !!}
-                        {!! Form::select('grace_period',['6 Hours'=>'6 Hours', '12 Hours'=>'12 Hours', '18 Hours'=>'18 Hours', '24 Hours'=>'24 Hours', '36 Hours'=>'36 Hours', '48 Hours'=>'48 Hours'],null,['class' => 'form-control']) !!}
-                    </div>
-                </div>
-                <!-- status radio: required: Active|Dissable -->
-                <div class="col-md-6">
-                    <div class="form-group {{ $errors->has('status') ? 'has-error' : '' }}">
-                        {!! Form::label('status',Lang::get('lang.status')) !!}&nbsp;
-                        {!! Form::radio('status','1',true) !!} &nbsp; {{Lang::get('lang.active')}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                        {!! Form::radio('status','0') !!} &nbsp; {{Lang::get('lang.inactive')}}
-                    </div>
+        <div class="row">
+            <div class="col-md-4">
+                <div class="form-group {{ $errors->has('name') ? 'has-error' : '' }}">
+                    {!! Form::label('name',Lang::get('lang.name')) !!} <span class="text-red"> *</span>
+                    {!! Form::text('name',null,['class' => 'form-control']) !!}
                 </div>
             </div>
-            <!-- Admin Note : Textarea : -->
-            <div class="row">
-                <div class="col-md-12">
-                    <div class="form-group">
-                        {!! Form::label('admin_note',Lang::get('lang.admin_notes')) !!}
-                        {!! Form::textarea('admin_note',null,['class' => 'form-control','size' => '30x5']) !!}
-                    </div>
+            <!-- Grace Period text form Required -->
+            <div class="col-md-4">
+                <div class="form-group {{ $errors->has('grace_period') ? 'has-error' : '' }}">
+                    {!! Form::label('grace_period',Lang::get('lang.grace_period')) !!}
+                    {!! Form::select('grace_period',['6 Hours'=>'6 Hours', '12 Hours'=>'12 Hours', '18 Hours'=>'18 Hours', '24 Hours'=>'24 Hours', '36 Hours'=>'36 Hours', '48 Hours'=>'48 Hours'],null,['class' => 'form-control']) !!}
+                </div>
+            </div>
+            <!-- status radio: required: Active|Dissable -->
+            <div class="col-md-4">
+                <div class="form-group {{ $errors->has('status') ? 'has-error' : '' }}">
+                    {!! Form::label('status',Lang::get('lang.status')) !!}&nbsp;<br/>
+                    {!! Form::radio('status','1',true) !!} &nbsp; {{Lang::get('lang.active')}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    {!! Form::radio('status','0') !!} &nbsp; {{Lang::get('lang.inactive')}}
                 </div>
             </div>
         </div>
-    </div>
-    <div class="box-footer">
-        <div class="form-group">
+        <!-- Admin Note : Textarea : -->
+        <div class="row">
+            <div class="col-md-12">
+                <div class="form-group">
+                    {!! Form::label('admin_note',Lang::get('lang.admin_notes')) !!}
+                    {!! Form::textarea('admin_note',null,['class' => 'form-control','size' => '30x5']) !!}
+                </div>
+            </div>
+        </div>
+
+        <div>
             <input type="checkbox" name="sys_sla" @if($slas->id == $sla->sla) checked disabled @endif> {{ Lang::get('lang.make-default-sla')}}
         </div>
+    </div>
+    <div class="card-footer">
         {!! Form::submit(Lang::get('lang.update'),['class'=>'btn btn-primary'])!!}
     </div>
 </div>
diff --git a/resources/views/themes/default1/admin/helpdesk/manage/sla/index.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/sla/index.blade.php
index a9caa469a..411e8e9ee 100644
--- a/resources/views/themes/default1/admin/helpdesk/manage/sla/index.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/manage/sla/index.blade.php
@@ -1,15 +1,19 @@
 @extends('themes.default1.admin.layout.admin')
 
 @section('Manage')
-active
+class="nav-link active"
 @stop
 
-@section('manage-bar')
-active
+@section('manage-menu-parent')
+class="nav-item menu-open"
+@stop
+
+@section('manage-menu-open')
+class="nav nav-treeview menu-open"
 @stop
 
 @section('sla')
-class="active"
+class="nav-link active"
 @stop
 
 @section('HeadInclude')
@@ -28,49 +32,53 @@ class="active"
 <!-- /breadcrumbs -->
 <!-- content -->
 @section('content')
-	<div class="row">
-<div class="col-md-12">
-<div class="box box-primary">
-<div class="box-header">
-	<h2 class="box-title">{{Lang::get('lang.SLA_plan')}}</h2><a href="{{route('sla.create')}}" class="btn btn-primary pull-right"><span class="glyphicon glyphicon-plus"></span> &nbsp;{{Lang::get('lang.create_SLA')}}</a></div>
-
-<div class="box-body table-responsive">
-
 <!-- check whether success or not -->
-
 @if(Session::has('success'))
-    <div class="alert alert-success alert-dismissable">
-        <i class="fa  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
-    <!-- failure 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
+<div class="alert alert-success alert-dismissable">
+  <i class="fa  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
+<!-- failure 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
 
-<table class="table table-bordered dataTable" style="overflow:hidden;">
+<div class="card card-light">
+	
+	<div class="card-header">
+		<h3 class="card-title">{{Lang::get('lang.SLA_plan')}}</h3>
+		<div class="card-tools">
+			<a href="{{route('sla.create')}}" class="btn btn-default btn-tool">
+				<span class="fas fa-plus"></span>&nbsp;{{Lang::get('lang.create_SLA')}}
+			</a>
+		</div>
+	</div>
+	
+	<div class="card-body ">
 
-	<tr>
-		<th width="100px">{{Lang::get('lang.name')}}</th>
-		<th width="100px">{{Lang::get('lang.status')}}</th>
-		<th width="100px">{{Lang::get('lang.grace_period')}}</th>
-		<th width="100px">{{Lang::get('lang.created')}}</th>
-		<th width="100px">{{Lang::get('lang.last_updated')}}</th>
-		<th width="100px">{{Lang::get('lang.action')}}</th>
-	</tr>
+		<table class="table table-bordered dataTable" style="overflow:scroll;">
 
-<?php
-$default_sla = App\Model\helpdesk\Settings\Ticket::where('id','=','1')->first();
-$default_sla = $default_sla->sla;
-?>
+			<tr>
+				<th width="100px">{{Lang::get('lang.name')}}</th>
+				<th width="100px">{{Lang::get('lang.status')}}</th>
+				<th width="100px">{{Lang::get('lang.grace_period')}}</th>
+				<th width="100px">{{Lang::get('lang.created')}}</th>
+				<th width="100px">{{Lang::get('lang.last_updated')}}</th>
+				<th width="100px">{{Lang::get('lang.action')}}</th>
+			</tr>
+
+			<?php
+			$default_sla = App\Model\helpdesk\Settings\Ticket::where('id','=','1')->first();
+			$default_sla = $default_sla->sla;
+			?>
 
 	<!-- Foreach @var$slas as @var sla -->
 		@foreach($slas as $sla)
@@ -105,13 +113,20 @@ $default_sla = $default_sla->sla;
 		<!-- Deleting Fields -->
 		<td>
 			{!! Form::open(['route'=>['sla.destroy', $sla->id],'method'=>'DELETE']) !!}
-			<a href="{{route('sla.edit',$sla->id)}}" class="btn btn-info btn-xs btn-flat"><i class="fa fa-edit" style="color:black;"> </i> Edit</a>
+			<a href="{{route('sla.edit',$sla->id)}}" class="btn btn-primary btn-xs"><i class="fas fa-edit"> </i> Edit</a>
 			<!-- To pop up a confirm Message -->
-				{!! Form::button('<i class="fa fa-trash" style="color:black;"> </i> Delete',
-            		['type' => 'submit',
-            		'class'=> 'btn btn-warning btn-xs btn-flat '.$disable,
-            		'onclick'=>'return confirm("Are you sure?")'])
-            	!!}
+			@if($sla->id == $default_sla)
+				{!! Form::button('<i class="fas fa-trash"> </i> Delete',
+		   		['class'=> 'btn btn-danger btn-xs '.$disable])
+		   	!!}
+			@else
+			{!! Form::button('<i class="fas fa-trash"> </i> Delete',
+	   		['type' => 'submit',
+	   		'class'=> 'btn btn-danger btn-xs',
+	   		'onclick'=>'return confirm("Are you sure?")'])
+	   	!!}
+			@endif
+				
 			{!! Form::close() !!}
 		</td>
 		@endforeach
@@ -120,8 +135,6 @@ $default_sla = $default_sla->sla;
 
 </table>
 
-</div>
-</div>
 </div>
 </div>
 @stop
diff --git a/resources/views/themes/default1/admin/helpdesk/manage/ticket_priority/create.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/ticket_priority/create.blade.php
index 847e425ec..7dceb455d 100644
--- a/resources/views/themes/default1/admin/helpdesk/manage/ticket_priority/create.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/manage/ticket_priority/create.blade.php
@@ -1,15 +1,19 @@
 @extends('themes.default1.admin.layout.admin')
 
 @section('Manage')
-active
+class="nav-link active"
 @stop
 
-@section('manage-bar')
-active
+@section('manage-menu-parent')
+class="nav-item menu-open"
+@stop
+
+@section('manage-menu-open')
+class="nav nav-treeview menu-open"
 @stop
 
 @section('priority')
-class="active"
+class="nav-link active"
 @stop
 
 @section('HeadInclude')
@@ -31,86 +35,69 @@ class="active"
 
 <form action="{!!URL::route('priority.create1')!!}" method="post" role="form">
 {{ csrf_field() }}
-    <div class="box box-primary">
-        <div class="box-header with-border">
-            <h2 class="box-title">{{Lang::get('lang.create')}}</h2>
+    @if(Session::has('errors'))
+    <?php //dd($errors); ?>
+    <div class="alert alert-danger alert-dismissable">
+        <i class="fa fa-ban"></i>
+        <b>Alert!</b>
+        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+        <br/>
+        @if($errors->first('priority'))
+        <li class="error-message-padding">{!! $errors->first('priority', ':message') !!}</li>
+        @endif
+        @if($errors->first('priority_desc'))
+        <li class="error-message-padding">{!! $errors->first('priority_desc', ':message') !!}</li>
+        @endif
+        @if($errors->first('priority_color'))
+        <li class="error-message-padding">{!! $errors->first('priority_color', ':message') !!}</li>
+        @endif
+        @if($errors->first('status'))
+        <li class="error-message-padding">{!! $errors->first('status', ':message') !!}</li>
+        @endif
+    </div>
+    @endif
+    <div class="card card-light">
+        <div class="card-header">
+            <h3 class="card-title">{{Lang::get('lang.create')}}</h3>
         </div>
-        <div class="box-body">
-            @if(Session::has('errors'))
-            <?php //dd($errors); ?>
-            <div class="alert alert-danger alert-dismissable">
-                <i class="fa fa-ban"></i>
-                <b>Alert!</b>
-                <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-                <br/>
-                @if($errors->first('priority'))
-                <li class="error-message-padding">{!! $errors->first('priority', ':message') !!}</li>
-                @endif
-                @if($errors->first('priority_desc'))
-                <li class="error-message-padding">{!! $errors->first('priority_desc', ':message') !!}</li>
-                @endif
-                @if($errors->first('priority_color'))
-                <li class="error-message-padding">{!! $errors->first('priority_color', ':message') !!}</li>
-                @endif
-                @if($errors->first('status'))
-                <li class="error-message-padding">{!! $errors->first('status', ':message') !!}</li>
-                @endif
-            </div>
-            @endif
-            <!-- <table class="table table-hover" style="overflow:hidden;"> -->
+        <div class="card-body">
             <div class="row">
-                <div class="col-md-6">
-                    <div class="form-group {{ $errors->has('priority') ? 'has-error' : '' }}">
-                        {!! Form::label('priority',Lang::get('lang.priority')) !!} <span class="text-red"> *</span>
-                        <input type="text" class="form-control" name="priority" value="" >
-                    </div>
+                <div class="form-group col-md-6 {{ $errors->has('priority') ? 'has-error' : '' }}">
+                    {!! Form::label('priority',Lang::get('lang.priority')) !!} <span class="text-red"> *</span>
+                    <input type="text" class="form-control" name="priority" value="" >
                 </div>
                 <!-- Grace Period text form Required -->
-                <div class="col-md-6">
-                    <div class="form-group {{ $errors->has('priority_desc') ? 'has-error' : '' }}">
-                        {!! Form::label('priority_desc',Lang::get('lang.priority_desc')) !!}<span class="text-red"> *</span>
-                        <input type="text" name="priority_desc" class="form-control">
-                    </div>
+                <div class="form-group col-md-6 {{ $errors->has('priority_desc') ? 'has-error' : '' }}">
+                    {!! Form::label('priority_desc',Lang::get('lang.priority_desc')) !!}<span class="text-red"> *</span>
+                    <input type="text" name="priority_desc" class="form-control">
                 </div> 
             </div>
             <!-- Priority Color -->
             <div class="row">
-                <div class="col-md-6">
-                    <div class="form-group {{ $errors->has('priority_color') ? 'has-error' : '' }}">
-                        {!! Form::label('priority_color',Lang::get('lang.priority_color')) !!}<span class="text-red"> *</span>
-                        <input class="form-control my-colorpicker1 colorpicker-element" id="colorpicker" type="text" name="priority_color">
-
-                    </div>
-                </div>
-                <!-- status radio: required: Active|Dissable -->
-                <div class="col-md-3">
-                    <div class="form-group {{ $errors->has('status') ? 'has-error' : '' }}">
-                        {!! Form::label('status',Lang::get('lang.status')) !!}&nbsp;<span class="text-red"> *</span>
-                        <input type="radio"  name="status" value="1" checked>{{Lang::get('lang.active')}}
-                        <input type="radio"  name="status" value="0" >{{Lang::get('lang.inactive')}}
-                    </div>       
+                <div class="form-group col-sm-6 {{ $errors->has('priority_color') ? 'has-error' : '' }}">
+                    {!! Form::label('priority_color',Lang::get('lang.priority_color')) !!}<span class="text-red"> *</span>
+                    <input class="form-control my-colorpicker1 colorpicker-element" id="colorpicker" type="text" name="priority_color">
                 </div>
 
-                <!-- Show radio: required: public|private -->
-                <div class="col-md-3">
-                    <div class="form-group {{ $errors->has('ispublic') ? 'has-error' : '' }}">
-                        {!! Form::label('ispublic',Lang::get('lang.visibility')) !!}&nbsp;<span class="text-red"> *</span>
-                        <input type="radio"  name="ispublic" value="1" checked>public
-                        <input type="radio"  name="ispublic" value="0" >private
-                    </div>       
+                <div class="form-group col-sm-3 {{ $errors->has('status') ? 'has-error' : '' }}">
+                    {!! Form::label('status',Lang::get('lang.status')) !!}&nbsp;<span class="text-red"> *</span><br/>
+                    <input type="radio"  name="status" value="1" checked>&nbsp;&nbsp;{{Lang::get('lang.active')}}&nbsp;&nbsp;
+                    <input type="radio"  name="status" value="0" >&nbsp;&nbsp;{{Lang::get('lang.inactive')}}
+                </div> 
+
+                <div class="form-group col-sm-3 {{ $errors->has('ispublic') ? 'has-error' : '' }}">
+                    {!! Form::label('ispublic',Lang::get('lang.visibility')) !!}&nbsp;<span class="text-red"> *</span><br/>
+                    <input type="radio"  name="ispublic" value="1" checked>&nbsp;&nbsp;Public&nbsp;&nbsp;
+                    <input type="radio"  name="ispublic" value="0" >&nbsp;&nbsp;Private
                 </div>
             </div>  
             <!-- Admin Note  : Textarea :  -->
-            <div class="row">
-                <div class="col-md-12">
-                    <div class="form-group">
-                        {!! Form::label('admin_note',Lang::get('lang.admin_notes')) !!}
-                        {!! Form::textarea('admin_note',null,['class' => 'form-control','size' => '30x5']) !!}
-                    </div>
-                </div>
+            <div>
+                {!! Form::label('admin_note',Lang::get('lang.admin_notes')) !!}
+                {!! Form::textarea('admin_note',null,['class' => 'form-control','size' => '30x5']) !!}        
             </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/manage/ticket_priority/edit.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/ticket_priority/edit.blade.php
index fe4bb7909..7cf447249 100644
--- a/resources/views/themes/default1/admin/helpdesk/manage/ticket_priority/edit.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/manage/ticket_priority/edit.blade.php
@@ -1,15 +1,19 @@
 @extends('themes.default1.admin.layout.admin')
 
 @section('Manage')
-active
+class="nav-link active"
 @stop
 
-@section('manage-bar')
-active
+@section('manage-menu-parent')
+class="nav-item menu-open"
+@stop
+
+@section('manage-menu-open')
+class="nav nav-treeview menu-open"
 @stop
 
 @section('priority')
-class="active"
+class="nav-link active"
 @stop
 
 @section('HeadInclude')
@@ -31,94 +35,79 @@ class="active"
 <form action="{!!URL::route('priority.edit1')!!}" method="post" role="form">
 {{ csrf_field() }}
     <input type="hidden" name="priority_id" value="{{$tk_priority->priority_id}}">
-    <div class="box box-primary">
-        <div class="box-header with-border">
-            <h2 class="box-title">{{Lang::get('lang.edit')}}</h2>
+    @if(Session::has('errors'))
+    <?php //dd($errors); ?>
+    <div class="alert alert-danger alert-dismissable">
+        <i class="fas fa-ban"></i>
+        <b>Alert!</b>
+        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+        <br/>
+        @if($errors->first('priority'))
+        <li class="error-message-padding">{!! $errors->first('priority', ':message') !!}</li>
+        @endif
+        @if($errors->first('priority_desc'))
+        <li class="error-message-padding">{!! $errors->first('priority_desc', ':message') !!}</li>
+        @endif
+        @if($errors->first('priority_color'))
+        <li class="error-message-padding">{!! $errors->first('priority_color', ':message') !!}</li>
+        @endif
+        @if($errors->first('status'))
+        <li class="error-message-padding">{!! $errors->first('status', ':message') !!}</li>
+        @endif
+        @if($errors->first('ispublic'))
+        <li class="error-message-padding">{!! $errors->first('ispublic', ':message') !!}</li>
+        @endif
+    </div>
+    @endif
+    <div class="card card-light">
+        <div class="card-header">
+            <h3 class="card-title">{{Lang::get('lang.edit')}}</h3>
         </div>
-        <div class="box-body">
-            @if(Session::has('errors'))
-            <?php //dd($errors); ?>
-            <div class="alert alert-danger alert-dismissable">
-                <i class="fa fa-ban"></i>
-                <b>Alert!</b>
-                <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-                <br/>
-                @if($errors->first('priority'))
-                <li class="error-message-padding">{!! $errors->first('priority', ':message') !!}</li>
-                @endif
-                @if($errors->first('priority_desc'))
-                <li class="error-message-padding">{!! $errors->first('priority_desc', ':message') !!}</li>
-                @endif
-                @if($errors->first('priority_color'))
-                <li class="error-message-padding">{!! $errors->first('priority_color', ':message') !!}</li>
-                @endif
-                @if($errors->first('status'))
-                <li class="error-message-padding">{!! $errors->first('status', ':message') !!}</li>
-                @endif
-                @if($errors->first('ispublic'))
-                <li class="error-message-padding">{!! $errors->first('ispublic', ':message') !!}</li>
-                @endif
-            </div>
-            @endif
-            <!-- Name text form Required -->
-            <div class="box-body table-responsive no-padding"style="overflow:hidden;">
-            <!-- <table class="table table-hover" style="overflow:hidden;"> -->
-                <div class="row">
-                    <div class="col-md-6">
-                        <div class="form-group {{ $errors->has('priority') ? 'has-error' : '' }}">
-                            {!! Form::label('priority',Lang::get('lang.priority')) !!}<span class="text-red"> *</span>
-                            <input type="text" class="form-control" name="priority" value="{{ ($tk_priority->priority) }}" >
-                        </div>
-                    </div>
-                    <!-- Grace Period text form Required -->
-                    <div class="col-md-6">
-                        <div class="form-group {{ $errors->has('priority_desc') ? 'has-error' : '' }}">
-                            {!! Form::label('priority_desc',Lang::get('lang.priority_desc')) !!} <span class="text-red"> *</span>
-                            <input type="text" class="form-control" name="priority_desc" value="{{ ($tk_priority->priority_desc) }}">
-                        </div>
-                    </div></div>
-                <!-- Priority Color -->
-                <div class="row">
-                    <div class="col-md-6">
-                        <div class="form-group {{ $errors->has('priority_color') ? 'has-error' : '' }}">
-                            {!! Form::label('priority_color',Lang::get('lang.priority_color')) !!}<span class="text-red"> *</span>
-                            <input class="form-control my-colorpicker1 colorpicker-element" id="colorpicker" value="{{ ($tk_priority->priority_color) }}" type="text" name="priority_color">
-                        </div>
-                    </div>
-                    <!-- status radio: required: Active|Dissable -->
-                    <div class="col-md-3">
-                        <div class="form-group {{ $errors->has('status') ? 'has-error' : '' }}">
-                            {!! Form::label('status',Lang::get('lang.status')) !!}<span class="text-red"> *</span>
-                            <input type="radio"  name="status" value="1" {{$tk_priority->status == '1' ? 'checked' : ''}}>{{Lang::get('lang.active')}}
-                            <input type="radio"  name="status"  value="0" {{$tk_priority->status == '0' ? 'checked' : ''}}>{{Lang::get('lang.inactive')}}
-                        </div>
-                    </div>
-                    <!-- Show radio: required: public|private -->
-                    <div class="col-md-3">
-                        <div class="form-group {{ $errors->has('ispublic') ? 'has-error' : '' }}">
-                            {!! Form::label('visibility',Lang::get('lang.visibility')) !!}&nbsp;<span class="text-red"> *</span>
-                            <input type="radio"  name="ispublic" value="1" {{$tk_priority->ispublic == '1' ? 'checked' : ''}} >&nbsp;{{Lang::get('lang.public')}}
-                            <input type="radio"  name="ispublic"  value="0" {{$tk_priority->ispublic == '0' ? 'checked' : ''}}>{{Lang::get('lang.private')}}
-                        </div>       
-                    </div>
-                </div>  
-                <!-- Admin Note : Textarea : -->
-                <div class="row">
-                    <div class="col-md-12">
-                        <div class="form-group">
-                            {!! Form::label('admin_note',Lang::get('lang.admin_notes')) !!}
-                            {!! Form::textarea('admin_note',null,['class' => 'form-control','size' => '30x5']) !!}
-                        </div>
-                    </div>
+        <div class="card-body">
+            
+            <div class="row">
+
+                 <div class="form-group col-md-6 {{ $errors->has('priority') ? 'has-error' : '' }}">
+                    {!! Form::label('priority',Lang::get('lang.priority')) !!}<span class="text-red"> *</span>
+                    <input type="text" class="form-control" name="priority" value="{{ ($tk_priority->priority) }}" >
+                </div>
+
+                <div class="form-group col-md-6 {{ $errors->has('priority_desc') ? 'has-error' : '' }}">
+                    {!! Form::label('priority_desc',Lang::get('lang.priority_desc')) !!} <span class="text-red"> *</span>
+                    <input type="text" class="form-control" name="priority_desc" value="{{ ($tk_priority->priority_desc) }}">
                 </div>
             </div>
-        </div>
-        <div class="box-footer">
-            <div class="form-group">
+            <!-- Priority Color -->
+            <div class="row">
+
+                <div class="form-group col-sm-6 {{ $errors->has('priority_color') ? 'has-error' : '' }}">
+                    {!! Form::label('priority_color',Lang::get('lang.priority_color')) !!}<span class="text-red"> *</span>
+                    <input class="form-control my-colorpicker1 colorpicker-element" id="colorpicker" value="{{ ($tk_priority->priority_color) }}" type="text" name="priority_color">
+                </div>
+
+                <div class="form-group col-sm-3 {{ $errors->has('status') ? 'has-error' : '' }}">
+                    {!! Form::label('status',Lang::get('lang.status')) !!}<span class="text-red"> *</span><br/>
+                    <input type="radio"  name="status" value="1" {{$tk_priority->status == '1' ? 'checked' : ''}}>&nbsp;&nbsp;{{Lang::get('lang.active')}}&nbsp;&nbsp;
+                    <input type="radio"  name="status"  value="0" {{$tk_priority->status == '0' ? 'checked' : ''}}>&nbsp;&nbsp;{{Lang::get('lang.inactive')}}
+                </div>
+
+                <div class="form-group col-sm-3 {{ $errors->has('ispublic') ? 'has-error' : '' }}">
+                    {!! Form::label('visibility',Lang::get('lang.visibility')) !!}&nbsp;<span class="text-red"> *</span><br/>
+                    <input type="radio"  name="ispublic" value="1" {{$tk_priority->ispublic == '1' ? 'checked' : ''}} >&nbsp;&nbsp;{{Lang::get('lang.public')}}&nbsp;&nbsp;
+                    <input type="radio"  name="ispublic"  value="0" {{$tk_priority->ispublic == '0' ? 'checked' : ''}}>&nbsp;&nbsp;{{Lang::get('lang.private')}}
+                </div>
+            </div>  
+            <!-- Admin Note : Textarea : -->
+            <div>
+                {!! Form::label('admin_note',Lang::get('lang.admin_notes')) !!}
+                {!! Form::textarea('admin_note',null,['class' => 'form-control','size' => '30x5']) !!}
+            </div>
+
+            <div>
                 <input type="checkbox" name="default_priority" @if($tk_priority->is_default == $tk_priority->priority_id) checked disabled @endif> {{ Lang::get('lang.make-default-priority')}}
             </div>
-            <div class="form-group">
-            </div>
+        </div>
+        <div class="card-footer">
             {!! Form::submit(Lang::get('lang.update'),['class'=>'btn btn-primary'])!!}
         </div>
     </div>
diff --git a/resources/views/themes/default1/admin/helpdesk/manage/ticket_priority/index.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/ticket_priority/index.blade.php
index 334386e57..64ec1ca4c 100644
--- a/resources/views/themes/default1/admin/helpdesk/manage/ticket_priority/index.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/manage/ticket_priority/index.blade.php
@@ -1,15 +1,19 @@
 @extends('themes.default1.admin.layout.admin')
 
 @section('Manage')
-active
+class="nav-link active"
 @stop
 
-@section('manage-bar')
-active
+@section('manage-menu-parent')
+class="nav-item menu-open"
+@stop
+
+@section('manage-menu-open')
+class="nav nav-treeview menu-open"
 @stop
 
 @section('priority')
-class="active"
+class="nav-link active"
 @stop
 
 @section('HeadInclude')
@@ -30,7 +34,7 @@ class="active"
 
 @if(Session::has('success'))
 <div class="alert alert-success alert-dismissable">
-    <i class="fa  fa-check-circle"></i>
+    <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') !!}
@@ -39,42 +43,37 @@ class="active"
 <!-- failure message -->
 @if(Session::has('fails'))
 <div class="alert alert-danger alert-dismissable">
-    <i class="fa fa-ban"></i>
+    <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
-<div class="box box-primary">
-    <div class="box-header with-border">
-        <span class="lead border-right">{!! Lang::get('lang.priority') !!}</span>
-        <div class="pull-right">
-             <a href="{{route('priority.create')}}" class="btn btn-primary"> <span class="glyphicon glyphicon-plus"></span> &nbsp;{{Lang::get('lang.create_ticket_priority')}}</a>
+<div class="card card-light">
+    <div class="card-header">
+        <h3 class="card-title">{!! Lang::get('lang.priority') !!}</h3>
+        <div class="card-tools">
+             <a href="{{route('priority.create')}}" class="btn btn-default btn-tool"> 
+                <span class="fas fa-plus"></span>&nbsp;{{Lang::get('lang.create_ticket_priority')}}
+            </a>
         </div>
     </div>
 
-      <div class="box-header with-border">
-    <a class="right" title="" data-placement="right" data-toggle="tooltip" href="#" data-original-title="{{Lang::get('lang.active_user_can_select_the_priority_while_creating_ticket')}}">
+    <div class="card-body">
 
-        <span class="lead border-right" >{!! Lang::get('lang.current') !!}{!! Lang::get('lang.user_priority_status') !!}</span>
-       
+        <div class="mb-3">
+            
+            <a class="right" title="" data-placement="right" data-toggle="tooltip" href="#" data-original-title="{{Lang::get('lang.active_user_can_select_the_priority_while_creating_ticket')}}">
+
+                <span class="lead" >{!! Lang::get('lang.current') !!}{!! Lang::get('lang.user_priority_status') !!}</span> - 
            </a>
 
-                            <div class="btn-group pull-right" id="toggle_event_editing">
-                                <button type="button"  class="btn {{$user_status->status == '0' ? 'btn-info' : 'btn-default'}} locked_active">Inactive</button>
-                                <button type="button"  class="btn {{$user_status->status == '1' ? 'btn-info' : 'btn-default'}} unlocked_inactive">Active</button>
-                            </div>
-                            <!-- <div class="alert alert-info" id="switch_status"></div> -->
-                      
-             <!-- <a href="{{route('priority.create')}}" class="btn btn-primary">{{Lang::get('lang.create_ticket_priority')}}</a> -->
-        
-    </div>
+            <div class="btn-group" id="toggle_event_editing">
+                <button type="button"  class="btn {{$user_status->status == '0' ? 'btn-info' : 'btn-default'}} locked_active">Inactive</button>
+                <button type="button"  class="btn {{$user_status->status == '1' ? 'btn-info' : 'btn-default'}} unlocked_inactive">Active</button>
+            </div>
+        </div>
 
-
-
-
-
-    <div class="box-body">
         {!! Datatable::table()
         ->addColumn(
         Lang::get('lang.priority'),
@@ -85,8 +84,6 @@ class="active"
         ->setUrl(route('priority.index1')) // this is the route where data will be retrieved
         ->render() !!}
     </div>
-    <div class="box-footer">
-    </div>
 </div>
 <script type="text/javascript">
     $('a').tooltip()
diff --git a/resources/views/themes/default1/admin/helpdesk/manage/workflow/create.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/workflow/create.blade.php
index a0f8c6618..5ea71ebf8 100644
--- a/resources/views/themes/default1/admin/helpdesk/manage/workflow/create.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/manage/workflow/create.blade.php
@@ -1,15 +1,19 @@
 @extends('themes.default1.admin.layout.admin')
 
 @section('Manage')
-active
+class="nav-link active"
 @stop
 
-@section('manage-bar')
-active
+@section('manage-menu-parent')
+class="nav-item menu-open"
+@stop
+
+@section('manage-menu-open')
+class="nav nav-treeview menu-open"
 @stop
 
 @section('workflow')
-class="active"
+class="nav-link active"
 @stop
 
 @section('HeadInclude')
@@ -23,7 +27,7 @@ class="active"
 <!-- breadcrumbs -->
 @section('breadcrumbs')
 <ol class="breadcrumb">
-    <li><a href="{!! URL::route('setting') !!}"><i class="fa fa-dashboard"></i> {!! Lang::get('lang.home') !!}</a></li>
+    <li><a href="{!! URL::route('setting') !!}"><i class="fas fa-tachometer-alt"></i> {!! Lang::get('lang.home') !!}</a></li>
     <li><a href="{!! URL::route('workflow') !!}">{!! Lang::get('lang.ticket_workflow') !!}</a></li>
     <li class="active"><a href="{!! URL::route('workflow.create') !!}">{!! Lang::get('lang.create_workflow') !!}</a></li>
 </ol>
@@ -33,224 +37,206 @@ class="active"
 @section('content')
 <form class="form-horizontal" action="{!! URL::route('workflow.store') !!}" method="POST" id="form">
     {{ csrf_field() }}
-    <div class="box">
+    <!-- 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'))
+    <div class="alert alert-danger alert-dismissable">
+        <i class="fas fa-ban"></i>
+        <b>Alert!</b>
+        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+        <br/>
+        @if($errors->first('name'))
+        <li class="error-message-padding">{!! $errors->first('name', ':message') !!}</li>
+        @endif
+        @if($errors->first('execution_order'))
+        <li class="error-message-padding">{!! $errors->first('execution_order', ':message') !!}</li>
+        @endif
+        @if($errors->first('target_channel'))
+        <li class="error-message-padding">{!! $errors->first('target_channel', ':message') !!}</li>
+        @endif
+        @if($errors->first('rule'))
+        <li class="error-message-padding">{!! $errors->first('rule', ':message') !!}</li>
+        @endif
+        @if($errors->first('action'))
+        <li class="error-message-padding">{!! $errors->first('action', ':message') !!}</li>
+        @endif
+    </div>
+    @endif
+    <div class="card card-light">
+
+        <div class="card-header">
+            <h3 class="card-title">{!! Lang::get('lang.create_workflow') !!}</h3>
+        </div>
         <!-- /.box-header -->
-        <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'))
-            <div class="alert alert-danger alert-dismissable">
-                <i class="fa fa-ban"></i>
-                <b>Alert!</b>
-                <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-                <br/>
-                @if($errors->first('name'))
-                <li class="error-message-padding">{!! $errors->first('name', ':message') !!}</li>
-                @endif
-                @if($errors->first('execution_order'))
-                <li class="error-message-padding">{!! $errors->first('execution_order', ':message') !!}</li>
-                @endif
-                @if($errors->first('target_channel'))
-                <li class="error-message-padding">{!! $errors->first('target_channel', ':message') !!}</li>
-                @endif
-                @if($errors->first('rule'))
-                <li class="error-message-padding">{!! $errors->first('rule', ':message') !!}</li>
-                @endif
-                @if($errors->first('action'))
-                <li class="error-message-padding">{!! $errors->first('action', ':message') !!}</li>
-                @endif
-            </div>
-            @endif
-            <div class="form-group {!! $errors->has('name') ? 'has-error' : '' !!}">
-                <label for="inputName" class="col-sm-2 control-label">{!! Lang::get('lang.name') !!} <span class="text-red"> *</span></label>
-                <div class="col-sm-6">
+        <div class="card-body">
+
+            <div class="row">
+                <div class="form-group col-sm-6 {!! $errors->has('name') ? 'has-error' : '' !!}">
+                    <label for="inputName">{!! Lang::get('lang.name') !!} <span class="text-red"> *</span></label>
                     {!! Form::text('name',null,['class' => 'form-control', 'placeholder' => Lang::get('lang.name'), 'id' => 'name']) !!}
                 </div>
-            </div>
-            <div class="form-group {!! $errors->has('status') ? 'has-error' : '' !!}">
-                <label class="col-sm-2 control-label"> {!! Lang::get('lang.status') !!}</label>
-                <div class="col-sm-6">
-                    <input type="radio" id="inputEmail2" name="status" value="1" >&nbsp;&nbsp;<label class="control-label" for="inputEmail2">{!! Lang::get('lang.active') !!}</label>&nbsp;&nbsp;
-                    <input type="radio" id="inputEmail1" name="status" value="0" checked>&nbsp;&nbsp;<label class="control-label" for="inputEmail1">{!! Lang::get('lang.inactive') !!}</label>&nbsp;&nbsp;
-                </div>
-            </div>
-            <div class="form-group {!! $errors->has('execution_order') ? 'has-error' : '' !!}">
-                <div>
-                    <label for="Exceution" class="col-sm-2 control-label">{!! Lang::get('lang.execution_order') !!} <span class="text-red"> *</span></label>
-                    <div class="col-sm-6">
-                        {!! Form::input('number', 'execution_order',null,['class' => 'form-control', 'placeholder' => Lang::get('lang.execution_order'), 'id' => 'execution_order', 'min' => '0']) !!}
+
+                <div class="form-group col-sm-6 {!! $errors->has('status') ? 'has-error' : '' !!}">
+                    <label> {!! Lang::get('lang.status') !!}</label>
+                    <div>
+                        <input type="radio" id="inputEmail2" name="status" value="1" >&nbsp;&nbsp;{!! Lang::get('lang.active') !!}&nbsp;&nbsp;
+                        <input type="radio" id="inputEmail1" name="status" value="0" checked>&nbsp;&nbsp;{!! Lang::get('lang.inactive') !!}&nbsp;&nbsp;
                     </div>
                 </div>
             </div>
-            <div class="form-group {!! $errors->has('target_channel') ? 'has-error' : '' !!}">
-                <label class="col-sm-2 control-label">{!! Lang::get('lang.target_channel') !!} <span class="text-red"> *</span></label>
-                <div class="col-sm-6">
+
+            <div class="row">
+                <div class="form-group col-sm-6 {!! $errors->has('execution_order') ? 'has-error' : '' !!}">
+                    <label for="Exceution">{!! Lang::get('lang.execution_order') !!} <span class="text-red"> *</span></label>
+                    {!! Form::input('number', 'execution_order',null,['class' => 'form-control', 'placeholder' => Lang::get('lang.execution_order'), 'id' => 'execution_order', 'min' => '0']) !!}
+                </div>
+
+                <div class="form-group col-sm-6 {!! $errors->has('target_channel') ? 'has-error' : '' !!}">
+                    <label>{!! Lang::get('lang.target_channel') !!} <span class="text-red"> *</span></label>
                     {!! Form::select('target_channel', [''=> '-- '.Lang::get('lang.select_a_channel').' --', 'A-0' => 'Any', 'A-1' => 'Web Forms', 'A-4' => 'API Calls', 'A-2' => 'Emails'], null,['class' => 'form-control', 'id' => 'execution_order']) !!}
                 </div>
             </div>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-xs-12">
-            <div class="nav-tabs-custom">
-                <ul class="nav nav-tabs">
-                    <li class="active"><a href="#open" data-toggle="tab">{!! Lang::get('lang.workflow_rules') !!} <span class="text-red"> *</span></a>
-                    </li>
-                    <li><a href="#close" data-toggle="tab">{!! Lang::get('lang.workflow_action') !!} <span class="text-red"> *</span></a>
-                    </li>
-                    <li><a href="#delect" data-toggle="tab">{!! Lang::get('lang.internal_notes') !!} </a>
-                    </li>
-                </ul>
-                <div class="tab-content">
-                    <div class="active tab-pane" id="open">
-                        <div>
-                            <div>
-                                <!-- /.box-header -->
-                                <div class="box-body">
-                                    <table  class="table table-bordered table-hover">
-                                        <thead>
-                                            <tr>
-                                                <td>{!! Lang::get('lang.rules') !!} <span class="text-red"> *</span></td>
-                                                <td>{!! Lang::get('lang.condition') !!} <span class="text-red"> *</span></td>
-                                                <td>{!! Lang::get('lang.statement') !!} <span class="text-red"> *</span></td>
-                                                <td>{!! Lang::get('lang.action') !!}</td>
-                                            </tr>
-                                        </thead>
-                                        <tbody class="button1">
-                                            <tr id="firstdata">
-                                                <td>
-                                                    <select class="form-control" name="rule[0][a]" required>
-                                                        <option value="">-- {!! Lang::get('lang.select_one') !!} --</option>
-                                                        <option value="email">{!! Lang::get('lang.email') !!}</option>
-                                                        <option value="email_name">{!! Lang::get('lang.email_name') !!}</option>
-                                                        <option value="subject">{!! Lang::get('lang.subject') !!}</option>
-                                                        <option value="message">{!! Lang::get('lang.message') !!}/{!! Lang::get('lang.body') !!}</option>
-                                                    </select>
-                                                </td>
-                                                <td class="col-md-3">
-                                                    <select class="form-control" name="rule[0][b]" required>
-                                                        <option value="">-- {!! Lang::get('lang.select_one') !!} --</option>
-                                                        <option value="equal">{!! Lang::get('lang.equal_to') !!}</option>
-                                                        <option value="not_equal">{!! Lang::get('lang.not_equal_to') !!}</option>
-                                                        <option value="contains">{!! Lang::get('lang.contains') !!}</option>
-                                                        <option value="dn_contain">{!! Lang::get('lang.does_not_contain') !!}</option>
-                                                        <option value="starts">{!! Lang::get('lang.starts_with') !!}</option>
-                                                        <option value="ends">{!! Lang::get('lang.ends_with') !!}</option>
-                                                        <!--                                                        <option value="match">Match Regular Expressions</option>
-                                                                                                                <option value="not_match">Does not match Regular Expression</option>-->
-                                                    </select>
-                                                </td>
-                                                <td class="col-md-3">
-                                                    <input class="form-control" type="text" name="rule[0][c]" required>
-                                                </td>
-                                                <td style="text-align: center">
-                                                    <div class="tools"> 
-                                                        <span class="btnRemove1" data-toggle="modal" data-target="#">
-                                                            <a data-toggle="tooltip" data-placement="top" title="{!! Lang::get('lang.delete') !!}" onclick="document.getElementById('firstdata').innerHTML = ''">
-                                                                <i class="fa fa-trash-o"></i>
-                                                            </a>
-                                                        </span> 
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                    <div class="row" style="padding: 10px 15px 0px">
-                                        <div class="pull-right" >
-                                            <a class="btn btn-primary btnAdd1">{!! Lang::get('lang.add') !!}</a>
-                                        </div>
+
+            <div class="card card-light">
+                
+                <div class="card-header">
+                    <h3 class="card-title">{!! Lang::get('lang.workflow_rules') !!}</h3>
+                </div>  
+
+                <div class="card-body">
+                    <table  class="table table-bordered table-hover">
+                        <thead>
+                            <tr>
+                                <td>{!! Lang::get('lang.rules') !!} <span class="text-red"> *</span></td>
+                                <td>{!! Lang::get('lang.condition') !!} <span class="text-red"> *</span></td>
+                                <td>{!! Lang::get('lang.statement') !!} <span class="text-red"> *</span></td>
+                                <td>{!! Lang::get('lang.action') !!}</td>
+                            </tr>
+                        </thead>
+                        <tbody class="button1">
+                            <tr id="firstdata">
+                                <td>
+                                    <select class="form-control" name="rule[0][a]" required>
+                                        <option value="">-- {!! Lang::get('lang.select_one') !!} --</option>
+                                        <option value="email">{!! Lang::get('lang.email') !!}</option>
+                                        <option value="email_name">{!! Lang::get('lang.email_name') !!}</option>
+                                        <option value="subject">{!! Lang::get('lang.subject') !!}</option>
+                                        <option value="message">{!! Lang::get('lang.message') !!}/{!! Lang::get('lang.body') !!}</option>
+                                    </select>
+                                </td>
+                                <td>
+                                    <select class="form-control" name="rule[0][b]" required>
+                                        <option value="">-- {!! Lang::get('lang.select_one') !!} --</option>
+                                        <option value="equal">{!! Lang::get('lang.equal_to') !!}</option>
+                                        <option value="not_equal">{!! Lang::get('lang.not_equal_to') !!}</option>
+                                        <option value="contains">{!! Lang::get('lang.contains') !!}</option>
+                                        <option value="dn_contain">{!! Lang::get('lang.does_not_contain') !!}</option>
+                                        <option value="starts">{!! Lang::get('lang.starts_with') !!}</option>
+                                        <option value="ends">{!! Lang::get('lang.ends_with') !!}</option>
+                                        <!--                                                        <option value="match">Match Regular Expressions</option>
+                                                                                                <option value="not_match">Does not match Regular Expression</option>-->
+                                    </select>
+                                </td>
+                                <td>
+                                    <input class="form-control" type="text" name="rule[0][c]" required>
+                                </td>
+                                <td style="text-align: center">
+                                    <div class="tools"> 
+                                        <span class="btnRemove1" data-toggle="modal" data-target="#">
+                                            <a data-toggle="tooltip" data-placement="top" title="{!! Lang::get('lang.delete') !!}" onclick="document.getElementById('firstdata').innerHTML = ''">
+                                                <i class="fas fa-trash text-red"></i>
+                                            </a>
+                                        </span> 
                                     </div>
-                                </div>
-                                <!-- /.box-body -->
-                            </div>
-                            <!-- /.box -->
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    <div class="mt-2">
+                        <div class="float-right" >
+                            <a class="btn btn-primary btnAdd1" href="javascript:;"><i class="fas fa-plus"></i> {!! Lang::get('lang.add') !!}</a>
                         </div>
-                        <!-- /.col -->
                     </div>
-                    <!-- /.tab-pane -->
-                    <div class="tab-pane" id="close">
-                        <div>
-                            <div class="box-body">
-                                <table  class="table table-bordered table-hover">
-                                    <thead>
-                                        <tr>
-                                            <td>{!! Lang::get('lang.condition') !!} <span class="text-red"> *</span></td>
-                                            <td>{!! Lang::get('lang.rules') !!} <span class="text-red"> *</span></td>
-                                            <td>{!! Lang::get('lang.action') !!}</td>
-                                        </tr>
-                                    </thead>
-                                    <tbody class="buttons">
-                                        <tr id="firstdata1">
-                                            <td>
-                                                <select class="form-control" onChange="selectdata(0)" id="selected0" name="action[0][a]" required>
-                                                    <option value="">-- {!! Lang::get('lang.select_an_action') !!} --</option>
-                                                    <optgroup label="Ticket">
-                                                        <option value="reject">{!! Lang::get('lang.reject_ticket') !!}</option>                        
-                                                        <option value="department">{!! Lang::get('lang.set_department') !!}</option>
-                                                        <option value="priority">{!! Lang::get('lang.set_priority') !!}</option>
-                                                        <option value="sla">{!! Lang::get('lang.set_sla_plan') !!}</option>
-                                                        <option value="team">{!! Lang::get('lang.assign_team') !!}</option>
-                                                        <option value="agent">{!! Lang::get('lang.assign_agent') !!}</option>
-                                                        <option value="helptopic">{!! Lang::get('lang.set_help_topic') !!}</option>
-                                                        <option value="status">{!! Lang::get('lang.set_ticket_status') !!}</option>
-                                                    </optgroup> 
-                                                </select>
-                                            </td>
-                                            <td id="fill0">
-                                            </td>
-                                            <td style="text-align: center">
-                                                <div class="tools"> 
-                                                    <span class="btnRemove" data-toggle="modal" data-target="#">
-                                                        <a data-toggle="tooltip" data-placement="top" title="{!! Lang::get('lang.delete') !!}" onclick="document.getElementById('firstdata1').innerHTML = ''">
-                                                            <i class="fa fa-trash-o"></i>
-                                                        </a>
-                                                    </span> 
-                                                </div>
-                                            </td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-                                <div class="row" style="padding: 10px 15px 0px">
-                                    <div class="pull-right">
-                                        <a class="btn btn-primary btnAdd">{!! Lang::get('lang.add') !!}</a>                                            
-                                    </div>
-                                </div>
-                            </div>
-                            <!-- /.box -->
-                        </div>
-                        <!-- /.col -->
-                    </div>
-                    <!-- /.tab-pane -->
-                    <div class="tab-pane" id="delect">
-                        <div>
-                            <textarea name="internal_note" class="textarea" placeholder="" style="width: 100%; height: 200px; font-size: 14px; line-height: 18px; border: 1px solid #dddddd; padding: 10px;"></textarea>       
-                        </div>
-                        <!-- /.col -->
-                    </div>
-                    <!-- /.tab-pane -->
-                </div>
-                <!-- /.tab-content -->
-                <div class="box-footer">
-                    <input type="submit" class="btn btn-primary" value="{!! Lang::get('lang.submit') !!}">
                 </div>
             </div>
-            <!-- /.nav-tabs-custom -->
+
+            <div class="card card-light">
+                
+                <div class="card-header">
+                    <h3 class="card-title">{!! Lang::get('lang.workflow_action') !!}</h3>
+                </div>  
+
+                <div class="card-body">
+                    <table  class="table table-bordered table-hover">
+                        <thead>
+                            <tr>
+                                <td>{!! Lang::get('lang.condition') !!} <span class="text-red"> *</span></td>
+                                <td>{!! Lang::get('lang.rules') !!} <span class="text-red"> *</span></td>
+                                <td>{!! Lang::get('lang.action') !!}</td>
+                            </tr>
+                        </thead>
+                        <tbody class="buttons">
+                            <tr id="firstdata1">
+                                <td>
+                                    <select class="form-control" onChange="selectdata(0)" id="selected0" name="action[0][a]" required>
+                                        <option value="">-- {!! Lang::get('lang.select_an_action') !!} --</option>
+                                        <optgroup label="Ticket">
+                                            <option value="reject">{!! Lang::get('lang.reject_ticket') !!}</option>                        
+                                            <option value="department">{!! Lang::get('lang.set_department') !!}</option>
+                                            <option value="priority">{!! Lang::get('lang.set_priority') !!}</option>
+                                            <option value="sla">{!! Lang::get('lang.set_sla_plan') !!}</option>
+                                            <option value="team">{!! Lang::get('lang.assign_team') !!}</option>
+                                            <option value="agent">{!! Lang::get('lang.assign_agent') !!}</option>
+                                            <option value="helptopic">{!! Lang::get('lang.set_help_topic') !!}</option>
+                                            <option value="status">{!! Lang::get('lang.set_ticket_status') !!}</option>
+                                        </optgroup> 
+                                    </select>
+                                </td>
+                                <td id="fill0">
+                                </td>
+                                <td style="text-align: center">
+                                    <div class="tools"> 
+                                        <span class="btnRemove" data-toggle="modal" data-target="#">
+                                            <a data-toggle="tooltip" data-placement="top" title="{!! Lang::get('lang.delete') !!}" onclick="document.getElementById('firstdata1').innerHTML = ''">
+                                                <i class="fas fa-trash text-red"></i>
+                                            </a>
+                                        </span> 
+                                    </div>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    <div class="mt-2">
+                        <div class="float-right">
+                            <a class="btn btn-primary btnAdd" href="javascript:;"><i class="fas fa-plus"></i> {!! Lang::get('lang.add') !!}</a>                                            
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div>
+                <label>{!! Lang::get('lang.internal_notes') !!}</label>
+                <textarea name="internal_note" class="textarea" placeholder="" style="width: 100%; height: 200px; font-size: 14px; line-height: 18px; border: 1px solid #dddddd; padding: 10px;"></textarea>       
+            </div>
+        </div>
+
+        <div class="card-footer">
+            <input type="submit" class="btn btn-primary" value="{!! Lang::get('lang.submit') !!}">
         </div>
-        <!-- /.col -->
     </div>
     <!-- /.row -->
 </form>
@@ -305,7 +291,7 @@ class="active"
                     '<div class="tools">' +
                     '<span class="btnRemove" data-toggle="modal" data-target="#">' +
                     '<a data-toggle="tooltip" data-placement="top" title="Delete">' +
-                    '<i class="fa fa-trash-o"></i>' +
+                    '<i class="fas fa-trash text-red"></i>' +
                     '</a>' +
                     '</span>' +
                     '</div>' +
@@ -334,7 +320,7 @@ class="active"
                     '<option value="message">{!! Lang::get("lang.message") !!}/{!! Lang::get("lang.body") !!}</option>' +
                     '</select>' +
                     '</td>' +
-                    '<td class="col-md-3">' +
+                    '<td>' +
                     '<select class="form-control" name="rule[' + n + '][b]" required>' +
                     '<option value="">-- {!! Lang::get("lang.select_one") !!} --</option>' +
                     '<option value="equal">{!! Lang::get("lang.equal_to") !!}</option>' +
@@ -345,9 +331,9 @@ class="active"
                     '<option value="ends">{!! Lang::get("lang.ends_with") !!}</option>' +
                     '</select>' +
                     '</td>' +
-                    '<td class="col-md-3"> <input class="form-control" type="text" name="rule[' + n + '][c]" required> </td>' +
+                    '<td> <input class="form-control" type="text" name="rule[' + n + '][c]" required> </td>' +
                     '<td style="text-align: center">' +
-                    '<div class="tools"> <span class="btnRemove1" data-toggle="modal" data-target="#"><a data-toggle="tooltip" data-placement="top" title="Delete"><i class="fa fa-trash-o"></i></a></span> </div>' +
+                    '<div class="tools"> <span class="btnRemove1" data-toggle="modal" data-target="#"><a data-toggle="tooltip" data-placement="top" title="Delete"><i class="fas fa-trash text-red"></i></a></span> </div>' +
                     '</td>' +
                     '</tr>'); // end append
             $('div .btnRemove1').last().click(function(e) {
diff --git a/resources/views/themes/default1/admin/helpdesk/manage/workflow/edit.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/workflow/edit.blade.php
index ffb42ed47..eb1fad09a 100644
--- a/resources/views/themes/default1/admin/helpdesk/manage/workflow/edit.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/manage/workflow/edit.blade.php
@@ -1,15 +1,19 @@
 @extends('themes.default1.admin.layout.admin')
 
 @section('Manage')
-active
+class="nav-link active"
 @stop
 
-@section('manage-bar')
-active
+@section('manage-menu-parent')
+class="nav-item menu-open"
+@stop
+
+@section('manage-menu-open')
+class="nav nav-treeview menu-open"
 @stop
 
 @section('workflow')
-class="active"
+class="nav-link active"
 @stop
 
 @section('HeadInclude')
@@ -23,7 +27,7 @@ class="active"
 <!-- breadcrumbs -->
 @section('breadcrumbs')
 <ol class="breadcrumb">
-    <li><a href="{!! URL::route('setting') !!}"><i class="fa fa-dashboard"></i> {!! Lang::get('lang.home') !!}</a></li>
+    <li><a href="{!! URL::route('setting') !!}"><i class="fas fa-tachometer-alt"></i> {!! Lang::get('lang.home') !!}</a></li>
     <li><a href="{!! URL::route('workflow') !!}">{!! Lang::get('lang.ticket_workflow') !!}</a></li>
     <li class="active"><a href="">{!! Lang::get('lang.edit_workflow') !!}</a></li>
 </ol>
@@ -33,80 +37,86 @@ class="active"
 @section('content')
 <form class="form-horizontal" action="{!! URL::route('workflow.update', $id) !!}" method="POST">
     {{ csrf_field() }}
-    <div class="box">
+    <!-- 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>
+        {{Session::get('fails')}}
+    </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('name'))
+        <li class="error-message-padding">{!! $errors->first('name', ':message') !!}</li>
+        @endif
+        @if($errors->first('execution_order'))
+        <li class="error-message-padding">{!! $errors->first('execution_order', ':message') !!}</li>
+        @endif
+        @if($errors->first('target_channel'))
+        <li class="error-message-padding">{!! $errors->first('target_channel', ':message') !!}</li>
+        @endif
+        @if($errors->first('rule'))
+        <li class="error-message-padding">{!! $errors->first('rule', ':message') !!}</li>
+        @endif
+        @if($errors->first('action'))
+        <li class="error-message-padding">{!! $errors->first('action', ':message') !!}</li>
+        @endif
+    </div>
+    @endif
+    <div class="card card-light">
         <!-- /.box-header -->
-        <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>
-                {{Session::get('fails')}}
-            </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('name'))
-                <li class="error-message-padding">{!! $errors->first('name', ':message') !!}</li>
-                @endif
-                @if($errors->first('execution_order'))
-                <li class="error-message-padding">{!! $errors->first('execution_order', ':message') !!}</li>
-                @endif
-                @if($errors->first('target_channel'))
-                <li class="error-message-padding">{!! $errors->first('target_channel', ':message') !!}</li>
-                @endif
-                @if($errors->first('rule'))
-                <li class="error-message-padding">{!! $errors->first('rule', ':message') !!}</li>
-                @endif
-                @if($errors->first('action'))
-                <li class="error-message-padding">{!! $errors->first('action', ':message') !!}</li>
-                @endif
-            </div>
-            @endif
-            <div class="form-group {!! $errors->has('name') ? 'has-error' : '' !!}">
-                <label for="inputName" class="col-sm-2 control-label">{!! Lang::get('lang.name') !!}</label>
-                <div class="col-sm-6">
+        <div class="card-header">
+            <h3 class="card-title">{!! Lang::get('lang.edit_workflow') !!}</h3>    
+        </div>
+        
+        <div class="card-body">
+
+            <div class="row">
+                
+                <div class="form-group col-sm-6 {!! $errors->has('name') ? 'has-error' : '' !!}">
+                    <label for="inputName">{!! Lang::get('lang.name') !!}</label>
                     <input type="text" class="form-control" placeholder="Name" id="name" name="name" value="{!! $workflow->name !!}" required>
                 </div>
-            </div>
-            <div class="form-group {!! $errors->has('status') ? 'has-error' : '' !!}">
-                <label class="col-sm-2 control-label"> {!! lang::get('lang.status') !!}</label>
-                <div class="col-sm-6">
-                    <input type="radio" id="inputEmail2" name="status" value="1" <?php
-                    if ($workflow->status == 1) {
-                        echo "checked";
-                    }
-                    ?> >&nbsp;&nbsp;<label class="control-label" for="inputEmail2">{!! Lang::get('lang.active') !!}</label>&nbsp;&nbsp;
-                    <input type="radio" id="inputEmail1" name="status" value="0" <?php
-                    if ($workflow->status == 0) {
-                        echo "checked";
-                    }
-                    ?> >&nbsp;&nbsp;<label class="control-label" for="inputEmail1">{!! Lang::get('lang.inactive') !!}</label>&nbsp;&nbsp;
-                </div>
-            </div>
-            <div class="form-group {!! $errors->has('execution_order') ? 'has-error' : '' !!}">
-                <div>
-                    <label for="Exceution" class="col-sm-2 control-label">{!! Lang::get('lang.execution_order') !!}</label>
-                    <div class="col-sm-6">
-                        <input type="number" class="form-control" id="execution_order" name="execution_order" placeholder="{!! Lang::get('lang.execution_order') !!}" value="{!! $workflow->order !!}" required>
+                
+                <div class="form-group col-sm-6 {!! $errors->has('status') ? 'has-error' : '' !!}">
+                    <label> {!! lang::get('lang.status') !!}</label>
+                    <div>
+                        <input type="radio" id="inputEmail2" name="status" value="1" <?php
+                        if ($workflow->status == 1) {
+                            echo "checked";
+                        }
+                        ?> >&nbsp;&nbsp;{!! Lang::get('lang.active') !!}&nbsp;&nbsp;
+                        <input type="radio" id="inputEmail1" name="status" value="0" <?php
+                        if ($workflow->status == 0) {
+                            echo "checked";
+                        }
+                        ?> >&nbsp;&nbsp;{!! Lang::get('lang.inactive') !!}&nbsp;&nbsp;
                     </div>
                 </div>
             </div>
-            <div class="form-group {!! $errors->has('target_channel') ? 'has-error' : '' !!}">
-                <label class="col-sm-2 control-label">{!! Lang::get('target_channel') !!}</label>
-                <div class="col-sm-6">
+            
+            <div class="row">
+                
+                <div class="form-group col-sm-6 {!! $errors->has('execution_order') ? 'has-error' : '' !!}">
+                    <label for="Exceution">{!! Lang::get('lang.execution_order') !!}</label>
+                    <input type="number" class="form-control" id="execution_order" name="execution_order" placeholder="{!! Lang::get('lang.execution_order') !!}" value="{!! $workflow->order !!}" required>
+                </div>
+
+                <div class="form-group col-sm-6 {!! $errors->has('target_channel') ? 'has-error' : '' !!}">
+                    <label>{!! Lang::get('lang.target_channel') !!}</label>
                     <select class="form-control" name="target_channel" required>
                         <option value=""> -- {!! Lang::get('lang.select_a_channel') !!} -- </option>
                         <option value="A-0" <?php
@@ -134,342 +144,318 @@ class="active"
                 </div>
             </div>
 
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-xs-12">
-            <div class="nav-tabs-custom">
-                <ul class="nav nav-tabs">
-                    <li class="active"><a href="#open" data-toggle="tab">{!! Lang::get('lang.workflow_rules') !!}</a>
-                    </li>
-                    <li><a href="#close" data-toggle="tab">{!! Lang::get('lang.workflow_action') !!}</a>
-                    </li>
-                    <li><a href="#delect" data-toggle="tab">{!! Lang::get('lang.internal_notes') !!}</a>
-                    </li>
-                </ul>
-                <div class="tab-content">
-                    <div class="active tab-pane" id="open">
-                        <div>
-                            <div>
-                                <!-- /.box-header -->
-                                <div class="box-body">
-                                    <table  class="table table-bordered table-hover">
-                                        <thead>
-                                            <tr>
-                                                <td>{!! Lang::get('lang.rules') !!}</td>
-                                                <td>{!! Lang::get('lang.condition') !!}</td>
-                                                <td>{!! Lang::get('lang.statement') !!}</td>
-                                                <td>{!! Lang::get('lang.action') !!}</td>
-                                            </tr>
-                                        </thead>
-                                        <tbody class="button1">
-                                            <?php $j = 0; ?>
-                                            @foreach($workflow_rules as $workflow_rule)
-                                            <?php $j++; ?>
-                                            <tr id="firstdata{!! $j !!}">
-                                                <td>
-                                                    <select class="form-control" name="rule[{!! $j-1 !!}][a]" required>
-                                                        <option value="">-- {!! Lang::get('lang.select_one') !!} --</option>
-                                                        <option value="email" <?php
-                                                        if ($workflow_rule->matching_scenario == 'email') {
-                                                            echo "selected='selected'";
-                                                        }
-                                                        ?> >{!! Lang::get('lang.email') !!}</option>
-                                                        <option value="email_name" <?php
-                                                        if ($workflow_rule->matching_scenario == 'email_name') {
-                                                            echo "selected='selected'";
-                                                        }
-                                                        ?> >{!! Lang::get('lang.email_name') !!}</option>
-                                                        <option value="subject" <?php
-                                                        if ($workflow_rule->matching_scenario == 'subject') {
-                                                            echo "selected='selected'";
-                                                        }
-                                                        ?>>{!! Lang::get('lang.subject') !!}</option>
-                                                        <option value="message"  <?php
-                                                        if ($workflow_rule->matching_scenario == 'message') {
-                                                            echo "selected='selected'";
-                                                        }
-                                                        ?> >{!! Lang::get('lang.message') !!}/{!! Lang::get('lang.body') !!}</option>
-                                                    </select>
-                                                </td>
-                                                <td class="col-md-3">
-                                                    <select class="form-control" name="rule[{!! $j-1 !!}][b]" required>
-                                                        <option value="">-- {!! Lang::get('lang.select_one') !!} --</option>
-                                                        <option value="equal" <?php
-                                                        if ($workflow_rule->matching_relation == 'equal') {
-                                                            echo "selected='selected'";
-                                                        }
-                                                        ?> >{!! Lang::get('lang.equal_to') !!}</option>
-                                                        <option value="not_equal" <?php
-                                                        if ($workflow_rule->matching_relation == 'not_equal') {
-                                                            echo "selected='selected'";
-                                                        }
-                                                        ?> >{!! Lang::get('lang.not_equal_to') !!}</option>
-                                                        <option value="contains" <?php
-                                                        if ($workflow_rule->matching_relation == 'contains') {
-                                                            echo "selected='selected'";
-                                                        }
-                                                        ?> >{!! Lang::get('lang.contains') !!}</option>
-                                                        <option value="dn_contain" <?php
-                                                        if ($workflow_rule->matching_relation == 'dn_contain') {
-                                                            echo "selected='selected'";
-                                                        }
-                                                        ?> >{!! Lang::get('lang.does_not_contain') !!}</option>
-                                                        <option value="starts" <?php
-                                                        if ($workflow_rule->matching_relation == 'starts') {
-                                                            echo "selected='selected'";
-                                                        }
-                                                        ?> >{!! Lang::get('lang.starts_with') !!}</option>
-                                                        <option value="ends" <?php
-                                                        if ($workflow_rule->matching_relation == 'ends') {
-                                                            echo "selected='selected'";
-                                                        }
-                                                        ?> >{!! Lang::get('lang.ends_with') !!}</option>
-                                                        <!--                                                        <option value="match" <?php
-                                                        if ($workflow_rule->matching_relation == 'match') {
-                                                            echo "selected='selected'";
-                                                        }
-                                                        ?> >Match Regular Expressions</option>
-                                                                                                                <option value="not_match" <?php
-                                                        if ($workflow_rule->matching_relation == 'not_match') {
-                                                            echo "selected='selected'";
-                                                        }
-                                                        ?> >Does not match Regular Expression</option>-->
-                                                    </select>
-                                                </td>
-                                                <td class="col-md-3">
-                                                    <input class="form-control" type="text" name="rule[{!! $j-1 !!}][c]" value="{!! $workflow_rule->matching_value !!}" required>
-                                                </td>
-                                                <td style="text-align: center">
-                                                    <div class="tools"> 
-                                                        <span class="btnRemove1" data-toggle="modal" data-target="#">
-                                                            <a data-toggle="tooltip" data-placement="top" title="{!! Lang::get('lang.delete') !!}" onclick="document.getElementById('firstdata{!! $j !!}').innerHTML = ''">
-                                                                <i class="fa fa-trash-o"></i>
-                                                            </a>
-                                                        </span> 
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                            @endforeach
-                                        </tbody>
-                                    </table>
-                                    <div class="row" style="padding: 10px 15px 0px">
-                                        <div class="pull-right" >
-                                            <a class="btn btn-primary btnAdd1">{!! Lang::get('lang.add') !!}</a>
-                                        </div>
-                                    </div>
-                                </div>
-                                <!-- /.box-body -->
-                            </div>
-                            <!-- /.box -->
-                        </div>
-                        <!-- /.col -->
-                    </div>
-                    <!-- /.tab-pane -->
-                    <div class="tab-pane" id="close">
-                        <div>
-                            <div class="box-body">
-                                <table  class="table table-bordered table-hover">
-                                    <thead>
-                                        <tr>
-                                            <td>{!! Lang::get('lang.condition') !!}</td>
-                                            <td>{!! Lang::get('lang.rules') !!}</td>
-                                            <td>{!! Lang::get('lang.action') !!}</td>
-                                        </tr>
-                                    </thead>
-                                    <tbody class="buttons">
-                                        <?php $i = 0; ?>
-                                        @foreach($workflow_actions as $workflow_action)
-                                        <?php $i++; ?>
-                                        <tr id="seconddata{!! $i !!}">
-                                            <td>
-                                                <select class="form-control" onChange="selectdata({!! $i !!})" id="selected{!! $i !!}" name="action[{!! $i !!}][a]" required>
-                                                    <option value="">-- {!! Lang::get('lang.select_an_action') !!} --</option>
-                                                    <optgroup label="Ticket">        
-                                                        <option value="reject" <?php
-                                                        if ($workflow_action->condition == 'reject') {
-                                                            echo "selected='selected'";
-                                                        }
-                                                        ?> >{!! Lang::get('lang.reject_ticket') !!}</option>                        
-                                                        <option value="department" <?php
-                                                        if ($workflow_action->condition == 'department') {
-                                                            echo "selected='selected'";
-                                                        }
-                                                        ?> >{!! Lang::get('lang.set_department') !!}</option>
-                                                        <option value="priority" <?php
-                                                        if ($workflow_action->condition == 'priority') {
-                                                            echo "selected='selected'";
-                                                        }
-                                                        ?> >{!! Lang::get('lang.set_priority') !!}</option>
-                                                        <option value="sla" <?php
-                                                        if ($workflow_action->condition == 'sla') {
-                                                            echo "selected='selected'";
-                                                        }
-                                                        ?> >{!! Lang::get('lang.set_sla_plan') !!}</option>
-                                                        <option value="team" <?php
-                                                        if ($workflow_action->condition == 'team') {
-                                                            echo "selected='selected'";
-                                                        }
-                                                        ?> >{!! Lang::get('lang.assign_team') !!}</option>
-                                                        <option value="agent" <?php
-                                                        if ($workflow_action->condition == 'agent') {
-                                                            echo "selected='selected'";
-                                                        }
-                                                        ?> >{!! Lang::get('lang.assign_agent') !!}</option>
-                                                        <option value="helptopic" <?php
-                                                        if ($workflow_action->condition == 'helptopic') {
-                                                            echo "selected='selected'";
-                                                        }
-                                                        ?> >{!! Lang::get('lang.set_help_topic') !!}</option>
-                                                        <option value="status" <?php
-                                                        if ($workflow_action->condition == 'status') {
-                                                            echo "selected='selected'";
-                                                        }
-                                                        ?> >{!! Lang::get('lang.set_ticket_status') !!}</option>
-                                                    </optgroup> 
-                                                </select>
-                                            </td>
-                                            <td id="fill{!! $i !!}">
-                                                <?php
-                                                if ($workflow_action->condition == 'reject') {
-                                                    echo "<input type='hidden' name='action[" . $i . "][b]' class='form-control' value='reject'><span text-red>Reject</span>";
-                                                } elseif ($workflow_action->condition == 'department') {
-                                                    $departments = App\Model\helpdesk\Agent\Department::all();
-                                                    $var = "<select name='action[" . $i . "][b]' class='form-control' required>";
-                                                    foreach ($departments as $department) {
-                                                        if ($workflow_action->action == $department->id) {
-                                                            $depart = "selected";
-                                                        } else {
-                                                            $depart = "";
-                                                        }
-                                                        $var .= "<option value='" . $department->id . "' " . $depart . ">" . $department->name . "</option>";
-                                                    }
-                                                    $var .= "</select>";
-                                                    echo $var;
-                                                } elseif ($workflow_action->condition == 'priority') {
-                                                    $priorities = App\Model\helpdesk\Ticket\Ticket_Priority::all();
-                                                    $var = "<select name='action[" . $i . "][b]' class='form-control' required>";
-                                                    foreach ($priorities as $priority) {
-                                                        if ($workflow_action->action == $priority->priority_id) {
-                                                            $priority1 = "selected";
-                                                        } else {
-                                                            $priority1 = "";
-                                                        }
-                                                        $var .= "<option value='" . $priority->priority_id . "' " . $priority1 . ">" . $priority->priority_desc . "</option>";
-                                                    }
-                                                    $var .= "</select>";
-                                                    echo $var;
-                                                } elseif ($workflow_action->condition == 'sla') {
-                                                    $sla_plans = App\Model\helpdesk\Manage\Sla_plan::where('status', '=', 1)->get();
-                                                    $var = "<select name='action[" . $i . "][b]' class='form-control' required>";
-                                                    foreach ($sla_plans as $sla_plan) {
-                                                        if ($workflow_action->action == $sla_plan->id) {
-                                                            $sla = "selected";
-                                                        } else {
-                                                            $sla = "";
-                                                        }
-                                                        $var .= "<option value='" . $sla_plan->id . "' " . $sla . ">" . $sla_plan->grace_period . "</option>";
-                                                    }
-                                                    $var .= "</select>";
-                                                    echo $var;
-                                                } elseif ($workflow_action->condition == 'team') {
-                                                    $teams = App\Model\helpdesk\Agent\Teams::where('status', '=', 1)->get();
-                                                    $var = "<select name='action[" . $i . "][b]' class='form-control' required>";
-                                                    foreach ($teams as $team) {
-                                                        if ($workflow_action->action == $team->id) {
-                                                            $team1 = "selected";
-                                                        } else {
-                                                            $team1 = "";
-                                                        }
-                                                        $var .= "<option value='" . $team->id . "' " . $team1 . ">" . $team->name . "</option>";
-                                                    }
-                                                    $var .= "</select>";
-                                                    echo $var;
-                                                } elseif ($workflow_action->condition == 'agent') {
-                                                    $users = App\User::where('role', '!=', 'user')->where('active', '=', 1)->get();
-                                                    $var = "<select name='action[" . $i . "][b]' class='form-control' required>";
-                                                    foreach ($users as $user) {
-                                                        if ($workflow_action->action == $user->id) {
-                                                            $user1 = "selected";
-                                                        } else {
-                                                            $user1 = "";
-                                                        }
-                                                        $var .= "<option value='" . $user->id . "' " . $user1 . ">" . $user->first_name . " " . $user->last_name . "</option>";
-                                                    }
-                                                    $var .= "</select>";
-                                                    echo $var;
-                                                } elseif ($workflow_action->condition == 'helptopic') {
-                                                    $help_topics = App\Model\helpdesk\Manage\Help_topic::where('status', '=', 1)->get();
-                                                    $var = "<select name='action[" . $i . "][b]' class='form-control' required>";
-                                                    foreach ($help_topics as $help_topic) {
-                                                        if ($workflow_action->action == $help_topic->id) {
-                                                            $help_topic1 = "selected";
-                                                        } else {
-                                                            $help_topic1 = "";
-                                                        }
-                                                        $var .= "<option value='" . $help_topic->id . "' " . $help_topic1 . ">" . $help_topic->topic . "</option>";
-                                                    }
-                                                    $var .= "</select>";
-                                                    echo $var;
-                                                } elseif ($workflow_action->condition == 'status') {
-                                                    $ticket_status = App\Model\helpdesk\Ticket\Ticket_Status::all();
-                                                    $var = "<select name='action[" . $i . "][b]' class='form-control' required>";
-                                                    foreach ($ticket_status as $status) {
-                                                        if ($workflow_action->action == $status->id) {
-                                                            $status1 = "selected";
-                                                        } else {
-                                                            $status1 = "";
-                                                        }
-                                                        $var .= "<option value='" . $status->id . "' " . $status1 . ">" . $status->name . "</option>";
-                                                    }
-                                                    $var .= "</select>";
-                                                    echo $var;
-                                                }
-                                                ?>
+            <div class="card card-light">
+                
+                <div class="card-header">
+                    <h3 class="card-title">{!! Lang::get('lang.workflow_rules') !!}</h3>
+                </div>  
 
-                                            </td>
-                                            <td style="text-align: center">
-                                                <div class="tools"> 
-                                                    <span class="btnRemove" data-toggle="modal" data-target="#">
-                                                        <a data-toggle="tooltip" data-placement="top" title="Delete" onclick="document.getElementById('seconddata{!! $i !!}').innerHTML = ''">
-                                                            <i class="fa fa-trash-o"></i>
-                                                        </a>
-                                                    </span> 
-                                                </div>
-                                            </td>
-                                        </tr>
-                                        @endforeach
-                                    </tbody>
-                                </table>
-                                <div class="row" style="padding: 10px 15px 0px">
-                                    <div class="pull-right">
-                                        <a class="btn btn-primary btnAdd">{!! Lang::get('lang.add') !!}</a>                                            
+                <div class="card-body">
+                    <table  class="table table-bordered table-hover">
+                        <thead>
+                            <tr>
+                                <td>{!! Lang::get('lang.rules') !!}</td>
+                                <td>{!! Lang::get('lang.condition') !!}</td>
+                                <td>{!! Lang::get('lang.statement') !!}</td>
+                                <td>{!! Lang::get('lang.action') !!}</td>
+                            </tr>
+                        </thead>
+                        <tbody class="button1">
+                            <?php $j = 0; ?>
+                            @foreach($workflow_rules as $workflow_rule)
+                            <?php $j++; ?>
+                            <tr id="firstdata{!! $j !!}">
+                                <td>
+                                    <select class="form-control" name="rule[{!! $j-1 !!}][a]" required>
+                                        <option value="">-- {!! Lang::get('lang.select_one') !!} --</option>
+                                        <option value="email" <?php
+                                        if ($workflow_rule->matching_scenario == 'email') {
+                                            echo "selected='selected'";
+                                        }
+                                        ?> >{!! Lang::get('lang.email') !!}</option>
+                                        <option value="email_name" <?php
+                                        if ($workflow_rule->matching_scenario == 'email_name') {
+                                            echo "selected='selected'";
+                                        }
+                                        ?> >{!! Lang::get('lang.email_name') !!}</option>
+                                        <option value="subject" <?php
+                                        if ($workflow_rule->matching_scenario == 'subject') {
+                                            echo "selected='selected'";
+                                        }
+                                        ?>>{!! Lang::get('lang.subject') !!}</option>
+                                        <option value="message"  <?php
+                                        if ($workflow_rule->matching_scenario == 'message') {
+                                            echo "selected='selected'";
+                                        }
+                                        ?> >{!! Lang::get('lang.message') !!}/{!! Lang::get('lang.body') !!}</option>
+                                    </select>
+                                </td>
+                                <td>
+                                    <select class="form-control" name="rule[{!! $j-1 !!}][b]" required>
+                                        <option value="">-- {!! Lang::get('lang.select_one') !!} --</option>
+                                        <option value="equal" <?php
+                                        if ($workflow_rule->matching_relation == 'equal') {
+                                            echo "selected='selected'";
+                                        }
+                                        ?> >{!! Lang::get('lang.equal_to') !!}</option>
+                                        <option value="not_equal" <?php
+                                        if ($workflow_rule->matching_relation == 'not_equal') {
+                                            echo "selected='selected'";
+                                        }
+                                        ?> >{!! Lang::get('lang.not_equal_to') !!}</option>
+                                        <option value="contains" <?php
+                                        if ($workflow_rule->matching_relation == 'contains') {
+                                            echo "selected='selected'";
+                                        }
+                                        ?> >{!! Lang::get('lang.contains') !!}</option>
+                                        <option value="dn_contain" <?php
+                                        if ($workflow_rule->matching_relation == 'dn_contain') {
+                                            echo "selected='selected'";
+                                        }
+                                        ?> >{!! Lang::get('lang.does_not_contain') !!}</option>
+                                        <option value="starts" <?php
+                                        if ($workflow_rule->matching_relation == 'starts') {
+                                            echo "selected='selected'";
+                                        }
+                                        ?> >{!! Lang::get('lang.starts_with') !!}</option>
+                                        <option value="ends" <?php
+                                        if ($workflow_rule->matching_relation == 'ends') {
+                                            echo "selected='selected'";
+                                        }
+                                        ?> >{!! Lang::get('lang.ends_with') !!}</option>
+                                        <!--                                                        <option value="match" <?php
+                                        if ($workflow_rule->matching_relation == 'match') {
+                                            echo "selected='selected'";
+                                        }
+                                        ?> >Match Regular Expressions</option>
+                                                                                                <option value="not_match" <?php
+                                        if ($workflow_rule->matching_relation == 'not_match') {
+                                            echo "selected='selected'";
+                                        }
+                                        ?> >Does not match Regular Expression</option>-->
+                                    </select>
+                                </td>
+                                <td>
+                                    <input class="form-control" type="text" name="rule[{!! $j-1 !!}][c]" value="{!! $workflow_rule->matching_value !!}" required>
+                                </td>
+                                <td style="text-align: center">
+                                    <div class="tools"> 
+                                        <span class="btnRemove1" data-toggle="modal" data-target="#">
+                                            <a data-toggle="tooltip" data-placement="top" title="{!! Lang::get('lang.delete') !!}" onclick="document.getElementById('firstdata{!! $j !!}').innerHTML = ''">
+                                                <i class="fas fa-trash text-red"></i>
+                                            </a>
+                                        </span> 
                                     </div>
-                                </div>
-                            </div>
-                            <!-- /.box -->
+                                </td>
+                            </tr>
+                            @endforeach
+                        </tbody>
+                    </table>
+                    <div class="mt-2">
+                        <div class="float-right" >
+                            <a class="btn btn-primary btnAdd1" href="javascript:;"><i class="fas fa-plus"></i> {!! Lang::get('lang.add') !!}</a>
                         </div>
-                        <!-- /.col -->
                     </div>
-                    <!-- /.tab-pane -->
-                    <div class="tab-pane" id="delect">
-                        <div>
-                            <textarea name="internal_note" class="textarea" placeholder="Please Enter an internal note for your team!" style="width: 100%; height: 200px; font-size: 14px; line-height: 18px; border: 1px solid #dddddd; padding: 10px;"></textarea>       
-                        </div>
-                        <!-- /.col -->
-                    </div>
-                    <!-- /.tab-pane -->
-                </div>
-                <!-- /.tab-content -->
-                <div class="box-footer">
-                    <input type="submit" class="btn btn-primary" value="{!! Lang::get('lang.submit') !!}">
                 </div>
             </div>
-            <!-- /.nav-tabs-custom -->
+
+            <div class="card card-light">
+                
+                <div class="card-header">
+                    <h3 class="card-title">{!! Lang::get('lang.workflow_action') !!}</h3>
+                </div>  
+
+                <div class="card-body">
+                    <table  class="table table-bordered table-hover">
+                        <thead>
+                            <tr>
+                                <td>{!! Lang::get('lang.condition') !!}</td>
+                                <td>{!! Lang::get('lang.rules') !!}</td>
+                                <td>{!! Lang::get('lang.action') !!}</td>
+                            </tr>
+                        </thead>
+                        <tbody class="buttons">
+                            <?php $i = 0; ?>
+                            @foreach($workflow_actions as $workflow_action)
+                            <?php $i++; ?>
+                            <tr id="seconddata{!! $i !!}">
+                                <td>
+                                    <select class="form-control" onChange="selectdata({!! $i !!})" id="selected{!! $i !!}" name="action[{!! $i !!}][a]" required>
+                                        <option value="">-- {!! Lang::get('lang.select_an_action') !!} --</option>
+                                        <optgroup label="Ticket">        
+                                            <option value="reject" <?php
+                                            if ($workflow_action->condition == 'reject') {
+                                                echo "selected='selected'";
+                                            }
+                                            ?> >{!! Lang::get('lang.reject_ticket') !!}</option>                        
+                                            <option value="department" <?php
+                                            if ($workflow_action->condition == 'department') {
+                                                echo "selected='selected'";
+                                            }
+                                            ?> >{!! Lang::get('lang.set_department') !!}</option>
+                                            <option value="priority" <?php
+                                            if ($workflow_action->condition == 'priority') {
+                                                echo "selected='selected'";
+                                            }
+                                            ?> >{!! Lang::get('lang.set_priority') !!}</option>
+                                            <option value="sla" <?php
+                                            if ($workflow_action->condition == 'sla') {
+                                                echo "selected='selected'";
+                                            }
+                                            ?> >{!! Lang::get('lang.set_sla_plan') !!}</option>
+                                            <option value="team" <?php
+                                            if ($workflow_action->condition == 'team') {
+                                                echo "selected='selected'";
+                                            }
+                                            ?> >{!! Lang::get('lang.assign_team') !!}</option>
+                                            <option value="agent" <?php
+                                            if ($workflow_action->condition == 'agent') {
+                                                echo "selected='selected'";
+                                            }
+                                            ?> >{!! Lang::get('lang.assign_agent') !!}</option>
+                                            <option value="helptopic" <?php
+                                            if ($workflow_action->condition == 'helptopic') {
+                                                echo "selected='selected'";
+                                            }
+                                            ?> >{!! Lang::get('lang.set_help_topic') !!}</option>
+                                            <option value="status" <?php
+                                            if ($workflow_action->condition == 'status') {
+                                                echo "selected='selected'";
+                                            }
+                                            ?> >{!! Lang::get('lang.set_ticket_status') !!}</option>
+                                        </optgroup> 
+                                    </select>
+                                </td>
+                                <td id="fill{!! $i !!}">
+                                    <?php
+                                    if ($workflow_action->condition == 'reject') {
+                                        echo "<input type='hidden' name='action[" . $i . "][b]' class='form-control' value='reject'><span text-red>Reject</span>";
+                                    } elseif ($workflow_action->condition == 'department') {
+                                        $departments = App\Model\helpdesk\Agent\Department::all();
+                                        $var = "<select name='action[" . $i . "][b]' class='form-control' required>";
+                                        foreach ($departments as $department) {
+                                            if ($workflow_action->action == $department->id) {
+                                                $depart = "selected";
+                                            } else {
+                                                $depart = "";
+                                            }
+                                            $var .= "<option value='" . $department->id . "' " . $depart . ">" . $department->name . "</option>";
+                                        }
+                                        $var .= "</select>";
+                                        echo $var;
+                                    } elseif ($workflow_action->condition == 'priority') {
+                                        $priorities = App\Model\helpdesk\Ticket\Ticket_Priority::all();
+                                        $var = "<select name='action[" . $i . "][b]' class='form-control' required>";
+                                        foreach ($priorities as $priority) {
+                                            if ($workflow_action->action == $priority->priority_id) {
+                                                $priority1 = "selected";
+                                            } else {
+                                                $priority1 = "";
+                                            }
+                                            $var .= "<option value='" . $priority->priority_id . "' " . $priority1 . ">" . $priority->priority_desc . "</option>";
+                                        }
+                                        $var .= "</select>";
+                                        echo $var;
+                                    } elseif ($workflow_action->condition == 'sla') {
+                                        $sla_plans = App\Model\helpdesk\Manage\Sla_plan::where('status', '=', 1)->get();
+                                        $var = "<select name='action[" . $i . "][b]' class='form-control' required>";
+                                        foreach ($sla_plans as $sla_plan) {
+                                            if ($workflow_action->action == $sla_plan->id) {
+                                                $sla = "selected";
+                                            } else {
+                                                $sla = "";
+                                            }
+                                            $var .= "<option value='" . $sla_plan->id . "' " . $sla . ">" . $sla_plan->grace_period . "</option>";
+                                        }
+                                        $var .= "</select>";
+                                        echo $var;
+                                    } elseif ($workflow_action->condition == 'team') {
+                                        $teams = App\Model\helpdesk\Agent\Teams::where('status', '=', 1)->get();
+                                        $var = "<select name='action[" . $i . "][b]' class='form-control' required>";
+                                        foreach ($teams as $team) {
+                                            if ($workflow_action->action == $team->id) {
+                                                $team1 = "selected";
+                                            } else {
+                                                $team1 = "";
+                                            }
+                                            $var .= "<option value='" . $team->id . "' " . $team1 . ">" . $team->name . "</option>";
+                                        }
+                                        $var .= "</select>";
+                                        echo $var;
+                                    } elseif ($workflow_action->condition == 'agent') {
+                                        $users = App\User::where('role', '!=', 'user')->where('active', '=', 1)->get();
+                                        $var = "<select name='action[" . $i . "][b]' class='form-control' required>";
+                                        foreach ($users as $user) {
+                                            if ($workflow_action->action == $user->id) {
+                                                $user1 = "selected";
+                                            } else {
+                                                $user1 = "";
+                                            }
+                                            $var .= "<option value='" . $user->id . "' " . $user1 . ">" . $user->first_name . " " . $user->last_name . "</option>";
+                                        }
+                                        $var .= "</select>";
+                                        echo $var;
+                                    } elseif ($workflow_action->condition == 'helptopic') {
+                                        $help_topics = App\Model\helpdesk\Manage\Help_topic::where('status', '=', 1)->get();
+                                        $var = "<select name='action[" . $i . "][b]' class='form-control' required>";
+                                        foreach ($help_topics as $help_topic) {
+                                            if ($workflow_action->action == $help_topic->id) {
+                                                $help_topic1 = "selected";
+                                            } else {
+                                                $help_topic1 = "";
+                                            }
+                                            $var .= "<option value='" . $help_topic->id . "' " . $help_topic1 . ">" . $help_topic->topic . "</option>";
+                                        }
+                                        $var .= "</select>";
+                                        echo $var;
+                                    } elseif ($workflow_action->condition == 'status') {
+                                        $ticket_status = App\Model\helpdesk\Ticket\Ticket_Status::all();
+                                        $var = "<select name='action[" . $i . "][b]' class='form-control' required>";
+                                        foreach ($ticket_status as $status) {
+                                            if ($workflow_action->action == $status->id) {
+                                                $status1 = "selected";
+                                            } else {
+                                                $status1 = "";
+                                            }
+                                            $var .= "<option value='" . $status->id . "' " . $status1 . ">" . $status->name . "</option>";
+                                        }
+                                        $var .= "</select>";
+                                        echo $var;
+                                    }
+                                    ?>
+
+                                </td>
+                                <td style="text-align: center">
+                                    <div class="tools"> 
+                                        <span class="btnRemove" data-toggle="modal" data-target="#">
+                                            <a data-toggle="tooltip" data-placement="top" title="Delete" onclick="document.getElementById('seconddata{!! $i !!}').innerHTML = ''">
+                                                <i class="fas fa-trash text-red"></i>
+                                            </a>
+                                        </span> 
+                                    </div>
+                                </td>
+                            </tr>
+                            @endforeach
+                        </tbody>
+                    </table>
+                    <div class="mt-2">
+                        <div class="float-right">
+                            <a class="btn btn-primary btnAdd" href="javascript:;"><i class="fas fa-plus"></i> {!! Lang::get('lang.add') !!}</a>                                            
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div>
+                <label>{!! Lang::get('lang.internal_notes') !!}</label>
+                <textarea name="internal_note" class="textarea" placeholder="Please Enter an internal note for your team!" style="width: 100%; height: 200px; font-size: 14px; line-height: 18px; border: 1px solid #dddddd; padding: 10px;"></textarea>       
+            </div>
+        </div>
+
+        <div class="card-footer">
+            <input type="submit" class="btn btn-primary" value="{!! Lang::get('lang.submit') !!}">
         </div>
-        <!-- /.col -->
     </div>
-    <!-- /.row -->
 </form>
 <script>
             $(function() {
@@ -522,7 +508,7 @@ class="active"
             '<div class="tools">' +
             '<span class="btnRemove" data-toggle="modal" data-target="#">' +
             '<a data-toggle="tooltip" data-placement="top" title="Delete">' +
-            '<i class="fa fa-trash-o"></i>' +
+            '<i class="fas fa-trash text-red"></i>' +
             '</a>' +
             '</span>' +
             '</div>' +
@@ -550,7 +536,7 @@ class="active"
             '<option value="message">{!! Lang::get("lang.message") !!}/{!! Lang::get("lang.body") !!}</option>' +
             '</select>' +
             '</td>' +
-            '<td class="col-md-3">' +
+            '<td>' +
             '<select class="form-control" name="rule[' + n + '][b]" required>' +
             '<option value="">-- {!! Lang::get("lang.select_one") !!} --</option>' +
             '<option value="equal">{!! Lang::get("lang.equal_to") !!}</option>' +
@@ -561,9 +547,9 @@ class="active"
             '<option value="ends">{!! Lang::get("lang.ends_with") !!}</option>' +
             '</select>' +
             '</td>' +
-            '<td class="col-md-3"> <input class="form-control" type="text" name="rule[' + n + '][c]" required> </td>' +
+            '<td> <input class="form-control" type="text" name="rule[' + n + '][c]" required> </td>' +
             '<td style="text-align: center">' +
-            '<div class="tools"> <span class="btnRemove1" data-toggle="modal" data-target="#"><a data-toggle="tooltip" data-placement="top" title="Delete"><i class="fa fa-trash-o"></i></a></span> </div>' +
+            '<div class="tools"> <span class="btnRemove1" data-toggle="modal" data-target="#"><a data-toggle="tooltip" data-placement="top" title="Delete"><i class="fas fa-trash text-red"></i></a></span> </div>' +
             '</td>' +
             '</tr>'); // end append
             $('div .btnRemove1').last().click(function(e) {
diff --git a/resources/views/themes/default1/admin/helpdesk/manage/workflow/index.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/workflow/index.blade.php
index 1429be7fb..3f08292f6 100644
--- a/resources/views/themes/default1/admin/helpdesk/manage/workflow/index.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/manage/workflow/index.blade.php
@@ -1,15 +1,19 @@
 @extends('themes.default1.admin.layout.admin')
 
 @section('Manage')
-active
+class="nav-link active"
 @stop
 
-@section('manage-bar')
-active
+@section('manage-menu-parent')
+class="nav-item menu-open"
+@stop
+
+@section('manage-menu-open')
+class="nav nav-treeview menu-open"
 @stop
 
 @section('workflow')
-class="active"
+class="nav-link active"
 @stop
 
 @section('HeadInclude')
@@ -25,50 +29,50 @@ class="active"
 <!-- /breadcrumbs -->
 <!-- content -->
 @section('content')
-<div class="row">
-    <div class="col-xs-12">
-        <div class="box box-primary">
-            <div class="box-header">
-                <h3 class="box-title">{!! Lang::get('lang.ticket_workflow') !!}</h3>
-                <a href="{!! URL::route('workflow.create') !!}" class="btn btn-primary pull-right"><span class="glyphicon glyphicon-plus"></span> &nbsp;{!! Lang::get('lang.create') !!}</a>
-            </div>
-            <!-- /.box-header -->
-            <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
-                {!! Datatable::table()
-                ->addColumn(Lang::get('lang.name'),
-                Lang::get('lang.status'),
-                Lang::get('lang.order'),
-                Lang::get('lang.rules'),
-                Lang::get('lang.target_channel'),
-                Lang::get('lang.created'),
-                Lang::get('lang.updated'),
-                Lang::get('lang.action')) // these are the column headings to be shown
-                ->setUrl(route('workflow.list'))   // this is the route where data will be retrieved
-                ->render() !!}
-            </div>
-            <!-- </div> -->
-        </div>
-        <!-- /.box -->
-    </div>
-    <!-- /.col -->
+<!-- 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 card-light">
+    <div class="card-header">
+        <h3 class="card-title">{!! Lang::get('lang.ticket_workflow') !!}</h3>
+        <div class="card-tools">
+            <a href="{!! URL::route('workflow.create') !!}" class="btn btn-default btn-tool">
+                <span class="fas fa-plus"></span>&nbsp;{!! Lang::get('lang.create') !!}
+            </a>
+        </div>
+    </div>
+    <!-- /.box-header -->
+    <div class="card-body">
+        {!! Datatable::table()
+        ->addColumn(Lang::get('lang.name'),
+        Lang::get('lang.status'),
+        Lang::get('lang.order'),
+        Lang::get('lang.rules'),
+        Lang::get('lang.target_channel'),
+        Lang::get('lang.created'),
+        Lang::get('lang.updated'),
+        Lang::get('lang.action')) // these are the column headings to be shown
+        ->setUrl(route('workflow.list'))   // this is the route where data will be retrieved
+        ->render() !!}
+    </div>
+    <!-- </div> -->
+</div>
+<!-- /.box -->
+
 <script>
     $(function() {
         $("#example1").DataTable();
diff --git a/resources/views/themes/default1/admin/helpdesk/settings/url/settings.blade.php b/resources/views/themes/default1/admin/helpdesk/settings/url/settings.blade.php
index 44dc78c6d..b742cdd0c 100644
--- a/resources/views/themes/default1/admin/helpdesk/settings/url/settings.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/settings/url/settings.blade.php
@@ -1,15 +1,19 @@
 @extends('themes.default1.admin.layout.admin')
 
 @section('Manage')
-active
+class="nav-link active"
 @stop
 
-@section('manage-bar')
-active
+@section('manage-menu-parent')
+class="nav-item menu-open"
+@stop
+
+@section('manage-menu-open')
+class="nav nav-treeview menu-open"
 @stop
 
 @section('url')
-class="active"
+class="nav-link active"
 @stop
 
 @section('HeadInclude')
@@ -27,70 +31,60 @@ class="active"
 
 @section('content')
 {!! Form::open(['url' => 'url/settings', 'method' => 'PATCH']) !!}
-<div class="box box-primary">
-    <div class="box-header with-border">
-        <h3 class="box-title">URL 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
+<!-- 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 card-light">
+    <div class="card-header">
+        <h3 class="card-title">URL Settings</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-6">
-                <div class="form-group">
-                {!! Form::label('www','WWW/non-WWW') !!}
-                </div>
-                <div class="col-md-4 ">
-                    <p> {!! Form::radio('www','yes',$www['www'],['class'=>'option']) !!} WWW</p>
-                </div>
-                <div class="col-md-4">
-                    <p> {!! Form::radio('www','no',$www['nonwww'],['class'=>'option']) !!} Non WWW</p>
-                </div>
+            <div class="col-md-3">
+                {!! Form::label('www','WWW/non-WWW') !!}<br/>
+                {!! Form::radio('www','yes',$www['www'],['class'=>'option']) !!} WWW&nbsp;&nbsp;
+                {!! Form::radio('www','no',$www['nonwww'],['class'=>'option']) !!} Non WWW
             </div>
  
-
-            <div class="col-md-6 form-group">
-                <div class="form-group">
-                {!! Form::label('option','SSl') !!}
-                </div>
-                <div class="col-md-4">
-                    <p> {!! Form::radio('ssl','yes',$https['https'],['class'=>'option']) !!} HTTPS</p>
-                </div>
-                <div class="col-md-4">
-                    <p> {!! Form::radio('ssl','no',$https['http'],['class'=>'option']) !!} HTTP</p>
-                </div>
+            <div class="col-md-3">
+                
+                {!! Form::label('option','SSl') !!}<br/>
+                {!! Form::radio('ssl','yes',$https['https'],['class'=>'option']) !!} HTTPS&nbsp;&nbsp;
+                {!! Form::radio('ssl','no',$https['http'],['class'=>'option']) !!} HTTP
             </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/layout/admin.blade.php b/resources/views/themes/default1/admin/layout/admin.blade.php
index 1472ab333..ababae3e0 100644
--- a/resources/views/themes/default1/admin/layout/admin.blade.php
+++ b/resources/views/themes/default1/admin/layout/admin.blade.php
@@ -35,6 +35,10 @@
         <link rel="stylesheet" href="{{asset("lb-faveo/css/bootstrap-datetimepicker4.7.14.min.css")}}" rel="stylesheet" type="text/css" />
 
         <link href="{{asset("lb-faveo/plugins/summernote/summernote-bs4.min.css")}}" rel="stylesheet" type="text/css" />
+
+        <!-- Colorpicker -->
+
+        <link href="{{asset("lb-faveo/plugins/colorpicker/bootstrap-colorpicker.min.css")}}" rel="stylesheet" type="text/css" />
         
          <script src="{{asset("lb-faveo/js/jquery-3.4.1.min.js")}}" type="text/javascript"></script>
         @yield('HeadInclude')
@@ -426,14 +430,14 @@
                                 </ul>
                             </li>
 
-                            <li class="nav-item">
+                            <li @yield('manage-menu-parent') class="nav-item">
                                 
                                 <a href="#" @yield('Manage') class="nav-link">
                                     <i class="nav-icon fas fa-cubes"></i>
                                     <p>{!! Lang::get('lang.manage') !!} <i class="fas fa-angle-left right"></i></p>
                                 </a>
 
-                                <ul class="nav nav-treeview">
+                                <ul @yield('email-menu-open') class="nav nav-treeview">
 
                                     <li class="nav-item">
                                         <a href="{{url('helptopic')}}" @yield('help') class="nav-link">
@@ -767,6 +771,9 @@
 
         <script src="{{asset("lb-faveo/plugins/iCheck/icheck.min.js")}}" type="text/javascript"></script>
 
+        <!-- Colorpicker -->
+        <script src="{{asset("lb-faveo/plugins/colorpicker/bootstrap-colorpicker.min.js")}}" ></script>
+
         @if (trim($__env->yieldContent('no-toolbar')))
             <h1>@yield('no-toolbar')</h1>
         @else