diff --git a/side_nav.php b/side_nav.php
index 42964722..ade8c9c4 100644
--- a/side_nav.php
+++ b/side_nav.php
@@ -10,195 +10,141 @@
 
         <!-- Sidebar Menu -->
         <nav>
-
             <ul class="nav nav-pills nav-sidebar flex-column mt-3" data-widget="treeview" data-accordion="false">
-
                 <li class="nav-item">
-                    <a href="dashboard.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "dashboard.php") {
-                                                                echo "active";
-                                                            } ?>">
+                    <a href="dashboard.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "dashboard.php") { echo "active"; } ?>">
                         <i class="nav-icon fas fa-tachometer-alt"></i>
                         <p>Dashboard</p>
                     </a>
                 </li>
-
                 <li class="nav-item">
-                    <a href="clients.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "clients.php") {
-                                                                echo "active";
-                                                            } ?>">
+                    <a href="clients.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "clients.php") { echo "active"; } ?>">
                         <i class="nav-icon fas fa-user-friends"></i>
                         <p>Clients</p>
                     </a>
                 </li>
-
                 <?php if ($session_user_role >= 2 && $config_module_enable_ticketing == 1) { ?>
-
                     <li class="nav-header mt-3">SUPPORT</li>
                     <li class="nav-item">
-                        <a href="tickets.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "tickets.php" || basename($_SERVER["PHP_SELF"]) == "ticket.php" || basename($_SERVER["PHP_SELF"]) == "recurring_tickets.php") {
-                                                                    echo "active";
-                                                                } ?>">
+                        <a href="tickets.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "tickets.php" || basename($_SERVER["PHP_SELF"]) == "ticket.php" || basename($_SERVER["PHP_SELF"]) == "recurring_tickets.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-life-ring"></i>
                             <p>
                                 Tickets
-                                <?php
-                                if ($num_active_tickets) { ?>
+                                <?php if ($num_active_tickets) { ?>
                                     <span class="right badge text-light"><?php echo $num_active_tickets; ?></span>
                                 <?php } ?>
                             </p>
                         </a>
                     </li>
-
                     <li class="nav-item">
                         <a href="projects.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "projects.php" || basename($_SERVER["PHP_SELF"]) == "project_details.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-project-diagram"></i>
                             <p>
                                 Projects
-                                <?php
-                                if ($num_active_projects) { ?>
+                                <?php if ($num_active_projects) { ?>
                                     <span class="right badge text-light"><?php echo $num_active_projects; ?></span>
                                 <?php } ?>
                             </p>
                         </a>
                     </li>
-
                 <?php } ?>
-
                 <li class="nav-item">
-                    <a href="calendar_events.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "calendar_events.php") {
-                                                                        echo "active";
-                                                                    } ?>">
+                    <a href="calendar_events.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "calendar_events.php") { echo "active"; } ?>">
                         <i class="nav-icon fas fa-calendar-alt"></i>
                         <p>Calendar</p>
                     </a>
                 </li>
-
                 <?php if ($config_module_enable_accounting == 1) { ?>
-
                     <li class="nav-header mt-3">SALES</li>
                     <li class="nav-item">
-                        <a href="quotes.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "quotes.php" || basename($_SERVER["PHP_SELF"]) == "quote.php") {
-                                                                    echo "active";
-                                                                } ?>">
+                        <a href="quotes.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "quotes.php" || basename($_SERVER["PHP_SELF"]) == "quote.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-comment-dollar"></i>
                             <p>
                                 Quotes
-                                <?php
-                                if ($num_open_quotes) { ?>
+                                <?php if ($num_open_quotes) { ?>
                                     <span class="right badge text-light"><?php echo $num_open_quotes; ?></span>
                                 <?php } ?>
                             </p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="invoices.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "invoices.php" || basename($_SERVER["PHP_SELF"]) == "invoice.php" || basename($_SERVER["PHP_SELF"]) == "recurring_invoices.php" || basename($_SERVER["PHP_SELF"]) == "recurring_invoice.php") {
-                                                                    echo "active";
-                                                                } ?>">
+                        <a href="invoices.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "invoices.php" || basename($_SERVER["PHP_SELF"]) == "invoice.php" || basename($_SERVER["PHP_SELF"]) == "recurring_invoices.php" || basename($_SERVER["PHP_SELF"]) == "recurring_invoice.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-file-invoice"></i>
                             <p>
                                 Invoices
