diff --git a/agent/files.php b/agent/files.php
index 5c3905d2..626beed3 100644
--- a/agent/files.php
+++ b/agent/files.php
@@ -368,22 +368,24 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num'])
         <h3 class="card-title mt-2"><i class="fa fa-fw fa-folder mr-2"></i>Files</h3>
 
         <div class="card-tools">
+
             <div class="btn-group">
-                <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle" data-toggle="dropdown"><i class="fas fa-fw fa-plus mr-2"></i>New</button>
-                <div class="dropdown-menu">
-
-
+                <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+                    <i class="fas fa-fw fa-plus mr-2"></i>New
+                </button>
+                <div class="dropdown-menu dropdown-menu-right">
                     <a class="dropdown-item text-dark ajax-modal" href="#"
                        data-modal-url="modals/file/file_upload.php?client_id=<?= $client_id ?>&folder_id=<?= $get_folder_id ?>">
                         <i class="fas fa-fw fa-cloud-upload-alt mr-2"></i>Upload File
                     </a>
                     <div class="dropdown-divider"></div>
                     <a class="dropdown-item text-dark ajax-modal" href="#"
-                       data-modal-url="modals/document/document_add.php?client_id=<?= $client_id ?>&folder_id=<?= $get_folder_id ?>">
+                        data-modal-url="modals/document/document_add.php?client_id=<?= $client_id ?>&folder_id=<?= $get_folder_id ?>"
+                        data-modal-size="lg">
                         <i class="fas fa-fw fa-file-alt mr-2"></i>Document
                     </a>
-                    <a class="dropdown-item text-dark" href="#" data-toggle="modal"
-                       data-target="#addDocumentFromTemplateModal">
+                    <a class="dropdown-item text-dark ajax-modal" href="#"
+                        data-modal-url="modals/document/document_add_from_template.php?client_id=<?= $client_id ?>&folder_id=<?= $get_folder_id ?>">
                         <i class="fas fa-fw fa-file mr-2"></i>Document from Template
                     </a>
                     <div class="dropdown-divider"></div>
diff --git a/agent/modals/document/document_add_from_template.php b/agent/modals/document/document_add_from_template.php
index 7c81c158..126fdfdc 100644
--- a/agent/modals/document/document_add_from_template.php
+++ b/agent/modals/document/document_add_from_template.php
@@ -1,93 +1,97 @@
-<div class="modal" id="addDocumentFromTemplateModal" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header bg-dark">
-        <h5 class="modal-title"><i class="fa fa-fw fa-file-alt mr-2"></i>New Document from Template</h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span>&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" autocomplete="off">
-        <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-        <div class="modal-body">
+<?php
 
-          <label>Template</label>
-          <div class="form-group">
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-puzzle-piece"></i></span>
-              </div>
-              <select class="form-control" name="document_template_id" required>
-                <option value="">- Select Template -</option>
-                <?php
-                $sql_document_templates = mysqli_query($mysqli, "SELECT * FROM document_templates WHERE document_template_archived_at IS NULL ORDER BY document_template_name ASC");
-                while ($row = mysqli_fetch_array($sql_document_templates)) {
-                  $document_template_id = intval($row['document_template_id']);
-                  $document_template_name = nullable_htmlentities($row['document_template_name']);
+require_once '../../../includes/modal_header.php';
 
-                ?>
-                <option value="<?php echo $document_template_id ?>"><?php echo $document_template_name; ?></option>
-                <?php
-                }
-                ?>
+$client_id = intval($_GET['client_id'] ?? 0);
+$contact_id = intval($_GET['contact_id'] ?? 0);
+$asset_id = intval($_GET['asset_id'] ?? 0);
+intval($_GET['folder_id'] ?? 0);
 
-              </select>
-            </div>
-          </div>
+ob_start();
 
-          <label>Document name</label>
-          <div class="form-group">
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-file"></i></span>
-              </div>
-              <input type="text" class="form-control" name="name" placeholder="Name" required>
-            </div>
-          </div>
+?>
 
-          <label>Description</label>
-          <div class="form-group">
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-file"></i></span>
-              </div>
-              <input type="text" class="form-control" name="description" placeholder="Short summary of the document">
-            </div>
-          </div>
-
-          <label>Folder</label>
-          <div class="form-group">
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
-              </div>
-              <select class="form-control" name="folder">
-                <option value="0">/</option>
-                <?php
-                $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_location = $folder_location AND folder_client_id = $client_id ORDER BY folder_name ASC");
-                while ($row = mysqli_fetch_array($sql_folders)) {
-                  $folder_id = intval($row['folder_id']);
-                  $folder_name = nullable_htmlentities($row['folder_name']);
-
-                ?>
-                <option <?php if (isset($_GET['folder_id']) && $_GET['folder_id'] == $folder_id) echo "selected"; ?> value="<?php echo $folder_id ?>"><?php echo $folder_name; ?></option>
-                <?php
-                }
-                ?>
-
-              </select>
-            </div>
-          </div>
-
-        </div>
-
-        <div class="modal-footer">
-
-          <button type="submit" name="add_document_from_template" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
-          <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-
-        </div>
-      </form>
-    </div>
-  </div>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-file-alt mr-2"></i>New Document from Template</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+    <div class="modal-body">
+
+        <label>Template</label>
+        <div class="form-group">
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-puzzle-piece"></i></span>
+                </div>
+                <select class="form-control" name="document_template_id" required>
+                    <option value="">- Select Template -</option>
+                    <?php
+                    $sql_document_templates = mysqli_query($mysqli, "SELECT * FROM document_templates WHERE document_template_archived_at IS NULL ORDER BY document_template_name ASC");
+                    while ($row = mysqli_fetch_array($sql_document_templates)) {
+                        $document_template_id = intval($row['document_template_id']);
+                        $document_template_name = nullable_htmlentities($row['document_template_name']);
+                    ?>
+                        <option value="<?php echo $document_template_id ?>"><?php echo $document_template_name; ?></option>
+                    <?php
+                    }
+                    ?>
+                </select>
+            </div>
+        </div>
+
+        <label>Document name</label>
+        <div class="form-group">
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-file"></i></span>
+                </div>
+                <input type="text" class="form-control" name="name" placeholder="Name" required>
+            </div>
+        </div>
+
+        <label>Description</label>
+        <div class="form-group">
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-file"></i></span>
+                </div>
+                <input type="text" class="form-control" name="description" placeholder="Short summary of the document">
+            </div>
+        </div>
+
+        <label>Folder</label>
+        <div class="form-group">
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
+                </div>
+                <select class="form-control" name="folder">
+                    <option value="0">/</option>
+                    <?php
+                    $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_client_id = $client_id ORDER BY folder_name ASC");
+                    while ($row = mysqli_fetch_array($sql_folders)) {
+                        $folder_id = intval($row['folder_id']);
+                        $folder_name = nullable_htmlentities($row['folder_name']);
+                    ?>
+                        <option <?php if (isset($_GET['folder_id']) && $_GET['folder_id'] == $folder_id) echo "selected"; ?> value="<?php echo $folder_id ?>"><?php echo $folder_name; ?></option>
+                    <?php
+                    }
+                    ?>
+                </select>
+            </div>
+        </div>
+
+    </div>
+
+    <div class="modal-footer">
+        <button type="submit" name="add_document_from_template" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';