diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
index a8237ca..4763f1f 100644
--- a/.github/workflows/build-images.yml
+++ b/.github/workflows/build-images.yml
@@ -1,4 +1,3 @@
-
 name: Build Docker image
 on:
   push:
@@ -7,15 +6,20 @@ on:
   pull_request:
     branches:
       - main
+
+concurrency:
+  group: build-images-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2.1.0
 
       - uses: actions/setup-node@v2
         with:
-          node-version: '12.16.2'
+          node-version: "12.16.2"
       - id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4dc99b7..2e54478 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,13 +2,17 @@ name: build
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
+
+concurrency:
+  group: build-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   check-commits:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out repository
         uses: actions/checkout@v2
@@ -20,27 +24,25 @@ jobs:
         uses: wagoid/commitlint-github-action@v2
 
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v2.1.0
-    - uses: actions/setup-node@v2
-      with:
-        node-version: '12.16.2'
-    - id: yarn-cache-dir-path
-      run: echo "::set-output name=dir::$(yarn cache dir)"
-    - uses: actions/cache@v1
-      id: yarn-cache
-      with:
-        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-yarn-
-    - name: install dependencies
-      run: yarn
-    - name: analyse code
-      run: yarn lint
-    - name: build
-      run: yarn build
-
-
+      - uses: actions/checkout@v2.1.0
+      - uses: actions/setup-node@v2
+        with:
+          node-version: "12.16.2"
+      - id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+      - uses: actions/cache@v1
+        id: yarn-cache
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+      - name: install dependencies
+        run: yarn
+      - name: analyse code
+        run: yarn lint
+      - name: build
+        run: yarn build
diff --git a/src/app/menu.ts b/src/app/menu.ts
index e594df2..22e1456 100644
--- a/src/app/menu.ts
+++ b/src/app/menu.ts
@@ -13,9 +13,9 @@
 
 import { useEffect, useState } from 'react'
 import { matchPath, useLocation } from 'react-router'
+import { ClusterUsageView } from '../pages/ClusterUsage'
 import { ClusterUsageCurrentView } from '../pages/ClusterUsageCurrent'
 import { ClusterUsageHistoryView } from '../pages/ClusterUsageHistory'
-import { NamespaceUsageView } from '../pages/NamespaceUsage'
 import { NodeUsageHistoryView } from '../pages/NodeUsageHistory'
 import { NodeUsageRecentOccupationView } from '../pages/NodeUsageRecentOccupation'
 
@@ -52,10 +52,10 @@ export const menus: IMenu[][] = [
     ],
     [
         {
-            to: '/namespaces-usage',
-            primary: 'Namespaces usage',
-            secondary: 'Namespaces Usage',
-            view: NamespaceUsageView
+            to: '/cluster-usage',
+            primary: 'Cluster usage',
+            secondary: 'Cluster Usage',
+            view: ClusterUsageView
         }
     ],
     [
diff --git a/src/pages/NamespaceUsage.tsx b/src/pages/ClusterUsage.tsx
similarity index 99%
rename from src/pages/NamespaceUsage.tsx
rename to src/pages/ClusterUsage.tsx
index dd6bff1..a68938b 100644
--- a/src/pages/NamespaceUsage.tsx
+++ b/src/pages/ClusterUsage.tsx
@@ -60,7 +60,7 @@ const useStyles = makeStyles(theme => ({
     }
 }))
 
-export const NamespaceUsageView = () => {
+export const ClusterUsageView = () => {
     const classes = useStyles()
     const store = useStore()
     const dateRange = useLocalStore(() => ({