diff --git a/classes/Pod.ts b/classes/Pod.ts
index 8fa249e..c13e1ff 100644
--- a/classes/Pod.ts
+++ b/classes/Pod.ts
@@ -5,11 +5,12 @@ import type { HasMetadata } from "./repo/ResourceRepo";
 
 export class Pod implements HasMetadata
 {
-    status?: Status
+
 
     constructor (
         public metadata: Metadata,
-        public spec: Spec
+        public spec: Spec,
+        public status: Status
     ) { }
 }
 
@@ -24,6 +25,10 @@ class Spec {
 class Status
 {
     phase?: PodStatus
+
+    constructor(
+        public containerStatuses: ContainerStatus[]
+    ) {}
 }
 
 export class Container 
@@ -34,6 +39,13 @@ export class Container
     ) {}
 }
 
+export class ContainerStatus
+{
+    constructor(
+        public restartCount: number
+    ) {}
+}
+
 enum PodStatus 
 {
     RUNNING = "Running",
diff --git a/components/NamespaceComponent.vue b/components/NamespaceComponent.vue
index 03bcaca..2ba6c91 100644
--- a/components/NamespaceComponent.vue
+++ b/components/NamespaceComponent.vue
@@ -2,9 +2,6 @@
     <div>
         <p class="grid-element">{{ namespace.metadata.name }}</p>
         <p class="grid-element">{{ calcAge(namespace.metadata.creationTimestamp) }}</p>
-        <div class="grid-element">
-            <ActionButton>delete</ActionButton>
-        </div>
     </div>
 </template>
 
diff --git a/components/PersistentVolumeClaimComponent.vue b/components/PersistentVolumeClaimComponent.vue
index d3e16a8..032d669 100644
--- a/components/PersistentVolumeClaimComponent.vue
+++ b/components/PersistentVolumeClaimComponent.vue
@@ -5,9 +5,6 @@
         <p class="grid-element">{{ calcAge(persistentVolumeClaim.metadata.creationTimestamp) }}</p>
         <p class="grid-element">{{ persistentVolumeClaim.spec.storageClassName }}</p>
         <p class="grid-element">{{ persistentVolumeClaim.spec.accessModes.map(mode => mapAccessMode(mode)).join(", ") }}</p>
-        <div class="grid-element">
-            <ActionButton>delete</ActionButton>
-        </div>
     </div>
 </template>
 
diff --git a/components/PersistentVolumeComponent.vue b/components/PersistentVolumeComponent.vue
index 38c7b90..8922e11 100644
--- a/components/PersistentVolumeComponent.vue
+++ b/components/PersistentVolumeComponent.vue
@@ -2,9 +2,6 @@
     <div>
         <p class="grid-element">{{ persistentVolume.metadata.name }}</p>
         <p class="grid-element">{{ calcAge(persistentVolume.metadata.creationTimestamp) }}</p>
-        <div class="grid-element">
-            <ActionButton>delete</ActionButton>
-        </div>
     </div>
 </template>
 
diff --git a/components/configmap/ConfigMapComponent.vue b/components/configmap/ConfigMapComponent.vue
index e8e7ac3..49fb8f5 100644
--- a/components/configmap/ConfigMapComponent.vue
+++ b/components/configmap/ConfigMapComponent.vue
@@ -4,9 +4,6 @@
         <p class="grid-element">{{ configMap.metadata.namespace }}</p>
         <p class="grid-element">{{ calcAge(configMap.metadata.creationTimestamp) }}</p>
         <p class="grid-element"><span v-if="configMap.data">{{ Object.keys(configMap.data).length }}</span><span v-else>-</span></p>
-        <div class="grid-element">
-            <ActionButton>delete</ActionButton>
-        </div>
         <ConfigmapViewComponent v-if="show" :config-map="configMap" @close="show = false"></ConfigmapViewComponent>
     </div>
 </template>
diff --git a/components/deployment/DeploymentComponent.vue b/components/deployment/DeploymentComponent.vue
index 4f5d01f..4479f01 100644
--- a/components/deployment/DeploymentComponent.vue
+++ b/components/deployment/DeploymentComponent.vue
@@ -5,7 +5,6 @@
         <p class="grid-element">{{ calcAge(deployment.metadata.creationTimestamp) }}</p>
         <p class="grid-element">{{ deployment.spec.replicas }}</p>
         <div class="grid-element action-buttons">
-            <ActionButton>delete</ActionButton>
             <ActionButton>autorenew</ActionButton>
             <ActionButton @click="() => rescaleDeploymentPopup.open()">height</ActionButton>
         </div>
diff --git a/components/ingress/IngressComponent.vue b/components/ingress/IngressComponent.vue
index fb5cff0..29c077e 100644
--- a/components/ingress/IngressComponent.vue
+++ b/components/ingress/IngressComponent.vue
@@ -5,9 +5,6 @@
         <p class="grid-element">{{ calcAge(ingress.metadata.creationTimestamp) }}</p>
         <p class="grid-element">{{ ingress.spec.ingressClassName }}</p>
         <p class="grid-element">{{ ingress.spec.rules.length }}</p>
-        <div class="grid-element action-buttons">
-            <ActionButton>delete</ActionButton>
-        </div>
         <IngressViewPopup v-if="showViewPopup" :ingress="ingress" ref="viewIngressPopup" @close="showViewPopup = false"></IngressViewPopup>
     </div>
 </template>
diff --git a/components/inspect/resources/ConfigMapList.vue b/components/inspect/resources/ConfigMapList.vue
index c250bee..a2aec56 100644
--- a/components/inspect/resources/ConfigMapList.vue
+++ b/components/inspect/resources/ConfigMapList.vue
@@ -6,7 +6,6 @@
                 <p>Namespace</p>
                 <p>Age</p>
                 <p>Entries</p>
-                <p>Actions</p>
             </div>
             <ConfigMapComponent v-for="(configMap, index) in configMaps" :config-map="configMap" class="resource" :class="{ even: index % 2 }"></ConfigMapComponent>
         </div>
@@ -30,6 +29,6 @@ onUnmounted(() => {
 <style scoped>
 .config-map-container {
     display: grid;
-    grid-template-columns: auto auto auto 1fr auto;
+    grid-template-columns: auto auto auto 1fr;
 }
 </style>
\ No newline at end of file
diff --git a/components/inspect/resources/CustomResourceDefinitionList.vue b/components/inspect/resources/CustomResourceDefinitionList.vue
index 9f4273e..5da6f1d 100644
--- a/components/inspect/resources/CustomResourceDefinitionList.vue
+++ b/components/inspect/resources/CustomResourceDefinitionList.vue
@@ -1,5 +1,5 @@
 <template>
-    <TableComponent :loading="customResourceDefinitions == null">
+    <TableComponent :loading="customResourceDefinitions == null" v-for="customResourceDefinitions in [repo.get().value]">
         <div class="resource-container crd-container">
             <div class="header">
                 <p>Name</p>
@@ -14,10 +14,16 @@
 </template>
 
 <script setup lang="ts">
-import type { CustomResourceDefinition } from '~/classes/CustomResourceDefinition';
 import { ResourceRepo } from '~/classes/repo/ResourceRepo';
+import type {CustomResourceDefinition} from "~/classes/CustomResourceDefinition";
 
-const customResourceDefinitions = ResourceRepo.init<CustomResourceDefinition>().load('custom-resource-definitions').get();
+const repo = ResourceRepo.init<CustomResourceDefinition>();
+onMounted(() => {
+    repo.listen("custom-resource-definitions");
+});
+onUnmounted(() => {
+    repo.clear();
+});
 </script>
 
 <style scoped>
diff --git a/components/inspect/resources/IngressList.vue b/components/inspect/resources/IngressList.vue
index b2c96ee..025fcf8 100644
--- a/components/inspect/resources/IngressList.vue
+++ b/components/inspect/resources/IngressList.vue
@@ -7,7 +7,6 @@
             <p>Age</p>
             <p>Ingress Class Name</p>
             <p>Rules</p>
-            <p>Actions</p>
         </div>
         <IngressComponent :ingress="ingress" v-for="(ingress, index) in ingresses" class="resource" :class="{ even: index % 2 }"></IngressComponent>
     </div>
@@ -29,6 +28,6 @@ onUnmounted(() => {
 
 <style scoped>
 .ingress-container {
-    grid-template-columns: auto auto auto auto 1fr auto;
+    grid-template-columns: auto auto auto auto 1fr;
 }
 </style>
\ No newline at end of file
diff --git a/components/inspect/resources/NamespaceList.vue b/components/inspect/resources/NamespaceList.vue
index b48a3ab..a9bcdb2 100644
--- a/components/inspect/resources/NamespaceList.vue
+++ b/components/inspect/resources/NamespaceList.vue
@@ -4,7 +4,6 @@
         <div class="header">
             <p>Name</p>
             <p>Age</p>
-            <p>Actions</p>
         </div>
         <NamespaceComponent :namespace="namespace" v-for="(namespace, index) in namespaces" class="resource" :class="{ even: index % 2 }"></NamespaceComponent>
     </div>
@@ -27,6 +26,6 @@ onUnmounted(() => {
 
 <style scoped>
 .namespace-container {
-    grid-template-columns: auto 1fr auto;
+    grid-template-columns: auto 1fr;
 }
 </style>
\ No newline at end of file
diff --git a/components/inspect/resources/PersistentVolumeClaimList.vue b/components/inspect/resources/PersistentVolumeClaimList.vue
index 5cde413..3138f21 100644
--- a/components/inspect/resources/PersistentVolumeClaimList.vue
+++ b/components/inspect/resources/PersistentVolumeClaimList.vue
@@ -7,7 +7,6 @@
                 <p>Age</p>
                 <p>Storage Class</p>
                 <p>Access Modes</p>
-                <p>Actions</p>
             </div>
             <PersistentVolumeClaimComponent v-for="(persistentVolumeClaim, index) in persistentVolumeClaims" :persistent-volume-claim="persistentVolumeClaim" class="resource" :class="{ even: index % 2 }"></PersistentVolumeClaimComponent>
         </div>
@@ -32,6 +31,6 @@ onUnmounted(() => {
 <style scoped>
 .persistent-volume-claim-container {
     display: grid;
-    grid-template-columns: auto auto auto auto 1fr auto;
+    grid-template-columns: auto auto auto auto 1fr;
 }
 </style>
\ No newline at end of file
diff --git a/components/inspect/resources/PersistentVolumeList.vue b/components/inspect/resources/PersistentVolumeList.vue
index 30c7336..670420d 100644
--- a/components/inspect/resources/PersistentVolumeList.vue
+++ b/components/inspect/resources/PersistentVolumeList.vue
@@ -4,7 +4,6 @@
             <div class="header">
                 <p>Name</p>
                 <p>Age</p>
-                <p>Actions</p>
             </div>
             <PersistentVolumeComponent v-for="(persistentVolume, index) in persistentVolumes" :persistent-volume="persistentVolume" class="resource" :class="{ even: index % 2 }"></PersistentVolumeComponent>
         </div>
@@ -29,6 +28,6 @@ onUnmounted(() => {
 <style scoped>
 .persistent-volume-container {
     display: grid;
-    grid-template-columns: auto 1fr auto;
+    grid-template-columns: auto 1fr;
 }
 </style>
\ No newline at end of file
diff --git a/components/inspect/resources/PodList.vue b/components/inspect/resources/PodList.vue
index 13bfa90..98537a3 100644
--- a/components/inspect/resources/PodList.vue
+++ b/components/inspect/resources/PodList.vue
@@ -7,6 +7,7 @@
                 <p>Age</p>
                 <p>Node</p>
                 <p>Containers</p>
+                <p>Restarts</p>
                 <p>Status</p>
                 <p>Actions</p>
             </div>
@@ -32,6 +33,6 @@ onUnmounted(() => {
 <style scoped>
 .pod-container {
     display: grid;
-    grid-template-columns: auto 1fr 1fr 1fr 1fr auto auto;
+    grid-template-columns: auto auto auto auto auto 1fr auto auto;
 }
 </style>
\ No newline at end of file
diff --git a/components/inspect/resources/SecretList.vue b/components/inspect/resources/SecretList.vue
index 65f8be2..738f97a 100644
--- a/components/inspect/resources/SecretList.vue
+++ b/components/inspect/resources/SecretList.vue
@@ -10,7 +10,6 @@
                 <p>Age</p>
                 <p>Type</p>
                 <p>Entries</p>
-                <p>Actions</p>
             </div>
             <SecretComponent v-for="(secret, index) in secrets" :secret="secret" class="resource" :class="{ even: index % 2 }"></SecretComponent>
         </div>
@@ -37,6 +36,6 @@ const secretAddComponent = ref();
 <style scoped>
 .secret-container {
     display: grid;
-    grid-template-columns: auto auto auto auto 1fr auto;
+    grid-template-columns: auto auto auto auto 1fr;
 }
 </style>
\ No newline at end of file
diff --git a/components/inspect/resources/ServiceList.vue b/components/inspect/resources/ServiceList.vue
index c78e7a7..d49f0cd 100644
--- a/components/inspect/resources/ServiceList.vue
+++ b/components/inspect/resources/ServiceList.vue
@@ -6,7 +6,6 @@
                 <p>Namespace</p>
                 <p>Age</p>
                 <p>Type</p>
-                <p>Actions</p>
             </div>
             <ServiceComponent :service="service" v-for="(service, index) in services" class="resource" :class="{ even: index % 2 }"></ServiceComponent>
         </div>
@@ -28,6 +27,6 @@ onUnmounted(() => {
 
 <style>
 .service-container {
-    grid-template-columns: auto auto auto 1fr auto;
+    grid-template-columns: auto auto auto 1fr;
 }
 </style>
\ No newline at end of file
diff --git a/components/pod/PodComponent.vue b/components/pod/PodComponent.vue
index cf69e23..9a0db05 100644
--- a/components/pod/PodComponent.vue
+++ b/components/pod/PodComponent.vue
@@ -5,12 +5,12 @@
         <p class="grid-element no-wrap" v-if="pod.metadata">{{ calcAge(pod.metadata.creationTimestamp) }}</p>
         <p class="grid-element" v-if="pod.spec">{{ pod.spec.nodeName }}</p>
         <p class="grid-element">{{ pod.spec.containers.length }}</p>
+        <p class="grid-element">{{ pod.status.containerStatuses.map(s => s.restartCount).reduce((total, value) => total = total + value) }}</p>
         <div class="grid-element">
             <PhaseComponent v-if="pod.status" :phase="pod.status.phase"></PhaseComponent>
         </div>
         <div class="grid-element action-buttons">
             <ActionButton @click="showLogPopup = true">text_snippet</ActionButton>
-            <ActionButton>open_in_full</ActionButton>
             <ActionButton @click="showDeletePopup = true">delete</ActionButton>
         </div>
         <PodDeletePopup v-if="showDeletePopup" :pod="pod" @close="showDeletePopup = false"></PodDeletePopup>
@@ -24,7 +24,7 @@ import type { Pod } from '~/classes/Pod';
 import { calcAge } from '~/classes/Pod';
 import PodDeletePopup from './view/PodDeletePopup.vue';
 
-const props = defineProps<{
+defineProps<{
     pod: Pod
 }>();
 
diff --git a/components/pod/env/EnvVar.ts b/components/pod/env/EnvVar.ts
index 7570598..9f3db35 100644
--- a/components/pod/env/EnvVar.ts
+++ b/components/pod/env/EnvVar.ts
@@ -10,7 +10,11 @@ export class EnvVar
     static get(namespace: string, name: string, containerName: string, onSuccess: (envVars: EnvVar[]) => void, onError: () => void)
     {
         const url = StringUtils.format('%s/pods/%s/%s/%s/env', ApiConfig.getHttpBase(), namespace, name, containerName);
-        axios.get<EnvVar[]>(url)
+        axios.get<EnvVar[]>(url, {
+            headers: {
+                Authorization: "Bearer " + requireToken()
+            }
+        })
         .then((response) => {
             onSuccess(response.data);
         })
diff --git a/components/secrets/SecretComponent.vue b/components/secrets/SecretComponent.vue
index 06ba5b2..1787dbe 100644
--- a/components/secrets/SecretComponent.vue
+++ b/components/secrets/SecretComponent.vue
@@ -5,10 +5,6 @@
     <p class="grid-element">{{ calcAge(secret.metadata.creationTimestamp) }}</p>
     <p class="grid-element">{{ secret.type }}</p>
     <p class="grid-element"><span v-if="secret.data">{{ Object.keys(secret.data).length }}</span><span v-else>-</span></p>
-    <div class="grid-element action-buttons">
-        <ActionButton>edit</ActionButton>
-        <ActionButton>delete</ActionButton>
-    </div>
     <SecretViewPopup :secret="secret" v-if="showViewPopup" @close="() => showViewPopup = false"></SecretViewPopup>
   </div>
 </template>
diff --git a/components/service/ServiceComponent.vue b/components/service/ServiceComponent.vue
index 6c68eca..11b6246 100644
--- a/components/service/ServiceComponent.vue
+++ b/components/service/ServiceComponent.vue
@@ -4,9 +4,6 @@
         <p class="grid-element">{{ service.metadata.namespace }}</p>
         <p class="grid-element">{{ calcAge(service.metadata.creationTimestamp) }}</p>
         <p class="grid-element" v-if="service.spec">{{ service.spec.type }}</p>
-        <div class="grid-element">
-            <ActionButton>delete</ActionButton>
-        </div>
     </div>
 </template>