diff --git a/dashboards/application/radarr.json b/dashboards/application/radarr.json
index ac0ad4c..1c9cc9d 100644
--- a/dashboards/application/radarr.json
+++ b/dashboards/application/radarr.json
@@ -1,9 +1,24 @@
 {
-  "annotations": {},
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
   "editable": false,
   "fiscalYearStartMonth": 0,
-  "graphTooltip": 1,
-  "id": 2,
+  "graphTooltip": 0,
+  "id": 9,
   "links": [],
   "panels": [
     {
@@ -41,7 +56,7 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 5,
+        "h": 12,
         "w": 4,
         "x": 0,
         "y": 1
@@ -113,8 +128,8 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 5,
-        "w": 7,
+        "h": 12,
+        "w": 4,
         "x": 4,
         "y": 1
       },
@@ -171,80 +186,6 @@
       "title": "Movies",
       "type": "stat"
     },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 6
-      },
-      "id": 12,
-      "panels": [],
-      "title": "Storage",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prometheus"
-      },
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "rgb(255, 255, 255)",
-                "value": null
-              }
-            ]
-          },
-          "unit": "decbytes"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 5,
-        "w": 3,
-        "x": 0,
-        "y": 7
-      },
-      "id": 10,
-      "options": {
-        "colorMode": "value",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "percentChangeColorMode": "standard",
-        "reduceOptions": {
-          "calcs": ["mean"],
-          "fields": "",
-          "values": false
-        },
-        "showPercentChange": false,
-        "textMode": "auto",
-        "wideLayout": true
-      },
-      "pluginVersion": "11.4.0",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prometheus"
-          },
-          "expr": "radarr_movie_filesize_total",
-          "instant": false,
-          "interval": "",
-          "legendFormat": "",
-          "refId": "A"
-        }
-      ],
-      "title": "Storage Used",
-      "type": "stat"
-    },
     {
       "datasource": {
         "type": "prometheus",
@@ -269,10 +210,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 10,
+        "h": 12,
         "w": 8,
-        "x": 3,
-        "y": 7
+        "x": 8,
+        "y": 1
       },
       "id": 4,
       "maxDataPoints": 1,
@@ -311,6 +252,19 @@
       "title": "Episode quality",
       "type": "piechart"
     },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 13
+      },
+      "id": 12,
+      "panels": [],
+      "title": "Storage",
+      "type": "row"
+    },
     {
       "datasource": {
         "type": "prometheus",
@@ -335,9 +289,71 @@
       },
       "gridPos": {
         "h": 5,
-        "w": 3,
+        "w": 8,
         "x": 0,
-        "y": 12
+        "y": 14
+      },
+      "id": 10,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "horizontal",
+        "percentChangeColorMode": "standard",
+        "reduceOptions": {
+          "calcs": ["mean"],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": false,
+        "textMode": "value_and_name",
+        "wideLayout": true
+      },
+      "pluginVersion": "11.4.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "prometheus"
+          },
+          "editorMode": "code",
+          "expr": "radarr_movie_filesize_total",
+          "instant": false,
+          "interval": "",
+          "legendFormat": "{{job}}",
+          "refId": "A"
+        }
+      ],
+      "title": "Storage Used",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "prometheus"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "rgb(255, 255, 255)",
+                "value": null
+              }
+            ]
+          },
+          "unit": "decbytes"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 5,
+        "w": 8,
+        "x": 8,
+        "y": 14
       },
       "id": 13,
       "options": {
@@ -362,10 +378,11 @@
             "type": "prometheus",
             "uid": "prometheus"
           },
-          "expr": "radarr_rootfolder_freespace_bytes",
+          "editorMode": "code",
+          "expr": "radarr_rootfolder_freespace_bytes, radarr_",
           "instant": false,
           "interval": "",
-          "legendFormat": "{{ path }}",
+          "legendFormat": "{{job}}",
           "refId": "A"
         }
       ],
@@ -375,7 +392,7 @@
   ],
   "preload": true,
   "refresh": "",
-  "schemaVersion": 1,
+  "schemaVersion": 40,
   "tags": [],
   "templating": {
     "list": [
@@ -399,6 +416,6 @@
   "timezone": "browser",
   "title": "Radarr",
   "uid": "F2vfZUNGz",
-  "version": 1,
+  "version": 2,
   "weekStart": ""
 }