diff --git a/app/javascript/components/insights-sub-report/container.unit.test.js b/app/javascript/components/insights-sub-report/container.unit.test.js
deleted file mode 100644
index da6b37d829..0000000000
--- a/app/javascript/components/insights-sub-report/container.unit.test.js
+++ /dev/null
@@ -1,161 +0,0 @@
-import { Route } from "react-router-dom";
-import { fromJS } from "immutable";
-
-import { setupMountedComponent } from "../../test";
-import TableValues from "../charts/table-values";
-
-import InsightsSubReport from "./container";
-
-describe("<InsightsSubReport />", () => {
-  let component;
-  const initialState = fromJS({
-    records: {
-      insights: {
-        selectedReport: {
-          id: "violations",
-          name: "managed_reports.violations.name",
-          description: "managed_reports.violations.description",
-          module_id: "primeromodule-mrm",
-          subreports: ["killing", "maiming"],
-          report_data: {
-            killing: {
-              data: {
-                violation: [
-                  {
-                    group_id: "2022-Q2",
-                    data: [
-                      {
-                        id: "boys",
-                        total: 2
-                      },
-                      {
-                        id: "girls",
-                        total: 2
-                      },
-                      {
-                        id: "total",
-                        total: 5
-                      }
-                    ]
-                  }
-                ],
-                perpetrators: [
-                  {
-                    group_id: "2022-Q2",
-                    data: [
-                      {
-                        id: "armed_force_1",
-                        boys: 1,
-                        total: 2,
-                        unknown: 1
-                      }
-                    ]
-                  }
-                ]
-              },
-              metadata: {
-                display_graph: true,
-                lookups: {
-                  perpetrators: "lookup-armed-force-group-or-other-party",
-                  violation: "lookup-violation-tally-options"
-                },
-                table_type: "default",
-                order: ["violation", "perpetrators"]
-              }
-            }
-          }
-        },
-        filters: {
-          grouped_by: "quarter",
-          date_range: "this_quarter",
-          date: "incident_date",
-          subreport: "detention"
-        },
-        loading: false,
-        errors: false
-      }
-    },
-    forms: {
-      options: {
-        lookups: [
-          {
-            id: 1,
-            unique_id: "lookup-violation-tally-options",
-            name: {
-              en: "Violation Tally Options"
-            },
-            values: [
-              {
-                id: "boys",
-                display_text: {
-                  en: "Boys"
-                }
-              },
-              {
-                id: "girls",
-                display_text: {
-                  en: "Girls"
-                }
-              },
-              {
-                id: "total",
-                display_text: {
-                  en: "Total"
-                }
-              }
-            ]
-          },
-          {
-            id: 2,
-            unique_id: "lookup-armed-force-group-or-other-party",
-            name: {
-              en: "Violation Tally Options"
-            },
-            values: [
-              {
-                id: "armed_force_1",
-                display_text: {
-                  en: "Armed Force 1"
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  });
-
-  beforeEach(() => {
-    const routedComponent = initialProps => {
-      return (
-        <Route
-          path="/insights/:moduleID/:id/:subReport"
-          component={propsRoute => <InsightsSubReport {...{ ...propsRoute, ...initialProps }} />}
-        />
-      );
-    };
-
-    ({ component } = setupMountedComponent(routedComponent, {}, initialState, [
-      "/insights/primeromodule-mrm/violations/killing"
-    ]));
-  });
-
-  it("should render <InsightsSubReport /> component", () => {
-    expect(component.find(InsightsSubReport)).to.have.lengthOf(1);
-  });
-
-  it("should render <h2 /> component", () => {
-    const title = component.find(InsightsSubReport).find("h2");
-
-    expect(title).to.have.lengthOf(1);
-    expect(title.text()).to.be.equal("managed_reports.violations.description");
-  });
-
-  it("should render <TableValues /> component", () => {
-    expect(component.find(TableValues)).to.have.lengthOf(2);
-  });
-
-  it("should render <h3 /> component", () => {
-    expect(component.find("h3")).to.have.lengthOf(2);
-  });
-});
diff --git a/app/javascript/components/nav/component.jsx b/app/javascript/components/nav/component.jsx
index cb1585201b..7feba9f132 100644
--- a/app/javascript/components/nav/component.jsx
+++ b/app/javascript/components/nav/component.jsx
@@ -116,12 +116,16 @@ const Nav = () => {
           <Divider />
         </Hidden>
       </div>
-      <NetworkIndicator />
+      <div className={css.navNetworkIndicator}>
+        <NetworkIndicator />
+      </div>
       <List className={css.navList}>{permittedMenuEntries(APPLICATION_NAV(permissions, userId))}</List>
       <div className={css.navAgencies}>
         <AgencyLogo />
       </div>
-      <TranslationsToggle />
+      <div className={css.navTranslationsToggle}>
+        <TranslationsToggle />
+      </div>
     </>
   );
 
diff --git a/app/javascript/components/nav/styles.css b/app/javascript/components/nav/styles.css
index 1f8418f5b3..3352565b5b 100644
--- a/app/javascript/components/nav/styles.css
+++ b/app/javascript/components/nav/styles.css
@@ -158,10 +158,26 @@
 
 @media (min-width:960px) and (max-width:1279.95px) {
   .drawerPaper, .drawerPaper-demo {
-    width: 3.8em;
+    width: 4.1em;
     overflow-x: hidden;
   }
 
+  .drawerPaper::-webkit-scrollbar,
+  .drawerPaper-demo::-webkit-scrollbar {
+    width: 0.4em
+  }
+
+  .drawerPaper::-webkit-scrollbar-track,
+  .drawerPaper-demo::-webkit-scrollbar-track {
+    -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.00);
+  }
+
+  .drawerPaper::-webkit-scrollbar-thumb,
+  .drawerPaper-demo::-webkit-scrollbar-thumb {
+    background-color: grey;
+    outline: 1px solid grey;
+  }
+
   .listIcon {
     min-width: 5.5em;
   }
@@ -170,3 +186,42 @@
     display: none;
   }
 }
+
+@media (max-width:1279.95px),
+  only screen and (pointer: coarse) and (max-width:1279.95px) {
+  .navNetworkIndicator {
+    & div {
+      margin: 0 7px 0 8px;
+      padding: 4px 8px 4px 6px;
+    }
+  }
+  .navTranslationsToggle {
+    & button {
+      padding-left: 8px;
+    }
+  }
+}
+
+@media only screen and (pointer: fine) and (max-width:1279.95px) {
+  .navNetworkIndicator {
+    & div {
+      margin: 0 3px 0 5px;
+      padding: 4px 8px 4px 5px;
+    }
+  }
+}
+
+@media (pointer: fine) and (max-width:1279.95px) {
+  .navNetworkIndicator {
+    & div {
+      margin: 0 10px 0 10px;
+      padding: 4px 8px 4px 6px;
+    }
+  }
+  .navTranslationsToggle {
+    & button {
+      padding-left: 8px;
+    }
+  }
+}
+
diff --git a/buildspec.yml b/buildspec.yml
index 84e1ce5c51..bf47703c12 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -14,6 +14,7 @@ env:
     SECRET_VARS_release_2_4: 'PrimeroCicdSecretrelease-2-4'
     SECRET_VARS_release_2_5: 'PrimeroCicdSecretrelease-2-5'
     SECRET_VARS_release_2_6: 'PrimeroCicdSecretrelease-2-6'
+    SECRET_VARS_release_2_7: 'PrimeroCicdSecretrelease-2-7'
 
 phases:
   pre_build: