diff --git a/client_document_add_modal.php b/client_document_add_modal.php
index 1b8683ef..0f43c3f8 100644
--- a/client_document_add_modal.php
+++ b/client_document_add_modal.php
@@ -43,7 +43,7 @@
                                 function display_folder_options($parent_folder_id, $client_id, $indent = 0) {
                                     global $mysqli;
 
-                                    $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE parent_folder = $parent_folder_id AND folder_client_id = $client_id ORDER BY folder_name ASC");
+                                    $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE parent_folder = $parent_folder_id AND folder_location = 0 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']);
diff --git a/client_document_bulk_move_modal.php b/client_document_bulk_move_modal.php
index 01d7311f..2fe8a524 100644
--- a/client_document_bulk_move_modal.php
+++ b/client_document_bulk_move_modal.php
@@ -19,7 +19,7 @@
                             <option value="0">/</option>
                             <?php
                             // Fetch all folders for the client
-                            $sql_all_folders = mysqli_query($mysqli, "SELECT folder_id, folder_name, parent_folder FROM folders WHERE folder_client_id = $client_id ORDER BY folder_name ASC");
+                            $sql_all_folders = mysqli_query($mysqli, "SELECT folder_id, folder_name, parent_folder FROM folders WHERE folder_location = 0 AND folder_client_id = $client_id ORDER BY folder_name ASC");
                             $folders = array();
 
                             // Build an associative array of folders indexed by folder_id
diff --git a/client_document_details.php b/client_document_details.php
index ed5221ba..89b96128 100644
--- a/client_document_details.php
+++ b/client_document_details.php
@@ -70,10 +70,12 @@ $document_client_visible = intval($row['document_client_visible']);
 
     // Output breadcrumb items for each folder in the path
     foreach ($folder_path as $folder) {
+        $bread_crumb_folder_id = $folder['folder_id']; // Sanitized before put in array
+        $bread_crumb_folder_name = $folder['folder_name']; // Sanitized before put in array
         ?>
         <li class="breadcrumb-item">
-            <a href="client_documents.php?client_id=<?php echo $client_id; ?>&folder_id=<?php echo $folder['folder_id']; ?>">
-                <i class="fas fa-fw fa-folder-open mr-2"></i><?php echo $folder['folder_name']; ?>
+            <a href="client_documents.php?client_id=<?php echo $client_id; ?>&folder_id=<?php echo $bread_crumb_folder_id; ?>">
+                <i class="fas fa-fw fa-folder-open mr-2"></i><?php echo $bread_crumb_folder_name; ?>
             </a>
         </li>
         <?php
diff --git a/client_document_move_modal.php b/client_document_move_modal.php
index 32e3e095..cffc10f0 100644
--- a/client_document_move_modal.php
+++ b/client_document_move_modal.php
@@ -22,7 +22,7 @@
                                 <option value="0">/</option>
                                 <?php
                                 // Fetch all folders for the client
-                                $sql_all_folders = mysqli_query($mysqli, "SELECT folder_id, folder_name, parent_folder FROM folders WHERE folder_client_id = $client_id ORDER BY folder_name ASC");
+                                $sql_all_folders = mysqli_query($mysqli, "SELECT folder_id, folder_name, parent_folder FROM folders WHERE folder_location = 0 AND folder_client_id = $client_id ORDER BY folder_name ASC");
                                 $folders = array();
 
                                 // Build an associative array of folders indexed by folder_id
diff --git a/client_documents.php b/client_documents.php
index 22d0b0a3..d172443d 100644
--- a/client_documents.php
+++ b/client_documents.php
@@ -124,10 +124,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 <?php
                 // Output breadcrumb items for each folder in the path
                 foreach ($folder_path as $folder) {
+                    $bread_crumb_folder_id = $folder['folder_id']; // Already Sanitized before it was pushed into array
+                    $bread_crumb_folder_name = $folder['folder_name']; // Already Sanitized before it was pushed into array
+
                     ?>
                     <li class="breadcrumb-item">
-                        <a href="?client_id=<?php echo $client_id; ?>&folder_id=<?php echo $folder['folder_id']; ?>">
-                            <i class="fas fa-fw fa-folder-open mr-2"></i><?php echo $folder['folder_name']; ?>
+                        <a href="?client_id=<?php echo $client_id; ?>&folder_id=<?php echo $bread_crumb_folder_id; ?>">
+                            <i class="fas fa-fw fa-folder-open mr-2"></i><?php echo $bread_crumb_folder_name; ?>
                         </a>
                     </li>
                     <?php
@@ -187,7 +190,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         function display_folders($parent_folder_id, $client_id, $indent = 0) {
                             global $mysqli, $get_folder_id, $session_user_role;
 
-                            $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE parent_folder = $parent_folder_id AND folder_client_id = $client_id ORDER BY folder_name ASC");
+                            $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE parent_folder = $parent_folder_id AND folder_location = 0 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']);
@@ -235,9 +238,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                         <a class="dropdown-item" href="#" data-toggle="modal" data-target="#renameFolderModal<?php echo $folder_id; ?>">
                                             <i class="fas fa-fw fa-edit mr-2"></i>Rename
                                         </a>
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#createSubFolderModal<?php echo $folder_id; ?>">
-                                            <i class="fas fa-fw fa-folder-plus mr-2"></i>Create Sub-Folder
-                                        </a>
                                         <?php
                                         // Only show delete option if user is admin, folder has no documents, and no subfolders
                                         if ($session_user_role == 3 && $num_documents == 0 && $subfolder_count == 0) { ?>
@@ -254,7 +254,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                                 // Include the rename and create subfolder modals
                                 require "folder_rename_modal.php";
-                                require "folder_sub_create_modal.php";
 
                                 if ($subfolder_count > 0) {
                                     // Display subfolders
diff --git a/folder_create_modal.php b/folder_create_modal.php
index 8d924f23..1323d5e5 100644
--- a/folder_create_modal.php
+++ b/folder_create_modal.php
@@ -2,7 +2,7 @@
     <div class="modal-dialog">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-folder-plus mr-2"></i>New Folder</h5>
+                <h5 class="modal-title"><i class="fa fa-fw fa-folder-plus mr-2"></i>Creating folder in <strong><?php if($get_folder_id > 0) { echo $folder['folder_name']; } else { echo "/"; } ?></strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
@@ -10,6 +10,7 @@
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <input type="hidden" name="folder_location" value="<?php echo $folder_location; ?>">
+                <input type="hidden" name="parent_folder" value="<?php echo $get_folder_id; ?>">
                 <div class="modal-body bg-white">
 
                     <div class="form-group">
diff --git a/folder_sub_create_modal.php b/folder_sub_create_modal.php
deleted file mode 100644
index b3b0a6d0..00000000
--- a/folder_sub_create_modal.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<div class="modal" id="createSubFolderModal<?php echo $folder_id; ?>" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-folder-plus mr-2"></i>Creating Folder in: <strong><?php echo $folder_name; ?></strong></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; ?>">
-                <input type="hidden" name="folder_location" value="<?php echo $folder_location; ?>">
-                <input type="hidden" name="parent_folder" value="<?php echo $folder_id; ?>">
-                <div class="modal-body bg-white">
-
-                    <div class="form-group">
-                        <label>Name <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="folder_name" placeholder="Folder Name" required>
-                        </div>
-                    </div>
-
-                </div>
-                <div class="modal-footer bg-white">
-                    <button type="submit" name="create_sub_folder" 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>
diff --git a/post/user/folder.php b/post/user/folder.php
index 2b81e48d..63e4a1b3 100644
--- a/post/user/folder.php
+++ b/post/user/folder.php
@@ -8,27 +8,6 @@ if (isset($_POST['create_folder'])) {
 
     validateTechRole();
 
-    $client_id = intval($_POST['client_id']);
-    $folder_location = intval($_POST['folder_location']);
-    $folder_name = sanitizeInput($_POST['folder_name']);
-
-    // Document folder add query
-    $add_folder = mysqli_query($mysqli,"INSERT INTO folders SET folder_name = '$folder_name', folder_location = $folder_location, folder_client_id = $client_id");
-    $folder_id = mysqli_insert_id($mysqli);
-
-    // Logging
-    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Folder', log_action = 'Create', log_description = '$session_name created folder $folder_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $folder_id");
-
-    $_SESSION['alert_message'] = "Folder <strong>$folder_name</strong> created";
-
-    header("Location: " . $_SERVER["HTTP_REFERER"]);
-
-}
-
-if (isset($_POST['create_sub_folder'])) {
-
-    validateTechRole();
-
     $client_id = intval($_POST['client_id']);
     $folder_location = intval($_POST['folder_location']);
     $folder_name = sanitizeInput($_POST['folder_name']);
@@ -39,7 +18,7 @@ if (isset($_POST['create_sub_folder'])) {
     $folder_id = mysqli_insert_id($mysqli);
 
     // Logging
-    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Folder', log_action = 'Create', log_description = '$session_name created sub folder $folder_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $folder_id");
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Folder', log_action = 'Create', log_description = '$session_name created folder $folder_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $folder_id");
 
     $_SESSION['alert_message'] = "Folder <strong>$folder_name</strong> created";