diff --git a/modals/client_add_modal.php b/modals/client_add_modal.php
index 49dbf251..db45d362 100644
--- a/modals/client_add_modal.php
+++ b/modals/client_add_modal.php
@@ -144,26 +144,6 @@
 
                         <div class="tab-pane fade" id="pills-location">
 
-                            <div class="form-group">
-                                <label>Location Phone</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="location_phone" placeholder="Location's Phone Number" maxlength="200">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Location Fax</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-fax"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="location_fax" placeholder="Location's Fax Number" maxlength="200">
-                                </div>
-                            </div>
-
                             <div class="form-group">
                                 <label>Address</label>
                                 <div class="input-group">
@@ -219,6 +199,26 @@
                                 </div>
                             </div>
 
+                            <div class="form-group">
+                                <label>Location Phone</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="location_phone" placeholder="Location's Phone Number" maxlength="200">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Location Fax</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-fax"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="location_fax" placeholder="Location's Fax Number" maxlength="200">
+                                </div>
+                            </div>
+
                         </div>
 
                         <div class="tab-pane fade" id="pills-contact">
diff --git a/project_details.php b/project_details.php
index 1e6c7bc9..fab3d5dc 100644
--- a/project_details.php
+++ b/project_details.php
@@ -192,11 +192,6 @@ if (isset($_GET['project_id'])) {
 
             <div class="col-sm-3">
                 <div class="btn-group float-right d-print-none">
-                    <?php if ($tickets_closed_percent == 100 && empty($project_completed_at)) { ?>
-                        <a class="btn btn-primary btn-sm confirm-link" href="post.php?close_project=<?php echo $project_id; ?>">
-                            <i class="fas fa-fw fa-check mr-2"></i>Close
-                        </a>
-                    <?php } ?>
                     <?php if (empty($project_completed_at)) { ?>
                         <div class="dropdown mr-2">
                             <button class="btn btn-primary btn-sm" type="button" id="dropdownMenuButton" data-toggle="dropdown">
@@ -209,7 +204,7 @@ if (isset($_GET['project_id'])) {
                             </div>
                         </div>
                         <div class="dropdown">
-                            <button class="btn btn-outline-primary btn-sm" type="button" id="dropdownMenuButton" data-toggle="dropdown">
+                            <button class="btn btn-outline-primary btn-sm mr-3" type="button" id="dropdownMenuButton" data-toggle="dropdown">
                                 <i class="fas fa-fw fa-link mr-2"></i>Link
                             </button>
                             <div class="dropdown-menu">
@@ -219,6 +214,11 @@ if (isset($_GET['project_id'])) {
                             </div>
                         </div>
                     <?php } ?>
+                    <?php if ($tickets_closed_percent == 100 && empty($project_completed_at)) { ?>
+                        <a class="btn btn-dark btn-sm confirm-link" href="post.php?close_project=<?php echo $project_id; ?>">
+                            <i class="fas fa-fw fa-check mr-2"></i>Close
+                        </a>
+                    <?php } ?>
                     <div class="dropdown dropleft text-center ml-3">
                         <button class="btn btn-secondary btn-sm" type="button" id="dropdownMenuButton" data-toggle="dropdown">
                             <i class="fas fa-fw fa-ellipsis-v"></i>