diff --git a/netmanager/src/App.js b/netmanager/src/App.js
index 2eab866ace..7eec5ebbd8 100644
--- a/netmanager/src/App.js
+++ b/netmanager/src/App.js
@@ -47,6 +47,25 @@ if (localStorage.jwtToken) {
 }
 
 const App = () => {
+  // disabling feature
+  useEffect(() => {
+    if (process.env.REACT_APP_ALLOW_DEV_TOOLS === 'staging') {
+      return;
+    } else {
+      // Disable context menu (right click)
+      document.addEventListener('contextmenu', (e) => {
+        e.preventDefault();
+      });
+
+      // Disable F12 key (open developer tools)
+      document.addEventListener('keydown', (e) => {
+        if (e.keyCode === 123) {
+          e.preventDefault();
+        }
+      });
+    }
+  }, []);
+
   return (
     <Provider store={store}>
       <ThemeProvider theme={theme}>
diff --git a/netmanager/src/views/pages/CohortsRegistry/CohortDetails.jsx b/netmanager/src/views/pages/CohortsRegistry/CohortDetails.jsx
index 67349f0b92..4bd14d1b5c 100644
--- a/netmanager/src/views/pages/CohortsRegistry/CohortDetails.jsx
+++ b/netmanager/src/views/pages/CohortsRegistry/CohortDetails.jsx
@@ -186,7 +186,7 @@ const CohortForm = ({ cohort }) => {
   const initialState = {
     name: '',
     network: activeNetwork.net_name,
-    visibility: false
+    visibility: null
   };
   const [form, setState] = useState(initialState);
   const [loading, setLoading] = useState(false);
diff --git a/netmanager/src/views/pages/Dashboard/components/AveragesChart.js b/netmanager/src/views/pages/Dashboard/components/AveragesChart.js
index 08d5495e51..b9b9e2f8a8 100644
--- a/netmanager/src/views/pages/Dashboard/components/AveragesChart.js
+++ b/netmanager/src/views/pages/Dashboard/components/AveragesChart.js
@@ -314,7 +314,7 @@ const AveragesChart = ({ classes, analyticsSites, isGrids, isCohorts, analyticsD
           categoryPercentage: numLocations > 0 ? 1 / numLocations : 0.5,
           ticks: {
             fontColor: 'black',
-            callback: (value) => `${value.substr(0, 7)}`
+            callback: (value) => `${value.substr(0, 11)}`
           },
           gridLines: {
             display: false,
@@ -322,7 +322,7 @@ const AveragesChart = ({ classes, analyticsSites, isGrids, isCohorts, analyticsD
           },
           scaleLabel: {
             display: true,
-            labelString: 'Locations'
+            labelString: isCohorts ? 'Devices' : 'Locations'
           }
         }
       ],
@@ -684,7 +684,7 @@ const AveragesChart = ({ classes, analyticsSites, isGrids, isCohorts, analyticsD
               border: 'none'
             }}
           >
-            View all Locations <ArrowForwardIcon />
+            View all {isCohorts ? 'Devices' : 'Locations'} <ArrowForwardIcon />
           </Button>
         </CardActions>
       </Card>
diff --git a/netmanager/src/views/pages/Dashboard/components/ExceedancesChart/ExceedancesChart.js b/netmanager/src/views/pages/Dashboard/components/ExceedancesChart/ExceedancesChart.js
index aea324a07c..684f9ad86f 100644
--- a/netmanager/src/views/pages/Dashboard/components/ExceedancesChart/ExceedancesChart.js
+++ b/netmanager/src/views/pages/Dashboard/components/ExceedancesChart/ExceedancesChart.js
@@ -682,7 +682,7 @@ const ExceedancesChart = (props) => {
                           stacked: true,
                           scaleLabel: {
                             display: true,
-                            labelString: 'Locations',
+                            labelString: isCohorts ? 'Devices' : 'Locations',
                             // fontWeight: 4,
                             // fontColor: "black",
                             fontSize: 15,
@@ -690,7 +690,7 @@ const ExceedancesChart = (props) => {
                           },
                           ticks: {
                             fontColor: 'black',
-                            callback: (value) => `${value.substr(0, 7)}`
+                            callback: (value) => `${value.substr(0, 11)}`
                           },
                           gridLines: {
                             display: false,