diff --git a/app/DataTables/WorklistDataTable.php b/app/DataTables/WorklistDataTable.php
index c000859..6e049b3 100644
--- a/app/DataTables/WorklistDataTable.php
+++ b/app/DataTables/WorklistDataTable.php
@@ -50,7 +50,7 @@ public function dataTable(QueryBuilder $query): EloquentDataTable
             })
             ->editColumn('show_study', function (Study $study) {
                 $btn = '<a href="#" data-id="' . _h($study->id) . '" class="btn btn-outline-facebook btn-xs showStudy">Show</a>';
-                $btn .= ' <a href="#" data-id="' . _h($study->id) . '" class="edit btn btn-primary btn-xs editStudy">Edit</a>';
+                $btn .= '<a href="' . route('staff.history.edit', $study->hash) . '" class="edit btn btn-primary btn-xs editStudy">Edit</a>';
                 $btn .= ' <a href="#" data-id="' . _h($study->id) . '" class="btn btn-danger btn-xs deleteStudy">Delete</a>';
 
                 return $btn;
diff --git a/resources/views/staff/history/edit.blade.php b/resources/views/staff/history/edit.blade.php
index 9f8ad0a..6bb4fef 100644
--- a/resources/views/staff/history/edit.blade.php
+++ b/resources/views/staff/history/edit.blade.php
@@ -1,51 +1,115 @@
-<x-app-layout>
-    <x-slot name="header">
-        <h2 class="font-semibold text-xl text-gray-800 leading-tight">
-            {{ __('History') }}
-        </h2>
-    </x-slot>
+@php
+    $configData = App\Services\ThemeHelper::appClasses();
+    $container = 'container-fluid';
+    $containerNav = 'container-fluid';
+    /*
+    $isNavbar = false;
+    $navbarType = 'layout-navbar-hidden';
+    $isMenu = false;
+    $navbarHideToggle = false;
+    */
+@endphp
 
-    <div>
-        <div class="max-w-7xl mx-auto py-10 sm:px-6 lg:px-8">
+@extends('layouts.layoutMaster')
 
-            <div class="mt-10 sm:mt-0">
-                <h4>Clinical Information</h4>
+@section('title', 'Worklist')
 
-                <form action="{{ route('staff.history.save', $details->hash) }}" method="post">
-                    @csrf
-                    <input type="hidden" name="study_id" value="{{ $details->hash }}">
-                    <h5>Clinical History</h5>
-                    <div class="p-4 border-gray-100">
+@section('vendor-style')
+    @vite([
+        'resources/fontawesome/scss/fontawesome.scss',
+        'resources/fontawesome/scss/light.scss',
+    ])
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/Trumbowyg/2.27.3/ui/trumbowyg.min.css"
+          integrity="sha512-Fm8kRNVGCBZn0sPmwJbVXlqfJmPC13zRsMElZenX6v721g/H7OukJd8XzDEBRQ2FSATK8xNF9UYvzsCtUpfeJg=="
+          crossorigin="anonymous" referrerpolicy="no-referrer"/>
+@endsection
+
+@section('vendor-script')
+    <script src="//code.jquery.com/jquery-3.7.1.min.js" crossorigin="anonymous"></script>
+    <script>window.jQuery || document.write('<script src="js/vendor/jquery-3.7.1.slim.js"><\/script>')</script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/Trumbowyg/2.27.3/trumbowyg.min.js"
+            integrity="sha512-YJgZG+6o3xSc0k5wv774GS+W1gx0vuSI/kr0E0UylL/Qg/noNspPtYwHPN9q6n59CTR/uhgXfjDXLTRI+uIryg=="
+            crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/Trumbowyg/2.27.3/plugins/cleanpaste/trumbowyg.cleanpaste.min.js"
+            integrity="sha512-UInqT8f+K1tkck6llPo0HDxlT/Zxv8t4OGeCuVfsIlXLrnP1ZKDGb+tBsBPMqDW15OcmV8NDfQe9+EaAG4aXeg=="
+            crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+@endsection
+
+@section('page-script')
+    <script>
+
+        $('textarea').trumbowyg({
+            btns: [
+                ['strong', 'em'],
+                ['removeformat'],
+                ['viewHTML'],
+                ['fullscreen']
+            ],
+            removeformatPasted: true,
+            autogrow: true,
+            resetCss: true
+        });
+    </script>
+
+@endsection
+
+@section('content')
+    <h2 class="font-semibold text-xl text-gray-800 leading-tight">
+        {{ __('History') }}
+    </h2>
+
+    <h4>Clinical Information</h4>
+
+    <form action="{{ route('staff.history.save', $details->hash) }}" method="post">
+        @csrf
+        <input type="hidden" name="study_id" value="{{ $details->hash }}">
+        <h5>Clinical History</h5>
+        <div class="p-4 border-gray-100">
                         <textarea name="clinical_history" id="clinical_history" cols="90"
                                   rows="10">{!! $details->clinical_history !!}</textarea>
-                    </div>
-                    <x-section-border/>
+        </div>
+        <x-section-border/>
 
-                    <h5>surgical history</h5>
-                    <div class="p-4 border-gray-100">
+        <h5>surgical history</h5>
+        <div class="p-4 border-gray-100">
                         <textarea name="surgical_history" id="surgical_history" cols="90"
                                   rows="10">{!! $details->surgical_history !!}</textarea>
-                    </div>
-                    <x-section-border/>
+        </div>
+        <x-section-border/>
 
-                    <h5>lab results</h5>
-                    <div class="p-4 border-gray-100">
+        <h5>lab results</h5>
+        <div class="p-4 border-gray-100">
                         <textarea name="lab_results" id="lab_results" cols="90"
                                   rows="10">{!! $details->lab_results !!}</textarea>
-                    </div>
-                    <x-section-border/>
+        </div>
+        <x-section-border/>
 
-                    <h5>clinical diagnosis</h5>
-                    <div class="p-4 border-gray-100">
+        <h5>clinical diagnosis</h5>
+        <div class="p-4 border-gray-100">
                         <textarea name="clinical_diagnosis" id="clinical_diagnosis" cols="90"
                                   rows="10">{!! $details->clinical_diagnosis !!}</textarea>
-                    </div>
-
-                    <button type="submit">Save</button>
-                </form>
-
-            </div>
-
         </div>
-    </div>
-</x-app-layout>
+
+        <button type="submit">Save</button>
+    </form>
+
+@endsection
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/views/staff/history/view.blade.php b/resources/views/staff/history/view.blade.php
index f84f5eb..d328bbe 100644
--- a/resources/views/staff/history/view.blade.php
+++ b/resources/views/staff/history/view.blade.php
@@ -1,46 +1,58 @@
-<x-app-layout>
-    <x-slot name="header">
-        <h2 class="font-semibold text-xl text-gray-800 leading-tight">
-            {{ __('History View') }}
-        </h2>
-    </x-slot>
+@php
+    $configData = App\Services\ThemeHelper::appClasses();
+    $container = 'container-fluid';
+    $containerNav = 'container-fluid';
+    /*
+    $isNavbar = false;
+    $navbarType = 'layout-navbar-hidden';
+    $isMenu = false;
+    $navbarHideToggle = false;
+    */
+@endphp
 
-    <div>
-        <div class="max-w-7xl mx-auto py-10 sm:px-6 lg:px-8">
+@extends('layouts.layoutMaster')
 
-            <div class="mt-10 sm:mt-0">
-                <h4>Clinical Information</h4>
+@section('title', 'Worklist')
 
-                <h5>Clinical History</h5>
-                <div class="p-4 border-gray-100">
-                    {{ $details->clinical_history }}
-                </div>
-                <x-section-border/>
+@section('vendor-style')
+    @vite([
+        'resources/fontawesome/scss/fontawesome.scss',
+        'resources/fontawesome/scss/light.scss',
+    ])
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/Trumbowyg/2.27.3/ui/trumbowyg.min.css"
+          integrity="sha512-Fm8kRNVGCBZn0sPmwJbVXlqfJmPC13zRsMElZenX6v721g/H7OukJd8XzDEBRQ2FSATK8xNF9UYvzsCtUpfeJg=="
+          crossorigin="anonymous" referrerpolicy="no-referrer"/>
+@endsection
 
-                <h5>surgical_history</h5>
-                <div class="p-4 border-gray-100">
-                    {{ $details->surgical_history }}
-                </div>
-                <x-section-border/>
+@section('content')
+    <h2 class="font-semibold text-xl text-gray-800 leading-tight">
+        {{ __('History') }}
+    </h2>
 
-                <h5>lab_results</h5>
-                <div class="p-4 border-gray-100">
-                    {{ $details->lab_results }}
-                </div>
-                <x-section-border/>
-
-                <h5>clinical_diagnosis</h5>
-                <div class="p-4 border-gray-100">
-                    {{ $details->clinical_diagnosis }}
-                </div>
-                <x-section-border/>
-
-                @can(\App\Models\Enums\Permission::StudyHistoryEdit)
-                    <a class="btn btn-sm" href="{{ route('staff.history.edit', _h($details->study_id)) }}">Edit</a>
-                @endcan
-
-            </div>
+    <h4>Clinical Information</h4>
 
+        <h5>Clinical History</h5>
+        <div class="p-4 border-gray-100">
+                        <div class="show-text" disabled name="clinical_history" id="clinical_history"                        >{!! $details->clinical_history !!}</di>
         </div>
-    </div>
-</x-app-layout>
+        <x-section-border/>
+
+        <h5>surgical history</h5>
+        <div class="p-4 border-gray-100">
+                        <div class="show-text" disabled name="surgical_history" id="surgical_history"                        >{!! $details->surgical_history !!}</div>
+        </div>
+        <x-section-border/>
+
+        <h5>lab results</h5>
+        <div class="p-4 border-gray-100">
+                        <div class="show-text" disabled name="lab_results" id="lab_results"                        >{!! $details->lab_results !!}</div>
+        </div>
+        <x-section-border/>
+
+        <h5>clinical diagnosis</h5>
+        <div class="p-4 border-gray-100">
+                        <div class="show-text" disabled name="clinical_diagnosis" id="clinical_diagnosis"                        >{!! $details->clinical_diagnosis !!}</div>
+        </div>
+
+
+@endsection