diff --git a/app/Helper/helpers.php b/app/Helper/helpers.php
index 82e0831..8b3fa84 100644
--- a/app/Helper/helpers.php
+++ b/app/Helper/helpers.php
@@ -83,9 +83,18 @@ function verifyMailgunSignature($token, $timestamp, $signature)
 if (!function_exists('insertTicket')) {
     function insertTicket($from_email, $to_email, $subject, $content, $type, $sender_name) {
         
-        $check = Ticket::where('subject', $subject)
-        ->where('from_email',$from_email)
-        ->where('to_email',$to_email)->first();
+        $check = Ticket::where(function ($query) use ($from_email, $to_email) {
+                $query->where('from_email', $from_email)
+                      ->where('to_email', $to_email);
+            })
+            ->where(function ($query) use ($subject) {
+                $cleanSubject = trim(str_ireplace('Re:', '', $subject)); // Remove 'Re:' prefix and trim whitespace
+                $query->where('subject', $cleanSubject)
+                      ->orWhere('subject', 'Re: ' . $cleanSubject); // Consider both with and without 'Re:'
+            })
+            ->first();
+
+        
         
         if(!$check){
         
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 389e49d..b0a4543 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -9,6 +9,8 @@
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use App\Services\MailgunService;
+use App\Http\Controllers\Mailgun\MailgunController;
 
 class LoginController extends Controller
 {
@@ -37,9 +39,13 @@ class LoginController extends Controller
      *
      * @return void
      */
+     
+     protected $mailgunService;
+     
     public function __construct()
     {
         $this->middleware('guest')->except('logout');
+         $this->mailgunService = app(MailgunService::class);
     }
 
     public function login()
@@ -59,8 +65,32 @@ public function storeLogin(Request $request)
                 return redirect('/company-info');
             } else {
                 $company = Company::where('user_id', Auth::id())->first();
-                Session::put('selected_company', $company->id);
-                return redirect('/dashboard');
+                $domain = $company->domain;
+                
+                $mailgunDomain = $this->mailgunService->getDomain($domain);
+    //   dd($mailgunDomain);
+        
+                if($mailgunDomain){
+                    
+                        $state = $mailgunDomain->getDomain()->getState();
+            
+                        if($state == 'unverified'){
+                            return redirect()->route('showDomain',$domain);
+                        }elseif($state == 'active'){
+                            
+                            if(empty($company->internal_email)){
+                                
+                                $mailgun = new MailgunController();
+                                $mailgun->createEmail($domain);
+                            }
+                
+                         Session::put('selected_company', $company->id);
+                         return redirect('/dashboard');
+                         
+                     }
+                }
+                
+               
             }
         }
 
diff --git a/app/Http/Controllers/InboxController.php b/app/Http/Controllers/InboxController.php
index 9066531..de660a2 100644
--- a/app/Http/Controllers/InboxController.php
+++ b/app/Http/Controllers/InboxController.php
@@ -11,14 +11,21 @@
 use Illuminate\Support\Facades\Auth;
 
 class InboxController extends Controller
+
 {
+    public function get_canned_responses(){
+         $companyId = Auth::user()->company->id;
+        return  CompanyMeta::where('company_id', $companyId)->where('key', 'canned_responses')->get();
+    }
+    
+    
     public function inboxSetting()
     {
         $companyId = Auth::user()->company->id;
         $timezones = Timezone::all();
         $languages = Language::all();
         $basic_setting = CompanyMeta::where('company_id', $companyId)->where('type', 'Basic Setting')->get();
-        $canned_response = CompanyMeta::where('company_id', $companyId)->where('type', 'Canned Response')->first();
+        $canned_response = $this->get_canned_responses();
         $spam_handling = CompanyMeta::where('company_id', $companyId)->where('type', 'Spam Handling')->first();
         $email_signature = CompanyMeta::where('company_id', $companyId)->where('type', 'Email Signature')->first();
         return view('inbox-setting', ['timezones' => $timezones, 'basic_setting' => $basic_setting, 'spam_handling' => $spam_handling,
@@ -140,33 +147,31 @@ public function cannedResponse(Request $request)
         $companyId = Auth::user()->company->id;
         
         // Collect data into an array
-        $canned_data = [
+        $canned_data = 
             [
                 'name' => $request->name,
                 'text' => $request->text,
-            ]
-        ];
+            ];
         
         // Retrieve existing canned responses
-        $existingMeta = CompanyMeta::where('company_id', $companyId)
-            ->where('key', 'canned_responses')
-            ->where('type', 'Canned Response')
-            ->first();
+        // $existingMeta = CompanyMeta::where('company_id', $companyId)
+        //     ->where('key', 'canned_responses')
+        //     ->where('type', 'Canned Response')
+        //     ->first();
         
-        // Decode existing JSON data if it exists
-        if ($existingMeta) {
-            $existingData = json_decode($existingMeta->value, true);
-            $canned_data = array_merge($existingData, $canned_data);
-        }
+        // // Decode existing JSON data if it exists
+        // if ($existingMeta) {
+        //     $existingData = json_decode($existingMeta->value, true);
+        //     $canned_data = array_merge($existingData, $canned_data);
+        // }
     
-        // Encode the data array as JSON
+        // // Encode the data array as JSON
         $jsonData = json_encode($canned_data);
     
         // Update or create the CompanyMeta entry
-        CompanyMeta::updateOrCreate([
-            'company_id' => $companyId,
-            'key' => 'canned_responses',
-        ], [
+        
+        
+        CompanyMeta::create([
             'company_id' => $companyId,
             'key' => 'canned_responses',
             'value' => $jsonData,
@@ -180,25 +185,24 @@ public function deleteCannedResponse($index)
     {
          $companyId = Auth::user()->company->id;
     
-        // Retrieve the existing canned responses
-        $cannedMeta = CompanyMeta::where('company_id', $companyId)
+         CompanyMeta::where('company_id', $companyId)
             ->where('key', 'canned_responses')
-            ->where('type', 'Canned Response')
-            ->first();
+            ->where('id', $index)
+            ->delete();
     
-        if ($cannedMeta) {
-            $canned_data = json_decode($cannedMeta->value, true);
+        // if ($cannedMeta) {
+        //     $canned_data = json_decode($cannedMeta->value, true);
 
-            if (isset($canned_data[$index])) {
-                unset($canned_data[$index]);
+        //     if (isset($canned_data[$index])) {
+        //         unset($canned_data[$index]);
 
-                $canned_data = array_values($canned_data);
-                $jsonData = json_encode($canned_data);
+        //         $canned_data = array_values($canned_data);
+        //         $jsonData = json_encode($canned_data);
 
-                $cannedMeta->value = $jsonData;
-                $cannedMeta->save();
-            }
-        }
+        //         $cannedMeta->value = $jsonData;
+        //         $cannedMeta->save();
+        //     }
+        // }
     
         return redirect()->back()->with('success', 'Canned response deleted successfully.');
 
@@ -320,8 +324,9 @@ public function inbox()
                 
                 
         $messages = [];
+        $canned_response = $this->get_canned_responses();
         
-        return view('inbox', ['tickets' => $tickets, 'messages' => $messages]);
+        return view('inbox', ['tickets' => $tickets, 'messages' => $messages, 'canned_response' => $canned_response]);
     }
     
     public function fetchChatMessages($ticketId)
diff --git a/app/Http/Controllers/Mailgun/EmailController.php b/app/Http/Controllers/Mailgun/EmailController.php
index 74ef269..51ab80f 100644
--- a/app/Http/Controllers/Mailgun/EmailController.php
+++ b/app/Http/Controllers/Mailgun/EmailController.php
@@ -35,7 +35,7 @@ public function saveEmail(Request $request){
                 $company = get_company('email',$to_email);
                 
                 if($company){
-                    $ticket = insertTicket($data['from_email'], $data['to_email'], $data['subject'], $message,'inbox',$data['from_name'] );
+                    $ticket = insertTicket($data['from_email'], $company->email, $data['subject'], $message,'inbox',$data['from_name'] );
                     if($ticket)
                         $response = createResponse($ticket->id,$message);
                 }else{}
diff --git a/app/Http/Controllers/Mailgun/MailgunController.php b/app/Http/Controllers/Mailgun/MailgunController.php
index 72a5b49..34637a2 100644
--- a/app/Http/Controllers/Mailgun/MailgunController.php
+++ b/app/Http/Controllers/Mailgun/MailgunController.php
@@ -11,10 +11,18 @@
 class MailgunController extends Controller
 {
     protected $mailgunService;
+    protected $cpanelApiService;
 
     public function __construct()
     {
         $this->mailgunService = app(MailgunService::class); // Resolving through the service container
+         $this->cpanelApiService = app(CPanelApiService::class);
+    }
+    
+    public function test(){
+        $domain = 'test.com';
+        $email = "kundesone.$domain@mailgun.kundesone.no";
+            dd($this->createEmail($domain,$email));
     }
 
     public function addDomain($domain)
@@ -35,7 +43,7 @@ public function addDomain($domain)
         
         $response = $this->mailgunService->addDomain($domain);
         
-        return route('showDomain',$domain)->redirect();
+        return redirect()->route('showDomain',$domain);
         
         }else{            
              return redirect()->route('showDomain',$domain);
@@ -69,19 +77,11 @@ public function verifyDomain(Request $request)
         if($state == 'unverified'){
             return redirect()->route('showDomain',$domain);
         }elseif($state == 'active'){
-            $this->createRoute($request);
+            //$this->createRoute($request);
             
-            $email = "kundesone.$domain@kundesone.no";
-            $this->createEmail($domain,$email);
+            $email = "kundesone.$domain@mailgun.kundesone.no";
+            $this->createEmail($domain);
             
-            $company = get_company('domain',$domain);
-            
-            if($company){
-                $company->internal_email = $email;
-                $company->save();
-            }
-            
-            return $email;
             
             return redirect('/dashboard');
         }
@@ -96,9 +96,9 @@ public function createRoute(Request $request)
         return $response;
     }
     
-    public function createEmail($domain,$email){
+    public function createEmail($domain){
         
-       
+       $email = "kundesone.$domain@mailgun.kundesone.no";
         $password = Str::random(12);
         $quota = 0;
 
@@ -108,6 +108,13 @@ public function createEmail($domain,$email){
             return false;
         }
 
+        $company = get_company('domain',$domain);
+            
+            if($company){
+                $company->internal_email = $email;
+                $company->save();
+            }
+
         return $email;
     }
     
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 1cf5f15..025e874 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -17,7 +17,7 @@ class RouteServiceProvider extends ServiceProvider
      *
      * @var string
      */
-    public const HOME = '/home';
+    public const HOME = '/dashboard';
 
     /**
      * Define your route model bindings, pattern filters, and other route configuration.
diff --git a/public/images/canned.png b/public/images/canned.png
new file mode 100644
index 0000000..1a58c97
Binary files /dev/null and b/public/images/canned.png differ
diff --git a/public/images/favicon.ico b/public/images/favicon.ico
new file mode 100644
index 0000000..f706aac
Binary files /dev/null and b/public/images/favicon.ico differ
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 0e26fa1..b05a334 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -11,8 +11,8 @@
     <meta content="" name="keywords">
 
     <!-- Favicons -->
-    <link href="" rel="icon">
-    <link href="assets/img/apple-touch-icon.png" rel="apple-touch-icon">
+     <link rel="icon" href="{{asset('images/favicon.ico')}}" type="image/png">
+    <!--<link href="assets/img/apple-touch-icon.png" rel="apple-touch-icon">-->
 
     <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/fomantic-ui@2.9.3/dist/semantic.min.css">
     <script src="https://cdn.jsdelivr.net/npm/fomantic-ui@2.9.3/dist/semantic.min.js"></script>
diff --git a/resources/views/domains/verify-domain.blade.php b/resources/views/domains/verify-domain.blade.php
index 3f644a2..dcab299 100644
--- a/resources/views/domains/verify-domain.blade.php
+++ b/resources/views/domains/verify-domain.blade.php
@@ -31,11 +31,11 @@
 
 <body>
 <div class="container">
-    <h1>Domain Verification Response</h1>
+    <h1>Instructions to verify domain. Read and apply carefully.</h1>
     
     <div class="domain-details">
         
-        <div class="alert alert-danger">
+        <div class="alert alert-{{$domain->getDomain()->getState() == 'active'?'success':'danger'}}">
                     <ul>
                         
                             <li>Domain is {{$domain->getDomain()->getState()}}</li>
@@ -51,15 +51,16 @@
     </div>
 
     <div class="dns-records">
-        <h2>Inbound DNS Records</h2>
-        @foreach($domain->getInboundDnsRecords() as $record)
+         <h2>Step 1: Add Forwarder</h2>
+        
             <div class="record">
-                <p><strong>Type:</strong> {{ $record->getType() }}</p>
-                <p><strong>Value:</strong> {{ $record->getValue() }}</p>
+                <p>Forward your email to internal email. i.e <span class="alert-success"><b>kundesone.{{ $domain->getDomain()->getName() }}@mailgun.kundesone.no</b></span>. Make sure you forward only your company email that you added on the time of registration.</p>
+                
             </div>
-        @endforeach
-
-        <h2>Outbound DNS Records</h2>
+       
+        
+        
+         <h2>Step 2: Add Outbound DNS Records</h2>
         @foreach($domain->getOutboundDnsRecords() as $record)
             <div class="record">
                 <p><strong>Type:</strong> {{ $record->getType() }}</p>
@@ -67,6 +68,29 @@
                 <p><strong>Value:</strong> {{ $record->getValue() }}</p>
             </div>
         @endforeach
+        
+        
+        <h2>Step 3: Add Inbound DNS Records</h2>
+        @foreach($domain->getInboundDnsRecords() as $record)
+            <div class="record">
+                <p><strong>Type:</strong> {{ $record->getType() }}</p>
+                <p><strong>Name:</strong> {{ $domain->getDomain()->getName() }}</p>
+                <p><strong>Value:</strong> {{ $record->getValue() }}</p>
+                <p><strong>Priority:</strong> 10</p>
+            </div>
+        @endforeach
+        
+        
+        
+        <h2>Note: DNS Propagation Time</h2>
+        
+            <div class="record">
+                <p>DNS Propagation can take upto 48 hours. In this case your domain will not be active.</p>
+               
+            </div>
+        
+
+       
     </div>
     
      <form id="verify-form" action="{{route('verifyDomain')}}" method="post">
diff --git a/resources/views/inbox-setting.blade.php b/resources/views/inbox-setting.blade.php
index b9211dd..403f84c 100644
--- a/resources/views/inbox-setting.blade.php
+++ b/resources/views/inbox-setting.blade.php
@@ -30,7 +30,7 @@
                     <div class="col col-left">
                         <div class="dev-input-group dev-input-group-input-info">
                             <label>Receiving email address </label>
-                            <input name="company_email" type="email" value="{{ Auth::user()->company->email }}" placeholder="kundo@limonmedia.no" readonly required>
+                            <input name="company_email" type="email" value="{{ Auth::user()->company->email }}" placeholder="support@kundesone.no" readonly required>
                             <div class="dev-input-info">
                                 <img src="{{ asset('images/info.svg') }}" alt="info">
                                 <span>E.g. support@yourcompany.com</span>
@@ -38,10 +38,10 @@
                         </div>
                         <div class="dev-input-group dev-input-group-input-info">
                             <label>Email address on Kundo</label>
-                            <input name="kundo_email" type="email" value="{{ $basic_setting[0]['value'] ?? '' }}" placeholder="kundo.limonmedia.no@mail.kundo.se" required>
+                            <input name="kundo_email" readonly type="email" value="{{ Auth::user()->company->internal_email }}" placeholder="kundo.limonmedia.no@mailgun.kundesone.no" required>
                             <div class="dev-input-info">
                                 <img src="{{ asset('images/info.svg') }}" alt="info">
-                                <span>Updates when you change the email address above</span>
+                                <span>Your kundesone internal email address.</span>
                             </div>
                         </div>
                         <div class="dev-input-group dev-input-group-input-info">
@@ -49,7 +49,7 @@
                             <input name="inbox_name" type="text" placeholder="Type here.." value="{{ $basic_setting[1]['value'] ?? '' }}" required>
                             <div class="dev-input-info">
                                 <img src="{{ asset('images/info.svg') }}" alt="info">
-                                <span>Your internal name. I.e. the email address</span>
+                                <span>Your internal name. I.e. the Inbox</span>
                             </div>
                         </div>
                         <div class="dev-input-group dev-input-group-input-info">
@@ -481,18 +481,25 @@ function toggleClosed(day) {
                 <div class="dev-title-row">
                     <h2>Canned responses</h2>
                     <div class="dev-users-boxs">
-                    @if(!is_null($canned_response))
-                    @foreach(json_decode($canned_response->value) as $index => $values)
+                    @if(count($canned_response) > 0)
+                    @foreach($canned_response as $index => $value)
+                    
+                    @php
+                    
+                    $result = json_decode($value->value);
+                    
+                    @endphp
+                    
                     <div class="dev-users-box">
                         <div class="dev-box">
-                            <h3>{{ $values->name }}</h3>
-                            <span>{{ $values->text }}</span>
+                            <h3>{{ $result->name }}</h3>
+                            <span>{{ $result->text }}</span>
                         </div>
                         <div class="dev-icon">
                             <img src="{{ asset('images/settingss.svg') }}" alt="">
                         </div>
                         <div class="dev-icon">
-                            <a style="cursor:pointer;" href="{{ route('delete.canned.response', $index) }}" class="delete-user"><img src="{{ asset('images/binn.svg') }}" alt=""></a>
+                            <a style="cursor:pointer;" href="{{ route('delete.canned.response', $value->id) }}" class="delete-user"><img src="{{ asset('images/binn.svg') }}" alt=""></a>
                         </div>
                     </div>
                     @endforeach
diff --git a/resources/views/inbox.blade.php b/resources/views/inbox.blade.php
index b732bec..200f99e 100644
--- a/resources/views/inbox.blade.php
+++ b/resources/views/inbox.blade.php
@@ -75,8 +75,111 @@ class="form-control input-reply-textarea" id="editor1" required></textarea>
       </div>
       <!--wysywyg editor-->
       <script src="https://cdn.ckeditor.com/4.16.0/standard/ckeditor.js"></script>
+      
+      
+      <!-- Canned Response Modal -->
+<!-- Canned Response Modal -->
+<div id="cannedResponseModal" class="modal">
+  <div class="modal-content">
+    <span class="close-button">&times;</span>
+    <h2>Canned Responses</h2>
+    <ul>
+        
+        @if(count($canned_response) > 0)
+                    @foreach($canned_response as $index => $value)
+                    
+                    @php
+                    
+                    $result = json_decode($value->value);
+                    
+                    @endphp
+        
+      <li><button class="canned-response" data-response="{{$result->text}}">{{$result->name}}</button></li>
+      @endforeach
+                    @endif
+    </ul>
+  </div>
+</div>
+      
+      
+      
+      
+      
+      
       <script>
-        CKEDITOR.replace('editor1');
+        //CKEDITOR.replace('editor1');
+        
+       CKEDITOR.plugins.add('addcannedresponse', {
+    init: function(editor) {
+        editor.addCommand('addCannedResponseCmd', {
+            exec: function(editor) {
+               document.getElementById('cannedResponseModal').style.display = 'block';
+            }
+        });
+        editor.ui.addButton('AddCannedResponse', {
+            label: 'Insert Canned Response',
+            command: 'addCannedResponseCmd',
+            icon: 'https://kundesone.no/images/canned.png', // Use an accessible icon URL or local path
+            toolbar: 'insert,0'
+        });
+    }
+});
+
+CKEDITOR.replace('editor1', {
+    extraPlugins: 'addcannedresponse', // Ensure your plugin is added to extraPlugins
+    // Optionally customize your toolbar further, or use the default configuration
+    toolbarGroups: [
+        { name: 'clipboard',   groups: [ 'clipboard', 'undo' ] },
+        { name: 'editing',     groups: [ 'find', 'selection', 'spellchecker' ] },
+        { name: 'links' },
+        { name: 'insert' },
+        { name: 'forms' },
+        { name: 'tools' },
+        { name: 'document',	   groups: [ 'mode', 'document', 'doctools' ] },
+        { name: 'others' },
+        '/',
+        { name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ] },
+        { name: 'paragraph',   groups: [ 'list', 'indent', 'blocks', 'align', 'bidi' ] },
+        { name: 'styles' },
+        { name: 'colors' },
+        { name: 'about' }
+    ]
+});
+
+
+        // Get the modal
+        var modal = document.getElementById("cannedResponseModal");
+        
+        // Get the button that opens the modal
+        var btn = document.getElementsByClassName("canned-response");
+        
+        // Get the <span> element that closes the modal
+        var span = document.getElementsByClassName("close-button")[0];
+        
+        // When the user clicks on <span> (x), close the modal
+        span.onclick = function() {
+            modal.style.display = "none";
+        }
+        
+        // When the user clicks anywhere outside of the modal, close it
+        window.onclick = function(event) {
+            if (event.target == modal) {
+                modal.style.display = "none";
+            }
+        }
+        
+        // Add event listeners to canned response buttons
+        Array.from(btn).forEach(function(element) {
+          element.addEventListener('click', function() {
+            var response = this.getAttribute('data-response');
+            CKEDITOR.instances.editor1.insertHtml(response);
+            modal.style.display = "none";
+          });
+        });
+        
+        
+        
+        
       </script>
 
       <!-- Action Box -->
@@ -86,9 +189,105 @@ class="form-control input-reply-textarea" id="editor1" required></textarea>
     </div>
 </div>
 
+<!-- Tagify CSS -->
+<link href="https://cdn.jsdelivr.net/npm/@yaireo/tagify/dist/tagify.css" rel="stylesheet">
+
+<!-- Tagify JS -->
+<script src="https://cdn.jsdelivr.net/npm/@yaireo/tagify/dist/tagify.min.js"></script>
+
+
+
+<style>
+    #cke_editor1{
+        width:100%!important;
+    }
+    
+    div.chat-inbox.chat-box{
+        display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    }
+    
+
+.modal {
+  display: none;
+  position: fixed;
+  z-index: 1;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  overflow: auto;
+  background-color: rgba(0,0,0,0.4);
+}
+
+.modal-content {
+  background-color: #fefefe;
+  margin: 15% auto;
+  padding: 20px;
+  border: 1px solid #888;
+  width: 100%;
+  max-width: 600px;
+}
+
+.close-button {
+  color: #aaa;
+  float: right;
+  font-size: 28px;
+  font-weight: bold;
+  background:;#748c62 !important
+}
+
+.close-button:hover,
+.close-button:focus {
+  color: black;
+  text-decoration: none;
+  cursor: pointer;
+}
+
+
+#cannedResponseModal ul {
+  list-style: none;
+  padding: 0;
+}
+
+#cannedResponseModal li {
+  padding: 8px 0; /* Spacing between buttons */
+}
+
+.canned-response {
+  width: 100%;
+  padding: 10px;
+  font-size: 16px;
+  border: none;
+  background-color: #4CAF50;
+  color: white;
+  cursor: pointer;
+  border-radius: 5px;
+  transition: background-color 0.3s, box-shadow 0.3s;
+}
+
+.canned-response:hover {
+  background-color: #45a049;
+  box-shadow: 0 2px 4px 0 rgba(0,0,0,0.24);
+}
+
+
+
+</style>
+
+
+
+
 <!--Script Tag-->
 <script>
     $(document).ready(function(){
+        
+        
+        
+        
+        
+        
         var activeTicketId = $('.chat-detail-item.active').data('ticket-id');
 
         // Load chat messages for the active ticket on page load
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 89529e9..f1657c2 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -6,7 +6,7 @@
    <meta charset="utf-8" />
    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
    <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-   <link rel="icon" href="./assets/images/favicon.ico" type="image/png">
+  <link rel="icon" href="{{asset('images/favicon.ico')}}" type="image/png">
 
    <!-- Google fonts -->
 
@@ -30,4 +30,9 @@
       crossorigin="anonymous"></script>
 </body>
 
-</html>
\ No newline at end of file
+</html>
+
+<script>
+    
+    alert();
+</script>
\ No newline at end of file
diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php
index 176a784..eaf5ebd 100644
--- a/resources/views/layouts/master.blade.php
+++ b/resources/views/layouts/master.blade.php
@@ -14,7 +14,7 @@
         integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
     <!-- Main Styles -->
     <link rel="stylesheet" href="{{ asset('assets/style.css') }}">
-
+<link rel="icon" href="{{asset('images/favicon.ico')}}" type="image/png">
 </head>
 </head>
 
diff --git a/resources/views/layouts/setting.blade.php b/resources/views/layouts/setting.blade.php
index 35e30fb..058ba6a 100644
--- a/resources/views/layouts/setting.blade.php
+++ b/resources/views/layouts/setting.blade.php
@@ -21,7 +21,7 @@
 
   <!-- Main Styles  -->
   <link rel="stylesheet" href="{{ asset('assets/style.css') }}">
-
+<link rel="icon" href="{{asset('images/favicon.ico')}}" type="image/png">
 </head>
 </head>
 
diff --git a/resources/views/partials/action-box.blade.php b/resources/views/partials/action-box.blade.php
index 2b02623..56b8ec2 100644
--- a/resources/views/partials/action-box.blade.php
+++ b/resources/views/partials/action-box.blade.php
@@ -1,3 +1,6 @@
+<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.13.0/css/all.min.css" rel="stylesheet">
+
+
 <div class="box-top-area">
   <div class="box-heading-row d-flex justify-content-between align-items-center">
     <p class="heading color-dark-green">Administrate</p>
@@ -13,16 +16,50 @@
 <div class="box-body-area">
   <ul class="inbox-chat-options">
     <li class="single-option d-flex justify-content-between">
-      <p>Assign <span>(Assign to me)</span></p>
-      <p><img src="{{ asset('images/icons/Frame (1).png') }}" alt="Chevron Right"></p>
+      <p><b>Assign:</b></p>
+      <p class="dev-custom-select">
+          <select class="aw-select">
+              <option>(Assign)</option>
+              <option>test</option>
+              <option>test</option>
+          </select>
+          </p>
+      <p class="aw-done bg-light-green-color"><i class="fas fa-check"></i></p>
     </li>
     <li class="single-option d-flex justify-content-between">
-      <p>Priority <span>(Choose Priority)</span></p>
-      <p><img src="{{ asset('images/icons/Frame (1).png') }}" alt="Chevron Right"></p>
+      <p><b>Priority:</b></span></p>
+      
+      <p class="dev-custom-select">
+          <select class="aw-select">
+              <option>(Choose Priority)</option>
+              <option>test</option>
+              <option>test</option>
+          </select>
+          </p>
+       <p class="aw-done bg-light-green-color"><i class="fas fa-check"></i></p>
+      <!--<p><img src="{{ asset('images/icons/Frame (1).png') }}" alt="Chevron Right"></p>-->
     </li>
-    <li class="single-option d-flex justify-content-between">
+    <li class="single-option">
       <p>Tags <span>(Choose Tags)</span></p>
-      <p><img src="{{ asset('images/icons/+.png') }}" alt="Chevron Right"></p>
+      
+      
+<script>
+    // Assuming you have a DOM element with the ID 'tags'
+    var input = document.getElementById('tags');
+    new Tagify(input);
+</script>
+
+       
+       <input type="text" name="tags" id="tags" placeholder="Type and press Enter"
+                  class="form-control input-reply-textarea input-comment-textarea"/>
+                  
+                  
+                <button class="ui button bg-light-green-color mt-4 color-light">
+                  Save
+                </button>
+                
+                
+      <!--<p><img src="{{ asset('images/icons/+.png') }}" alt="Chevron Right"></p>-->
     </li>
     <li class="single-option d-flex justify-content-between">
       <div class="accordion w-100 border-0" id="accordionExample">
@@ -80,6 +117,31 @@ class="ui button comment--btn bg-light-green-color color-light comment-delete-bt
   </ul>
 </div>
 
+<style>
+    
+    .aw-done{
+        padding:10px;
+        color:white;
+        font-size:20px!important;
+        cursor:pointer;
+    }
+    
+    .aw-select{
+        color: #8d98aa;
+    font-family: Poppins;
+    font-size: 11px;
+    font-weight: 500;
+    padding: 13px;
+    background: linear-gradient(0deg, #edf2f6 0%, #edf2f6 100%), #fff;
+    border: none;
+    outline: none;
+    border-radius: 6px;
+    width: 100%;
+    resize: unset;
+    }
+    
+</style>
+
 <!--delete Comment-->
 <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
 <script>
diff --git a/routes/web.php b/routes/web.php
index 8de2d91..0edc912 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -31,7 +31,7 @@
 
 Route::middleware(['auth'])->group(function(){
     
-    Route::get('/test', [MailgunController::class, 'addDomain'])->name('addDomain');
+    Route::get('/test', [MailgunController::class, 'test'])->name('test');
     
     Route::get('/show-domain/{domain}', [MailgunController::class, 'showDomain'])->name('showDomain');