diff --git a/resources/views/staff/history/edit.blade.php b/resources/views/staff/history/edit.blade.php
index c0cb7ae..c867ab6 100644
--- a/resources/views/staff/history/edit.blade.php
+++ b/resources/views/staff/history/edit.blade.php
@@ -133,12 +133,11 @@
                     >{!! $details->clinical_diagnosis !!}</div class="tw_ed">
                 </div>
 
-                <button type="submit">Save</button>
+                <button class="btn btn-primary btn-lg" type="submit">Save</button>
             </form>
         </div>
 
 
-
         <div class="col-4">
             <h4>Attachments</h4>
 
@@ -155,31 +154,11 @@
                 </div>
             </form>
 
-
-            <!-- List of already uploaded files -->
-            @include('staff.history.partials._uploaded-studies-list', ['study' => $study])
+            <!-- List of uploaded files -->
+            @include('staff.history.partials._uploaded-studies-list', ['study' => $study, 'allow_delete' => true])
         </div>
 
 
     </div>
 
 @endsection
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/resources/views/staff/history/partials/_uploaded-studies-list.blade.php b/resources/views/staff/history/partials/_uploaded-studies-list.blade.php
index 6aa7b48..9ec19f0 100644
--- a/resources/views/staff/history/partials/_uploaded-studies-list.blade.php
+++ b/resources/views/staff/history/partials/_uploaded-studies-list.blade.php
@@ -5,7 +5,9 @@
             <th>File</th>
             <th>Size</th>
             <th>Uploaded</th>
+            @if($allow_delete)
             <th>&nbsp;</th>
+            @endif
         </tr>
         </thead>
         <tbody>
@@ -20,7 +22,7 @@
                             </div>
                         </div>
                         <div class="d-flex flex-column">
-                            <a class="text-heading fw-medium" target="_blank" href="{{ $media->getUrl() }}">
+                            <a data-bs-popper="{{ $media->file_name }}" class="text-heading fw-medium" target="_blank" href="{{ $media->getUrl() }}">
                                 {{ chomp($media->file_name, 20) }}
                             </a>
                         </div>
@@ -34,7 +36,7 @@
                 <td>
                     {{ $media->created_at->format('d.m.Y h:iA') }}
                 </td>
-
+                @if($allow_delete)
                 <td>
                     <div class="d-flex align-items-end">
                         <form action="{{ route('staff.attachment.delete', [$study->hash, $media->id]) }}"
@@ -47,6 +49,7 @@
                         </form>
                     </div>
                 </td>
+                @endif
             </tr>
         @endforeach
 
diff --git a/resources/views/staff/history/view.blade.php b/resources/views/staff/history/view.blade.php
index 2f29ac3..fa24e80 100644
--- a/resources/views/staff/history/view.blade.php
+++ b/resources/views/staff/history/view.blade.php
@@ -29,48 +29,37 @@
         {{ __('History') }}
     </h2>
 
-    <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>
-        <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 class="row">
+        <div class="col-8">
+            <div class="card shadow-none bg-transparent border mb-4">
+                <div class="card-body">
+                    <h5 class="card-title">Clinical History</h5>
+                    {!! $details->clinical_history !!}
+                </div>
+            </div>
+            <div class="card shadow-none bg-transparent border mb-4">
+                <div class="card-body">
+                    <h5 class="card-title">Surgical History</h5>
+                    {!! $details->surgical_history !!}
+                </div>
+            </div>
+            <div class="card shadow-none bg-transparent border mb-4">
+                <div class="card-body">
+                    <h5 class="card-title">Lab Results</h5>
+                    {!! $details->lab_results !!}
+                </div>
+            </div>
+            <div class="card shadow-none bg-transparent border mb-4">
+                <div class="card-body">
+                    <h5 class="card-title">Clinical Diagnosis</h5>
+                    {!! $details->clinical_diagnosis !!}
+                </div>
+            </div>
         </div>
 
-
-        <!-- List of already uploaded files -->
-        <div class="uploaded-files">
-            <h2>Uploaded Files</h2>
-            <ul>
-                @foreach ($study->getMedia(\App\Models\Study::MEDIA_COLLECTION) as $media)
-                    <li>
-                        <i class="fa {{ $media->mime_type == 'application/pdf' ? 'fa-file-pdf' : 'fa-file-image' }}"></i>
-                        <a href="{{ $media->getUrl() }}" target="_blank">{{ $media->file_name }}</a>
-                        ({{ $media->human_readable_size }}) - Uploaded
-                        on {{ $media->created_at->format('Y-m-d H:i:s') }}
-                    </li>
-                @endforeach
-            </ul>
+        <div class="col-4">
+            <h5>Attachments</h5>
+            @include('staff.history.partials._uploaded-studies-list', ['study' => $study, 'allow_delete' => false])
         </div>
-
+    </div>
 @endsection