diff --git a/admin_custom_link_add_modal.php b/admin_custom_link_add_modal.php
index 5a662587..6250f465 100644
--- a/admin_custom_link_add_modal.php
+++ b/admin_custom_link_add_modal.php
@@ -1,52 +1,81 @@
 <div class="modal" id="addLinkModal" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fas fa-fw fa-external-link-alt mr-2"></i>New Custom Link</h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span>&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" autocomplete="off">
-
-        <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-list-ul"></i></span>
-              </div>
-              <input type="text" class="form-control" name="name" placeholder="Link name" required autofocus>
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fas fa-fw fa-external-link-alt mr-2"></i>New Custom Link</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-          </div>
+            <form action="post.php" method="post" autocomplete="off">
 
-          <div class="form-group">
-            <label>URI <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-external-link-alt"></i></span>
-              </div>
-              <input type="text" class="form-control" name="uri" placeholder="Enter Link" required>
-            </div>
-          </div>
+                <input type="hidden" name="new_tab" value="0">
 
-          <div class="form-group">
-            <label>Icon</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-image"></i></span>
-              </div>
-              <input type="text" class="form-control" name="icon" placeholder="Icon ex handshake">
-            </div>
-          </div>
-        
+                <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-list-ul"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="name" placeholder="Link name" required autofocus>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Order</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-sort-numeric-down"></i></span>
+                            </div>
+                            <input type="number" class="form-control" name="order" placeholder="Leave blank for no order">
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>URI <strong class="text-danger">*</strong></label> / <span class="text-secondary">Open New Tab</span>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-external-link-alt"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="uri" placeholder="Enter Link" required>
+                            <div class="input-group-append">
+                                <div class="input-group-text">
+                                    <input type="checkbox" name="new_tab" value="1">
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Icon</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-image"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="icon" placeholder="Icon ex handshake">
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Location <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-home"></i></span>
+                            </div>
+                            <select class="form-control select2" name="location" required>
+                                <option value="1">Main Side Nav</option>
+                            </select>
+                        </div>
+                    </div>
+
+                </div>
+                <div class="modal-footer bg-white">
+                    <button type="submit" name="add_custom_link" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
+                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+                </div>
+            </form>
         </div>
-        <div class="modal-footer bg-white">
-          <button type="submit" name="add_custom_link" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
-          <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/admin_custom_link_edit_modal.php b/admin_custom_link_edit_modal.php
index 472cbe60..0107e833 100644
--- a/admin_custom_link_edit_modal.php
+++ b/admin_custom_link_edit_modal.php
@@ -1,52 +1,79 @@
 <div class="modal" id="editLinkModal<?php echo $custom_link_id; ?>" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fas fa-fw fa-external-link-alt mr-2"></i>Editing link: <strong><?php echo $custom_link_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="custom_link_id" value="<?php echo $custom_link_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-list-ul"></i></span>
-              </div>
-              <input type="text" class="form-control" name="name" value="<?php echo $custom_link_name; ?>" required>
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fas fa-fw fa-external-link-alt mr-2"></i>Editing link: <strong><?php echo $custom_link_name; ?></strong></h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-          </div>
-          
-          <div class="form-group">
-            <label>URI <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-external-link-alt"></i></span>
-              </div>
-              <input type="text" class="form-control" name="uri" value="<?php echo $custom_link_uri; ?>" required>
-            </div>
-          </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="custom_link_id" value="<?php echo $custom_link_id; ?>">
+                <div class="modal-body bg-white">
 
-          <div class="form-group">
-            <label>Icon</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-image"></i></span>
-              </div>
-              <input type="text" class="form-control" name="icon" placeholder="Icon ex handshake" value="<?php echo $custom_link_icon; ?>">
-            </div>
-          </div>
-        
+                    <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-list-ul"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="name" value="<?php echo $custom_link_name; ?>" required>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Order</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-sort-numeric-down"></i></span>
+                            </div>
+                            <input type="number" class="form-control" name="order" placeholder="Leave blank for no order" value="<?php echo $custom_link_order; ?>">
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>URI <strong class="text-danger">*</strong></label> / <span class="text-secondary">Open New Tab</span>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-external-link-alt"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="uri" placeholder="Enter Link" value="<?php echo $custom_link_uri; ?>" required>
+                            <div class="input-group-append">
+                                <div class="input-group-text">
+                                    <input type="checkbox" name="new_tab" value="1" <?php if ($custom_link_new_tab == 1) { echo "checked"; } ?>>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Icon</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-image"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="icon" placeholder="Icon ex handshake" value="<?php echo $custom_link_icon; ?>">
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Location <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-home"></i></span>
+                            </div>
+                            <select class="form-control select2" name="location" required>
+                                <option value="1" <?php if ($custom_link_location == 1) { echo "selected"; } ?> >Main Side Nav</option>
+                            </select>
+                        </div>
+                    </div>
+
+                </div>
+                <div class="modal-footer bg-white">
+                    <button type="submit" name="edit_custom_link" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
+                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+                </div>
+            </form>
         </div>
-        <div class="modal-footer bg-white">
-          <button type="submit" name="edit_custom_link" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
-          <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/admin_custom_links.php b/admin_custom_links.php
index e5daf063..cef9d684 100644
--- a/admin_custom_links.php
+++ b/admin_custom_links.php
@@ -51,7 +51,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
                     <tr>
                         <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=custom_link_name&order=<?php echo $disp; ?>">Name</a></th>
-                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=custom_link_uri&order=<?php echo $disp; ?>">URI</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=custom_link_order&order=<?php echo $disp; ?>">Order</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=custom_link_uri&order=<?php echo $disp; ?>">URI / <span class="text-secondary">New Tab</span></a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=custom_link_location&order=<?php echo $disp; ?>">Location</a></th>
                         <th class="text-center">Action</th>
                     </tr>
                     </thead>
