diff --git a/admin/document_template.php b/admin/document_template.php
index c1bfbaf4..5b2d808a 100644
--- a/admin/document_template.php
+++ b/admin/document_template.php
@@ -20,7 +20,7 @@
 
 <div class="card card-dark">
     <div class="card-header py-2">
-        <h3 class="card-title mt-2"><i class="fa fa-fw fa-file mr-2"></i>Document Templates</h3>
+        <h3 class="card-title mt-2"><i class="fa fa-fw fa-file-alt mr-2"></i>Document Templates</h3>
         <div class="card-tools">
             <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/document_template/document_template_add.php" data-modal-size="xl">
                 <i class="fas fa-plus mr-2"></i>New Template
@@ -73,14 +73,23 @@
                             $document_template_content = nullable_htmlentities($row['document_template_content']);
                             $document_template_created_by_name = nullable_htmlentities($row['user_name']);
                             $document_template_created_at = nullable_htmlentities($row['document_template_created_at']);
-                            $document_template_updated_at = nullable_htmlentities($row['document_template_updated_at']);
+                            $document_template_updated_at = nullable_htmlentities(getFallback($row['document_template_updated_at']));
 
                     ?>
 
                     <tr>
                         <td>
-                            <a class="text-bold" href="document_template_details.php?document_template_id=<?php echo $document_template_id; ?>"><i class="fas fa-fw fa-file-alt text-dark"></i> <?php echo $document_template_name; ?></a>
-                            <div class="mt-1 text-secondary"><?php echo $document_template_description; ?></div>
+                            <a class="text-dark ajax-modal" href="#"
+                                data-modal-size="xl"
+                                data-modal-url="modals/document_template/document_template_edit.php?id=<?= $document_template_id ?>">
+                                <div class="media">
+                                    <i class="fas fa-fw fa-2x fa-file-alt mr-2"></i>
+                                    <div class="media-body">
+                                        <div><?= $document_template_name ?></div>
+                                        <div><small class="text-secondary"><?= $document_template_description ?></small></div>
+                                    </div>
+                                </div>
+                            </a>
                         </td>
                         <td>
                             <?php echo $document_template_created_at; ?>
@@ -93,6 +102,10 @@
                                     <i class="fas fa-ellipsis-h"></i>
                                 </button>
                                 <div class="dropdown-menu">
+                                    <a class="dropdown-item" href="document_template_details.php?document_template_id=<?= $document_template_id ?>">
+                                        <i class="fas fa-fw fa-eye mr-2"></i>View
+                                    </a>
+                                    <div class="dropdown-divider"></div>
                                     <a class="dropdown-item ajax-modal" href="#"
                                         data-modal-size="xl"
                                         data-modal-url="modals/document_template/document_template_edit.php?id=<?= $document_template_id ?>">
diff --git a/admin/document_template_details.php b/admin/document_template_details.php
index a5949ba7..375837cb 100644
--- a/admin/document_template_details.php
+++ b/admin/document_template_details.php
@@ -43,19 +43,19 @@ $document_template_updated_at = nullable_htmlentities($row['document_template_up
     <li class="breadcrumb-item">
         <a href="document_template.php">Document Templates</a>
     </li>
-    <li class="breadcrumb-item active"><i class="fas fa-file mr-2"></i><?php echo $document_template_name; ?></li>
+    <li class="breadcrumb-item active"><i class="fas fa-file-alt mr-2"></i><?php echo $document_template_name; ?></li>
 </ol>
 
 <div class="card card-dark">
-    <div class="card-header py-2">
+    <div class="card-header">
 
-        <h3 class="card-title mt-2"><i class="fa fa-fw fa-file mr-2"></i><?php echo $document_template_name; ?></h3>
+        <h3 class="card-title mt-1"><i class="fa fa-fw fa-file-alt mr-2"></i><?php echo $document_template_name; ?></h3>
 
         <div class="card-tools">
-            <button type="button" class="btn btn-primary ajax-modal"
+            <button type="button" class="btn btn-tool ajax-modal"
                 data-modal-size="xl"
                 data-modal-url="modals/document_template/document_template_edit.php?id=<?= $document_template_id ?>">
-                <i class="fas fa-edit mr-2"></i>Edit
+                <i class="fas fa-edit mr-2"></i>
             </button>
         </div>
     </div>
diff --git a/admin/includes/side_nav.php b/admin/includes/side_nav.php
index b5868629..5d7b224a 100644
--- a/admin/includes/side_nav.php
+++ b/admin/includes/side_nav.php
@@ -139,7 +139,7 @@
                     </li>
                     <li class="nav-item">
                         <a href="/admin/document_template.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['document_template.php', 'document_template_details.php']) ? 'active' : ''); ?>">
-                            <i class="nav-icon fas fa-file"></i>
+                            <i class="nav-icon fas fa-file-alt"></i>
                             <p>Document Templates</p>
                         </a>
                     </li>
diff --git a/admin/modals/document_template/document_template_add.php b/admin/modals/document_template/document_template_add.php
index 70f87ed4..367f26df 100644
--- a/admin/modals/document_template/document_template_add.php
+++ b/admin/modals/document_template/document_template_add.php
@@ -46,7 +46,7 @@ ob_start();
 
     <div class="modal-footer">
 
-        <button type="submit" name="add_document_template" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
+        <button type="submit" name="add_document_template" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save template</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
 
     </div>
diff --git a/admin/modals/document_template/document_template_edit.php b/admin/modals/document_template/document_template_edit.php
index a1decc68..936daa01 100644
--- a/admin/modals/document_template/document_template_edit.php
+++ b/admin/modals/document_template/document_template_edit.php
@@ -10,7 +10,6 @@ $document_template_name = nullable_htmlentities($row['document_template_name']);
 $document_template_description = nullable_htmlentities($row['document_template_description']);
 $document_template_content = nullable_htmlentities($row['document_template_content']);
 
-// Generate the HTML form content using output buffering.
 ob_start();
 ?>
 
@@ -40,7 +39,7 @@ ob_start();
 
     </div>
     <div class="modal-footer">
-        <button type="submit" name="edit_document_template" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
+        <button type="submit" name="edit_document_template" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save template</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
 </form>