-                                <?php
-                                if ($num_open_invoices) { ?>
+                                <?php if ($num_open_invoices) { ?>
                                     <span class="right badge text-light"><?php echo $num_open_invoices; ?></span>
                                 <?php } ?>
                             </p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="revenues.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "revenues.php") {
-                                                                    echo "active";
-                                                                } ?>">
+                        <a href="revenues.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "revenues.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-hand-holding-usd"></i>
                             <p>Revenues</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="products.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "products.php") {
-                                                                    echo "active";
-                                                                } ?>">
+                        <a href="products.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "products.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-box-open"></i>
                             <p>Products</p>
                         </a>
                     </li>
-
-                <?php }
-
-                if ($session_user_role == 1 || $session_user_role == 3 && $config_module_enable_accounting == 1) { ?>
-
+                <?php } ?>
+                <?php if ($session_user_role == 1 || ($session_user_role == 3 && $config_module_enable_accounting == 1)) { ?>
                     <li class="nav-header mt-3">FINANCE</li>
                     <li class="nav-item">
-                        <a href="payments.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "payments.php") {
-                                                                    echo "active";
-                                                                } ?>">
+                        <a href="payments.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "payments.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-credit-card"></i>
                             <p>Payments</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="vendors.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "vendors.php") {
-                                                                    echo "active";
-                                                                } ?>">
+                        <a href="vendors.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "vendors.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-building"></i>
                             <p>Vendors</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="expenses.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "expenses.php" || basename($_SERVER["PHP_SELF"]) == "recurring_expenses.php") {
-                                                                    echo "active";
-                                                                } ?>">
+                        <a href="expenses.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "expenses.php" || basename($_SERVER["PHP_SELF"]) == "recurring_expenses.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-shopping-cart"></i>
                             <p>Expenses</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="accounts.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "accounts.php") {
-                                                                    echo "active";
-                                                                } ?>">
+                        <a href="accounts.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "accounts.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-piggy-bank"></i>
                             <p>Accounts</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="transfers.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "transfers.php") {
-                                                                    echo "active";
-                                                                } ?>">
+                        <a href="transfers.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "transfers.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-exchange-alt"></i>
                             <p>Transfers</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="budget.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "budget.php") {
-                                                                    echo "active";
-                                                                } ?>">
+                        <a href="budget.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "budget.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-balance-scale"></i>
                             <p>Budget</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="trips.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "trips.php") {
-                                                                echo "active";
-                                                            } ?>">
+                        <a href="trips.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "trips.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-route"></i>
                             <p>Trips</p>
                         </a>
                     </li>
-
                 <?php } ?>
-
                 <li class="nav-header mt-3">MORE</li>
-
                 <li class="nav-item">
-                    <a href="report_income_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_income_summary.php") {
-                                                                            echo "active";
-                                                                        } ?>">
+                    <a href="report_income_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_income_summary.php") { echo "active"; } ?>">
                         <i class="fas fa-chart-line nav-icon"></i>
                         <p>Reports</p>
                         <i class="fas fa-angle-right nav-icon float-right"></i>
                     </a>
                 </li>
-
                 <?php if ($session_user_role == 3) { ?>
-
                     <li class="nav-item">
                         <a href="admin_users.php" class="nav-link">
                             <i class="nav-icon fas fa-user-shield"></i>
@@ -206,7 +152,6 @@
                             <i class="fas fa-angle-right nav-icon float-right"></i>
                         </a>
                     </li>
-
                     <li class="nav-item">
                         <a href="settings_company.php" class="nav-link">
                             <i class="nav-icon fas fa-cogs"></i>
@@ -214,11 +159,8 @@
                             <i class="fas fa-angle-right nav-icon float-right"></i>
                         </a>
                     </li>
-
                 <?php } ?>
-
             </ul>
-
         </nav>
         <!-- /.sidebar-menu -->
 
@@ -227,4 +169,4 @@
     </div>
     <!-- /.sidebar -->
 
-</aside>
\ No newline at end of file
+</aside>