@@ -63,6 +65,19 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         $custom_link_name = nullable_htmlentities($row['custom_link_name']);
                         $custom_link_uri = nullable_htmlentities($row['custom_link_uri']);
                         $custom_link_icon = nullable_htmlentities($row['custom_link_icon']);
+                        $custom_link_new_tab = intval($row['custom_link_new_tab']);
+                        if ($custom_link_new_tab == 1 ) {
+                            $custom_link_new_tab_display = "<i class='fas fa-fw fa-checkmark'></i>";
+                        } else {
+                            $custom_link_new_tab_display = "";
+                        }
+                        $custom_link_order = intval($row['custom_link_order']);
+                        if ($custom_link_order == 0 ) {
+                            $custom_link_order_display = "-";
+                        } else {
+                            $custom_link_order_display = $custom_link_order;
+                        }
+                        $custom_link_location = intval($row['custom_link_location']);
 
                         ?>
                         <tr>
@@ -72,7 +87,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <?php echo $custom_link_name;?>
                                 </a>
                             </td>
-                            <td><?php echo $custom_link_uri; ?></td>
+                            <td><?php echo $custom_link_order_display; ?></td>
+                            <td><?php echo "$custom_link_uri $custom_link_new_tab_display"; ?></td>
+                            <td><?php echo $custom_link_location; ?></td>
                             <td>
                                 <div class="dropdown dropleft text-center">
                                     <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
diff --git a/post/admin.php b/post/admin.php
index 791307f4..54097234 100644
--- a/post/admin.php
+++ b/post/admin.php
@@ -298,9 +298,12 @@ if (isset($_POST['add_custom_link'])) {
 
     $name = sanitizeInput($_POST['name']);
     $uri = sanitizeInput($_POST['uri']);
+    $new_tab = intval($_POST['new_tab']);
     $icon = preg_replace("/[^0-9a-zA-Z-]/", "", sanitizeInput($_POST['icon']));
-
-    mysqli_query($mysqli,"INSERT INTO custom_links SET custom_link_name = '$name', custom_link_uri = '$uri', custom_link_icon = '$icon'");
+    $order = intval($_POST['order']);
+    $location = intval($_POST['location']);
+    
+    mysqli_query($mysqli,"INSERT INTO custom_links SET custom_link_name = '$name', custom_link_uri = '$uri', custom_link_new_tab = $new_tab, custom_link_icon = '$icon', custom_link_order = $order, custom_link_location = $location");
 
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Custom Link', log_action = 'Create', log_description = '$session_name created custom link $name --> $uri', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id");
@@ -316,9 +319,12 @@ if (isset($_POST['edit_custom_link'])) {
     $custom_link_id = intval($_POST['custom_link_id']);
     $name = sanitizeInput($_POST['name']);
     $uri = sanitizeInput($_POST['uri']);
+    $new_tab = intval($_POST['new_tab']);
     $icon = preg_replace("/[^0-9a-zA-Z-]/", "", sanitizeInput($_POST['icon']));
+    $order = intval($_POST['order']);
+    $location = intval($_POST['location']);
 
-    mysqli_query($mysqli,"UPDATE custom_links SET custom_link_name = '$name', custom_link_uri = '$uri', custom_link_icon = '$icon' WHERE custom_link_id = $custom_link_id");
+    mysqli_query($mysqli,"UPDATE custom_links SET custom_link_name = '$name', custom_link_uri = '$uri', custom_link_new_tab = $new_tab, custom_link_icon = '$icon', custom_link_order = $order, custom_link_location = $location WHERE custom_link_id = $custom_link_id");
 
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Custom Link', log_action = 'Modify', log_description = '$session_name edited the custom link $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id");
diff --git a/side_nav.php b/side_nav.php
index a9fa14e8..80c31e59 100644
--- a/side_nav.php
+++ b/side_nav.php
@@ -184,19 +184,25 @@
                 </li>
                 
                 <?php
-                $sql_custom_links = mysqli_query($mysqli, "SELECT * FROM custom_links WHERE custom_link_archived_at IS NULL
-                    ORDER BY custom_link_name DESC"
+                $sql_custom_links = mysqli_query($mysqli, "SELECT * FROM custom_links WHERE custom_link_location = 1 AND custom_link_archived_at IS NULL
+                    ORDER BY custom_link_order DESC, custom_link_name DESC"
                 );
 
                 while ($row = mysqli_fetch_array($sql_custom_links)) {
                     $custom_link_name = nullable_htmlentities($row['custom_link_name']);
                     $custom_link_uri = nullable_htmlentities($row['custom_link_uri']);
                     $custom_link_icon = nullable_htmlentities($row['custom_link_icon']);
+                    $custom_link_new_tab = intval($row['custom_link_new_tab']);
+                    if ($custom_link_new_tab == 1) {
+                        $target = "target='_blank' rel='noopener noreferrer'";
+                    } else {
+                        $target = "";
+                    }
 
                     ?>
 
                 <li class="nav-item">
-                    <a href="<?php echo $custom_link_uri; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == basename($custom_link_uri)) { echo "active"; } ?>">
+                    <a href="<?php echo $custom_link_uri; ?>" <?php echo $target; ?> class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == basename($custom_link_uri)) { echo "active"; } ?>">
                         <i class="fas fa-<?php echo $custom_link_icon; ?> nav-icon"></i>
                         <p><?php echo $custom_link_name; ?></p>
                         <i class="fas fa-angle-right nav-icon float-right"></i>