diff --git a/src/navigation/SideNavigator.tsx b/src/navigation/SideNavigator.tsx
index 88399b0..eac403c 100644
--- a/src/navigation/SideNavigator.tsx
+++ b/src/navigation/SideNavigator.tsx
@@ -174,6 +174,48 @@ export default function SideNavigator(props: Props) {
           </ListItemButton>
         </Tooltip>
         )}
+        {(isMiPCA || user.hasFeature("admin")) && (
+        <Tooltip title="Aviation Map" placement="right">
+          <ListItemButton
+            id="tour-aviation-map"
+            onClick={() => goTo("/aviationMap")}
+            classes={getClasses("/aviationMap")}
+            >
+            <ListItemIcon>
+              <AirportMapIcon />
+            </ListItemIcon>
+            {open && <ListItemText primary="Airport Map" />}
+          </ListItemButton>
+        </Tooltip>
+        )}
+        {(isAdCon || user.hasFeature("admin")) && (
+        <Tooltip title="Construction Map" placement="right">
+          <ListItemButton
+            id="tour-construction-map"
+            onClick={() => goTo("/constructionMap")}
+            classes={getClasses("/constructionMap")}
+            >
+            <ListItemIcon>
+              <FieldsIcon />
+            </ListItemIcon>
+            {open && <ListItemText primary="Construction Map" />}
+          </ListItemButton>
+        </Tooltip>
+        )}
+        {(isAg || user.hasFeature("admin")) && (
+          <Tooltip title="Contracts" placement="right">
+            <ListItemButton
+              id="tour-contracts"
+              onClick={() => goTo("/contracts")}
+              classes={getClasses("/contracts")}
+              >
+              <ListItemIcon>
+                <ContractsIcon />
+              </ListItemIcon>
+              {open && <ListItemText primary="Contracts" />}
+            </ListItemButton>
+          </Tooltip>
+        )}
         {(isAg || user.hasFeature("admin")) && (
         <Tooltip title="Bins" placement="right">
           <ListItemButton
@@ -202,18 +244,34 @@ export default function SideNavigator(props: Props) {
             </ListItemButton>
           </Tooltip>
         )}
-        <Tooltip title="Devices" placement="right">
-          <ListItemButton
-            id="tour-dashboard"
-            onClick={() => goTo("/devices")}
-            classes={getClasses("/device")}
-            >
-            <ListItemIcon>
-              <BindaptIcon />
-            </ListItemIcon>
-            {open && <ListItemText primary="Devices" />}
-          </ListItemButton>
-        </Tooltip>
+        {(user.hasFeature("installer") && isAg || user.hasFeature("admin")) &&
+          <Tooltip title="Cable Estimator" placement="right">
+            <ListItemButton
+              id="tour-cable-estimator"
+              onClick={() => goTo("/cableEstimate")}
+              classes={getClasses("/cableEstimate")}
+              >
+              <ListItemIcon>
+                <CableIcon />
+              </ListItemIcon>
+              {open && <ListItemText primary="Cable Estimator" />}
+            </ListItemButton>
+          </Tooltip>
+        }
+        {(isAg || user.hasFeature("admin")) && (
+          <Tooltip title="Transactions" placement="right">
+            <ListItemButton
+              id="tour-transactions"
+              onClick={() => goTo("/transactions")}
+              classes={getClasses("/transactions")}
+              >
+              <ListItemIcon>
+                <SyncAlt />
+              </ListItemIcon>
+              {open && <ListItemText primary="Transactions" />}
+            </ListItemButton>
+          </Tooltip>
+        )}
         {(isMiVent || user.hasFeature("admin")) && (
           <Tooltip title="Mines" placement="right">
             <ListItemButton
@@ -228,6 +286,46 @@ export default function SideNavigator(props: Props) {
             </ListItemButton>
           </Tooltip>
         )}
+        <Tooltip title="Devices" placement="right">
+          <ListItemButton
+            id="tour-dashboard"
+            onClick={() => goTo("/devices")}
+            classes={getClasses("/device")}
+            >
+            <ListItemIcon>
+              <BindaptIcon />
+            </ListItemIcon>
+            {open && <ListItemText primary="Devices" />}
+          </ListItemButton>
+        </Tooltip>
+        {user.hasFeature("admin") &&
+          <Tooltip title="Firmware" placement="right">
+            <ListItemButton
+              id="tour-firmware"
+              onClick={() => goTo("/firmware")}
+              classes={getClasses("/firmware")}
+              >
+              <ListItemIcon>
+                <Memory />
+              </ListItemIcon>
+              {open && <ListItemText primary="Logs" />}
+            </ListItemButton>
+          </Tooltip>
+        }
+        {user.hasFeature("admin") &&
+          <Tooltip title="Logs" placement="right">
+            <ListItemButton
+              id="tour-logs"
+              onClick={() => goTo("/logs")}
+              classes={getClasses("/logs")}
+              >
+              <ListItemIcon>
+                <DataDuckIcon />
+              </ListItemIcon>
+              {open && <ListItemText primary="Logs" />}
+            </ListItemButton>
+          </Tooltip>
+        }
         <Tooltip title="Teams" placement="right">
           <ListItemButton
             id="tour-dashboard"
@@ -266,34 +364,7 @@ export default function SideNavigator(props: Props) {
           </ListItemButton>
         </Tooltip>
         )}
-        {(isMiPCA || user.hasFeature("admin")) && (
-        <Tooltip title="Aviation Map" placement="right">
-          <ListItemButton
-            id="tour-aviation-map"
-            onClick={() => goTo("/aviationMap")}
-            classes={getClasses("/aviationMap")}
-            >
-            <ListItemIcon>
-              <AirportMapIcon />
-            </ListItemIcon>
-            {open && <ListItemText primary="Airport Map" />}
-          </ListItemButton>
-        </Tooltip>
-        )}
-        {(isAdCon || user.hasFeature("admin")) && (
-        <Tooltip title="Construction Map" placement="right">
-          <ListItemButton
-            id="tour-construction-map"
-            onClick={() => goTo("/constructionMap")}
-            classes={getClasses("/constructionMap")}
-            >
-            <ListItemIcon>
-              <FieldsIcon />
-            </ListItemIcon>
-            {open && <ListItemText primary="Construction Map" />}
-          </ListItemButton>
-        </Tooltip>
-        )}
+
         {(isAdCon || user.hasFeature("admin")) && (
         <Tooltip title="Jobsites" placement="right">
           <ListItemButton
@@ -334,48 +405,7 @@ export default function SideNavigator(props: Props) {
             {open && <ListItemText primary="Tasks" />}
           </ListItemButton>
         </Tooltip>
-        {(isAg || user.hasFeature("admin")) && (
-          <Tooltip title="Transactions" placement="right">
-            <ListItemButton
-              id="tour-transactions"
-              onClick={() => goTo("/transactions")}
-              classes={getClasses("/transactions")}
-              >
-              <ListItemIcon>
-                <SyncAlt />
-              </ListItemIcon>
-              {open && <ListItemText primary="Transactions" />}
-            </ListItemButton>
-          </Tooltip>
-        )}
-        {(isAg || user.hasFeature("admin")) && (
-          <Tooltip title="Contracts" placement="right">
-            <ListItemButton
-              id="tour-contracts"
-              onClick={() => goTo("/contracts")}
-              classes={getClasses("/contracts")}
-              >
-              <ListItemIcon>
-                <ContractsIcon />
-              </ListItemIcon>
-              {open && <ListItemText primary="Contracts" />}
-            </ListItemButton>
-          </Tooltip>
-        )}
-        {(user.hasFeature("installer") && isAg || user.hasFeature("admin")) &&
-          <Tooltip title="Cable Estimator" placement="right">
-            <ListItemButton
-              id="tour-cable-estimator"
-              onClick={() => goTo("/cableEstimate")}
-              classes={getClasses("/cableEstimate")}
-              >
-              <ListItemIcon>
-                <CableIcon />
-              </ListItemIcon>
-              {open && <ListItemText primary="Cable Estimator" />}
-            </ListItemButton>
-          </Tooltip>
-        }
+
         {user.hasFeature("developer") &&
           <Tooltip title="API documentation" placement="right">
             <ListItemButton
@@ -390,34 +420,6 @@ export default function SideNavigator(props: Props) {
             </ListItemButton>
           </Tooltip>
         }
-        {user.hasFeature("admin") &&
-          <Tooltip title="Firmware" placement="right">
-            <ListItemButton
-              id="tour-firmware"
-              onClick={() => goTo("/firmware")}
-              classes={getClasses("/firmware")}
-              >
-              <ListItemIcon>
-                <Memory />
-              </ListItemIcon>
-              {open && <ListItemText primary="Logs" />}
-            </ListItemButton>
-          </Tooltip>
-        }
-        {user.hasFeature("admin") &&
-          <Tooltip title="Logs" placement="right">
-            <ListItemButton
-              id="tour-logs"
-              onClick={() => goTo("/logs")}
-              classes={getClasses("/logs")}
-              >
-              <ListItemIcon>
-                <DataDuckIcon />
-              </ListItemIcon>
-              {open && <ListItemText primary="Logs" />}
-            </ListItemButton>
-          </Tooltip>
-        }
         {user.hasFeature("admin") && window.NDEFReader &&
           <Tooltip title="NFC" placement="right">
             <ListItemButton