diff --git a/side_nav.php b/side_nav.php
index e12d0c52..0e5e614d 100644
--- a/side_nav.php
+++ b/side_nav.php
@@ -46,19 +46,7 @@
 
             <?php } ?>
 
-            <form class="form-inline mb-3" action="global_search.php">
-                <div class="input-group">
-                    <input class="form-control form-control-sidebar" type="search" placeholder="Search" name="query" value="<?php if(isset($_GET['query'])){ echo htmlentities($_GET['query']); } ?>">
-                    <div class="input-group-append">
-                        <button class="btn btn-sidebar" type="submit">
-                            <i class="fas fa-search"></i>
-                        </button>
-                    </div>
-                </div>
-            </form>
-
-
-            <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" data-accordion="false">
+            <ul class="nav nav-pills nav-sidebar flex-column mt-3" data-widget="treeview" data-accordion="false">
 
                 <!-- Dashboard item (tech/financial) -->
                 <?php if ($session_user_role == 2) { ?>
diff --git a/top_nav.php b/top_nav.php
index 683e82f5..516f89c9 100644
--- a/top_nav.php
+++ b/top_nav.php
@@ -8,12 +8,28 @@
     </li>
   </ul>
 
+  
+
   <!-- Right navbar links -->
+
   <ul class="navbar-nav ml-auto">
+
+    <!-- SEARCH FORM -->
+    <form class="form-inline mx-auto" action="global_search.php">
+      <div class="input-group input-group-sm">
+        <input class="form-control form-control-navbar" type="search" placeholder="Search" name="query" value="<?php if(isset($_GET['query'])){ echo htmlentities($_GET['query']); } ?>">
+        <div class="input-group-append">
+          <button class="btn btn-navbar" type="submit">
+            <i class="fas fa-search"></i>
+          </button>
+        </div>
+      </div>
+    </form>
+
     <!-- Notifications -->
     <li class="nav-item">
       <a class="nav-link" href="notifications.php">
-        <i class="fas fa-bell mr-2"></i>
+        <i class="fas fa-bell mr-2 ml-5"></i>
         <?php if($num_notifications > 0){ ?>
         <span class="badge badge-danger navbar-badge"><?php echo $num_notifications; ?></span>
         <?php } ?>
@@ -21,13 +37,13 @@
     </li>
     
     <li class="nav-item dropdown user-menu">
-      <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">
+      <a href="#" class="nav-link" data-toggle="dropdown">
         <?php if(empty($session_avatar)){ ?>
         	<i class="fas fa-user"></i>
         <?php }else{ ?>
         <img src="<?php echo "uploads/users/$session_user_id/$session_avatar"; ?>" class="user-image img-circle">
         <?php } ?>
-        <span class="d-none d-md-inline"><?php echo htmlentities($session_name); ?></span>
+        <span class="d-none d-md-inline dropdown-toggle"><?php echo htmlentities($session_name); ?></span>
       </a>
       <ul class="dropdown-menu dropdown-menu-lg dropdown-menu-right">
         <!-- User image -->