diff --git a/dashboard/package-lock.json b/dashboard/package-lock.json
index fa77e88..798d1d4 100644
--- a/dashboard/package-lock.json
+++ b/dashboard/package-lock.json
@@ -12,6 +12,7 @@
         "@syncfusion/ej2-react-calendars": "^30.1.37",
         "@syncfusion/ej2-react-grids": "^30.1.37",
         "@syncfusion/ej2-react-kanban": "^30.1.37",
+        "@syncfusion/ej2-react-popups": "^30.1.37",
         "@syncfusion/ej2-react-schedule": "^30.1.37",
         "cldr-data": "^36.0.4",
         "lucide-react": "^0.522.0",
@@ -456,278 +457,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.5.tgz",
-      "integrity": "sha512-9o3TMmpmftaCMepOdA5k/yDw8SfInyzWWTjYTFCX3kPSDJMROQTb8jg+h9Cnwnmm1vOzvxN7gIfB5V2ewpjtGA==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.5.tgz",
-      "integrity": "sha512-AdJKSPeEHgi7/ZhuIPtcQKr5RQdo6OO2IL87JkianiMYMPbCtot9fxPbrMiBADOWWm3T2si9stAiVsGbTQFkbA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.5.tgz",
-      "integrity": "sha512-VGzGhj4lJO+TVGV1v8ntCZWJktV7SGCs3Pn1GRWI1SBFtRALoomm8k5E9Pmwg3HOAal2VDc2F9+PM/rEY6oIDg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.5.tgz",
-      "integrity": "sha512-D2GyJT1kjvO//drbRT3Hib9XPwQeWd9vZoBJn+bu/lVsOZ13cqNdDeqIF/xQ5/VmWvMduP6AmXvylO/PIc2isw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.5.tgz",
-      "integrity": "sha512-GtaBgammVvdF7aPIgH2jxMDdivezgFu6iKpmT+48+F8Hhg5J/sfnDieg0aeG/jfSvkYQU2/pceFPDKlqZzwnfQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.5.tgz",
-      "integrity": "sha512-1iT4FVL0dJ76/q1wd7XDsXrSW+oLoquptvh4CLR4kITDtqi2e/xwXwdCVH8hVHU43wgJdsq7Gxuzcs6Iq/7bxQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.5.tgz",
-      "integrity": "sha512-nk4tGP3JThz4La38Uy/gzyXtpkPW8zSAmoUhK9xKKXdBCzKODMc2adkB2+8om9BDYugz+uGV7sLmpTYzvmz6Sw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.5.tgz",
-      "integrity": "sha512-PrikaNjiXdR2laW6OIjlbeuCPrPaAl0IwPIaRv+SMV8CiM8i2LqVUHFC1+8eORgWyY7yhQY+2U2fA55mBzReaw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.5.tgz",
-      "integrity": "sha512-cPzojwW2okgh7ZlRpcBEtsX7WBuqbLrNXqLU89GxWbNt6uIg78ET82qifUy3W6OVww6ZWobWub5oqZOVtwolfw==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.5.tgz",
-      "integrity": "sha512-Z9kfb1v6ZlGbWj8EJk9T6czVEjjq2ntSYLY2cw6pAZl4oKtfgQuS4HOq41M/BcoLPzrUbNd+R4BXFyH//nHxVg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.5.tgz",
-      "integrity": "sha512-sQ7l00M8bSv36GLV95BVAdhJ2QsIbCuCjh/uYrWiMQSUuV+LpXwIqhgJDcvMTj+VsQmqAHL2yYaasENvJ7CDKA==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.5.tgz",
-      "integrity": "sha512-0ur7ae16hDUC4OL5iEnDb0tZHDxYmuQyhKhsPBV8f99f6Z9KQM02g33f93rNH5A30agMS46u2HP6qTdEt6Q1kg==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.5.tgz",
-      "integrity": "sha512-kB/66P1OsHO5zLz0i6X0RxlQ+3cu0mkxS3TKFvkb5lin6uwZ/ttOkP3Z8lfR9mJOBk14ZwZ9182SIIWFGNmqmg==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.5.tgz",
-      "integrity": "sha512-UZCmJ7r9X2fe2D6jBmkLBMQetXPXIsZjQJCjgwpVDz+YMcS6oFR27alkgGv3Oqkv07bxdvw7fyB71/olceJhkQ==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.5.tgz",
-      "integrity": "sha512-kTxwu4mLyeOlsVIFPfQo+fQJAV9mh24xL+y+Bm6ej067sYANjyEw1dNHmvoqxJUCMnkBdKpvOn0Ahql6+4VyeA==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.5.tgz",
-      "integrity": "sha512-K2dSKTKfmdh78uJ3NcWFiqyRrimfdinS5ErLSn3vluHNeHVnBAFWC8a4X5N+7FgVE1EjXS1QDZbpqZBjfrqMTQ==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/@esbuild/linux-x64": {
       "version": "0.25.5",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.5.tgz",
@@ -745,142 +474,6 @@
         "node": ">=18"
       }
     },
-    "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.5.tgz",
-      "integrity": "sha512-pwHtMP9viAy1oHPvgxtOv+OkduK5ugofNTVDilIzBLpoWAM16r7b/mxBvfpuQDpRQFMfuVr5aLcn4yveGvBZvw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.5.tgz",
-      "integrity": "sha512-WOb5fKrvVTRMfWFNCroYWWklbnXH0Q5rZppjq0vQIdlsQKuw6mdSihwSo4RV/YdQ5UCKKvBy7/0ZZYLBZKIbwQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.5.tgz",
-      "integrity": "sha512-7A208+uQKgTxHd0G0uqZO8UjK2R0DDb4fDmERtARjSHWxqMTye4Erz4zZafx7Di9Cv+lNHYuncAkiGFySoD+Mw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.5.tgz",
-      "integrity": "sha512-G4hE405ErTWraiZ8UiSoesH8DaCsMm0Cay4fsFWOOUcz8b8rC6uCvnagr+gnioEjWn0wC+o1/TAHt+It+MpIMg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.5.tgz",
-      "integrity": "sha512-l+azKShMy7FxzY0Rj4RCt5VD/q8mG/e+mDivgspo+yL8zW7qEwctQ6YqKX34DTEleFAvCIUviCFX1SDZRSyMQA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.5.tgz",
-      "integrity": "sha512-O2S7SNZzdcFG7eFKgvwUEZ2VG9D/sn/eIiz8XRZ1Q/DO5a3s76Xv0mdBzVM5j5R639lXQmPmSo0iRpHqUUrsxw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.5.tgz",
-      "integrity": "sha512-onOJ02pqs9h1iMJ1PQphR+VZv8qBMQ77Klcsqv9CNW2w6yLqoURLcgERAIurY6QE63bbLuqgP9ATqajFLK5AMQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.5.tgz",
-      "integrity": "sha512-TXv6YnJ8ZMVdX+SXWVBo/0p8LTcrUYngpWjvm91TMjjBQii7Oz11Lw5lbDV5Y0TzuhSJHwiH4hEtC1I42mMS0g==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
@@ -1357,216 +950,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.44.0.tgz",
-      "integrity": "sha512-xEiEE5oDW6tK4jXCAyliuntGR+amEMO7HLtdSshVuhFnKTYoeYMyXQK7pLouAJJj5KHdwdn87bfHAR2nSdNAUA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.44.0.tgz",
-      "integrity": "sha512-uNSk/TgvMbskcHxXYHzqwiyBlJ/lGcv8DaUfcnNwict8ba9GTTNxfn3/FAoFZYgkaXXAdrAA+SLyKplyi349Jw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.44.0.tgz",
-      "integrity": "sha512-VGF3wy0Eq1gcEIkSCr8Ke03CWT+Pm2yveKLaDvq51pPpZza3JX/ClxXOCmTYYq3us5MvEuNRTaeyFThCKRQhOA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.44.0.tgz",
-      "integrity": "sha512-fBkyrDhwquRvrTxSGH/qqt3/T0w5Rg0L7ZIDypvBPc1/gzjJle6acCpZ36blwuwcKD/u6oCE/sRWlUAcxLWQbQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.44.0.tgz",
-      "integrity": "sha512-u5AZzdQJYJXByB8giQ+r4VyfZP+walV+xHWdaFx/1VxsOn6eWJhK2Vl2eElvDJFKQBo/hcYIBg/jaKS8ZmKeNQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
-    "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.44.0.tgz",
-      "integrity": "sha512-qC0kS48c/s3EtdArkimctY7h3nHicQeEUdjJzYVJYR3ct3kWSafmn6jkNCA8InbUdge6PVx6keqjk5lVGJf99g==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.44.0.tgz",
-      "integrity": "sha512-x+e/Z9H0RAWckn4V2OZZl6EmV0L2diuX3QB0uM1r6BvhUIv6xBPL5mrAX2E3e8N8rEHVPwFfz/ETUbV4oW9+lQ==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.44.0.tgz",
-      "integrity": "sha512-1exwiBFf4PU/8HvI8s80icyCcnAIB86MCBdst51fwFmH5dyeoWVPVgmQPcKrMtBQ0W5pAs7jBCWuRXgEpRzSCg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.44.0.tgz",
-      "integrity": "sha512-ZTR2mxBHb4tK4wGf9b8SYg0Y6KQPjGpR4UWwTFdnmjB4qRtoATZ5dWn3KsDwGa5Z2ZBOE7K52L36J9LueKBdOQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.44.0.tgz",
-      "integrity": "sha512-GFWfAhVhWGd4r6UxmnKRTBwP1qmModHtd5gkraeW2G490BpFOZkFtem8yuX2NyafIP/mGpRJgTJ2PwohQkUY/Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.44.0.tgz",
-      "integrity": "sha512-xw+FTGcov/ejdusVOqKgMGW3c4+AgqrfvzWEVXcNP6zq2ue+lsYUgJ+5Rtn/OTJf7e2CbgTFvzLW2j0YAtj0Gg==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.44.0.tgz",
-      "integrity": "sha512-bKGibTr9IdF0zr21kMvkZT4K6NV+jjRnBoVMt2uNMG0BYWm3qOVmYnXKzx7UhwrviKnmK46IKMByMgvpdQlyJQ==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.44.0.tgz",
-      "integrity": "sha512-vV3cL48U5kDaKZtXrti12YRa7TyxgKAIDoYdqSIOMOFBXqFj2XbChHAtXquEn2+n78ciFgr4KIqEbydEGPxXgA==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-riscv64-musl": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.44.0.tgz",
-      "integrity": "sha512-TDKO8KlHJuvTEdfw5YYFBjhFts2TR0VpZsnLLSYmB7AaohJhM8ctDSdDnUGq77hUh4m/djRafw+9zQpkOanE2Q==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.44.0.tgz",
-      "integrity": "sha512-8541GEyktXaw4lvnGp9m84KENcxInhAt6vPWJ9RodsB/iGjHoMB2Pp5MVBCiKIRxrxzJhGCxmNzdu+oDQ7kwRA==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
       "version": "4.44.0",
       "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.44.0.tgz",
@@ -1595,48 +978,6 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.44.0.tgz",
-      "integrity": "sha512-M0CpcHf8TWn+4oTxJfh7LQuTuaYeXGbk0eageVjQCKzYLsajWS/lFC94qlRqOlyC2KvRT90ZrfXULYmukeIy7w==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.44.0.tgz",
-      "integrity": "sha512-3XJ0NQtMAXTWFW8FqZKcw3gOQwBtVWP/u8TpHP3CRPXD7Pd6s8lLdH3sHWh8vqKCyyiI8xW5ltJScQmBU9j7WA==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.44.0.tgz",
-      "integrity": "sha512-Q2Mgwt+D8hd5FIPUuPDsvPR7Bguza6yTkJxspDGkZj7tBRn2y4KSWYuIXpftFSjBra76TbKerCV7rgFPQrn+wQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
     "node_modules/@syncfusion/ej2-base": {
       "version": "30.1.37",
       "resolved": "https://registry.npmjs.org/@syncfusion/ej2-base/-/ej2-base-30.1.37.tgz",
@@ -1896,6 +1237,17 @@
         "@syncfusion/ej2-react-base": "~30.1.37"
       }
     },
+    "node_modules/@syncfusion/ej2-react-popups": {
+      "version": "30.1.37",
+      "resolved": "https://registry.npmjs.org/@syncfusion/ej2-react-popups/-/ej2-react-popups-30.1.37.tgz",
+      "integrity": "sha512-yT/fBl3v4NEo6iY9isV3fB/aPxc8qrWpJJiCqlSAY4arouRlP++3GYh7rItlTuJcshMmgSroBBaP/23/hLOAcA==",
+      "license": "SEE LICENSE IN license",
+      "dependencies": {
+        "@syncfusion/ej2-base": "~30.1.37",
+        "@syncfusion/ej2-popups": "30.1.37",
+        "@syncfusion/ej2-react-base": "~30.1.37"
+      }
+    },
     "node_modules/@syncfusion/ej2-react-schedule": {
       "version": "30.1.37",
       "resolved": "https://registry.npmjs.org/@syncfusion/ej2-react-schedule/-/ej2-react-schedule-30.1.37.tgz",
@@ -4259,21 +3611,6 @@
         "url": "https://github.com/sponsors/rawify"
       }
     },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
diff --git a/dashboard/package.json b/dashboard/package.json
index 2862612..4165b89 100644
--- a/dashboard/package.json
+++ b/dashboard/package.json
@@ -14,6 +14,7 @@
     "@syncfusion/ej2-react-calendars": "^30.1.37",
     "@syncfusion/ej2-react-grids": "^30.1.37",
     "@syncfusion/ej2-react-kanban": "^30.1.37",
+    "@syncfusion/ej2-react-popups": "^30.1.37",
     "@syncfusion/ej2-react-schedule": "^30.1.37",
     "cldr-data": "^36.0.4",
     "lucide-react": "^0.522.0",
diff --git a/dashboard/src/App.css b/dashboard/src/App.css
index b0901e5..5dbdbcb 100644
--- a/dashboard/src/App.css
+++ b/dashboard/src/App.css
@@ -14,3 +14,91 @@ body {
   font-family: Inter, 'Segoe UI', Roboto, Arial, sans-serif;
 }
 
+:root {
+  --sidebar-bg: #e5d8c7;
+  --sidebar-fg: #78591c;
+  --sidebar-border: #d6c3a6;
+}
+
+.sidebar-theme {
+  background-color: var(--sidebar-bg);
+  color: var(--sidebar-fg);
+  font-size: 1.15rem;
+  font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif;
+}
+
+.sidebar-theme .sidebar-link {
+  text-decoration: none;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.sidebar-theme .sidebar-logout {
+  border: none;
+  cursor: pointer;
+  text-align: left;
+  width: 100%;
+  font-size: 1.15rem;
+}
+
+.sidebar-theme .sidebar-btn,
+.sidebar-theme .sidebar-link,
+.sidebar-theme .sidebar-logout {
+  background-color: var(--sidebar-bg);
+  color: var(--sidebar-fg);
+  transition: background 0.2s, color 0.2s;
+  font-weight: 500;
+}
+
+.sidebar-theme .sidebar-btn:hover,
+.sidebar-theme .sidebar-link:hover,
+.sidebar-theme .sidebar-logout:hover {
+  background-color: var(--sidebar-fg);
+  color: var(--sidebar-bg);
+}
+
+/* Kanban-Karten im Sidebar-Style */
+.e-kanban .e-card,
+.e-kanban .e-card .e-card-content,
+.e-kanban .e-card .e-card-header {
+  background-color: var(--sidebar-bg) !important;
+  color: var(--sidebar-fg) !important;
+}
+
+.e-kanban .e-card:hover,
+.e-kanban .e-card.e-selection,
+.e-kanban .e-card.e-card-active,
+.e-kanban .e-card:hover .e-card-content,
+.e-kanban .e-card.e-selection .e-card-content,
+.e-kanban .e-card.e-card-active .e-card-content,
+.e-kanban .e-card:hover .e-card-header,
+.e-kanban .e-card.e-selection .e-card-header,
+.e-kanban .e-card.e-card-active .e-card-header {
+  background-color: var(--sidebar-fg) !important;
+  color: var(--sidebar-bg) !important;
+}
+
+/* Optional: Fokus-Style für Tastatur-Navigation */
+.e-kanban .e-card:focus {
+  outline: 2px solid var(--sidebar-fg);
+  outline-offset: 2px;
+}
+
+/* Kanban-Spaltenheader: Hintergrund und Textfarbe überschreiben */
+.e-kanban .e-kanban-table .e-header-cells {
+  background-color: color-mix(in srgb, var(--sidebar-bg) 80%, #fff 20%) !important;
+  color: var(--sidebar-fg) !important;
+  font-weight: 700;
+  font-size: 1.08rem;
+  border-bottom: 2px solid var(--sidebar-fg);
+  box-shadow: 0 2px 6px 0 color-mix(in srgb, #78591c 8%, transparent);
+  letter-spacing: 0.02em;
+}
+
+/* Header-Text noch spezifischer und mit !important */
+.e-kanban .e-kanban-table .e-header-cells .e-header-text {
+  color: color-mix(in srgb, var(--sidebar-fg) 85%, #000 15%) !important;
+}
+
+
diff --git a/dashboard/src/App.tsx b/dashboard/src/App.tsx
index 5360a3f..e30ceb4 100644
--- a/dashboard/src/App.tsx
+++ b/dashboard/src/App.tsx
@@ -34,18 +34,11 @@ const Layout: React.FC = () => {
     <div className="flex min-h-screen">
       {/* Sidebar */}
       <aside
-        className={`flex flex-col transition-all duration-300 ${collapsed ? 'w-20' : 'w-30'}`}
-        style={{
-          backgroundColor: '#e5d8c7',
-          color: '#78591c',
-          fontSize: '1.15rem',
-          fontFamily:
-            'ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif',
-        }}
+        className={`sidebar-theme flex flex-col transition-all duration-300 ${collapsed ? 'w-20' : 'w-30'}`}
       >
         <div
           className="h-20 flex items-center justify-center border-b"
-          style={{ borderColor: '#d6c3a6' }}
+          style={{ borderColor: 'var(--sidebar-border)' }}
         >
           <img
             src={logo}
@@ -55,21 +48,9 @@ const Layout: React.FC = () => {
           />
         </div>
         <button
-          className="p-2 focus:outline-none transition-colors"
-          style={{
-            backgroundColor: '#e5d8c7',
-            color: '#78591c',
-          }}
+          className="sidebar-btn p-2 focus:outline-none transition-colors"
           onClick={() => setCollapsed(!collapsed)}
           aria-label={collapsed ? 'Sidebar ausklappen' : 'Sidebar einklappen'}
-          onMouseEnter={e => {
-            e.currentTarget.style.backgroundColor = '#78591c';
-            e.currentTarget.style.color = '#e5d8c7';
-          }}
-          onMouseLeave={e => {
-            e.currentTarget.style.backgroundColor = '#e5d8c7';
-            e.currentTarget.style.color = '#78591c';
-          }}
         >
           <span style={{ fontSize: 20 }}>{collapsed ? '▶' : '◀'}</span>
         </button>
@@ -80,24 +61,8 @@ const Layout: React.FC = () => {
               <Link
                 key={item.path}
                 to={item.path}
-                className="flex items-center gap-3 px-6 py-3 transition-colors no-underline"
-                style={{
-                  color: '#78591c',
-                  textDecoration: 'none',
-                  whiteSpace: 'nowrap',
-                  overflow: 'hidden',
-                  textOverflow: 'ellipsis',
-                  fontWeight: 500,
-                }}
+                className="sidebar-link flex items-center gap-3 px-6 py-3 transition-colors no-underline"
                 title={collapsed ? item.name : undefined}
-                onMouseEnter={e => {
-                  e.currentTarget.style.backgroundColor = '#78591c';
-                  e.currentTarget.style.color = '#e5d8c7';
-                }}
-                onMouseLeave={e => {
-                  e.currentTarget.style.backgroundColor = '';
-                  e.currentTarget.style.color = '#78591c';
-                }}
               >
                 <Icon size={22} />
                 {!collapsed && item.name}
@@ -108,30 +73,12 @@ const Layout: React.FC = () => {
         {/* Abmelden-Button immer ganz unten */}
         <div className="mb-4 mt-auto">
           <button
-            className="flex items-center gap-3 px-6 py-3 w-full transition-colors no-underline"
-            style={{
-              color: '#78591c',
-              backgroundColor: '#e5d8c7',
-              border: 'none',
-              fontWeight: 500,
-              cursor: 'pointer',
-              textAlign: 'left',
-              fontSize: '1.15rem',
-              width: '100%',
-            }}
+            className="sidebar-logout flex items-center gap-3 px-6 py-3 w-full transition-colors no-underline"
             title={collapsed ? 'Abmelden' : undefined}
             onClick={() => {
               // Hier ggf. Logout-Logik einfügen
               window.location.href = '/logout';
             }}
-            onMouseEnter={e => {
-              e.currentTarget.style.backgroundColor = '#78591c';
-              e.currentTarget.style.color = '#e5d8c7';
-            }}
-            onMouseLeave={e => {
-              e.currentTarget.style.backgroundColor = '#e5d8c7';
-              e.currentTarget.style.color = '#78591c';
-            }}
           >
             <LogOut size={22} />
             {!collapsed && 'Abmelden'}
diff --git a/dashboard/src/apiGroups.ts b/dashboard/src/apiGroups.ts
index 6ee0673..e7c6ce2 100644
--- a/dashboard/src/apiGroups.ts
+++ b/dashboard/src/apiGroups.ts
@@ -14,6 +14,19 @@ export async function fetchGroups() {
   return await res.json();
 }
 
+export async function deleteGroup(groupName: string) {
+  // Passe ggf. an deine API an
+  return fetch(`/api/groups/${encodeURIComponent(groupName)}`, { method: 'DELETE' });
+}
+
+export async function renameGroup(oldName: string, newName: string) {
+  // Passe ggf. an deine API an
+  return fetch(`/api/groups/${encodeURIComponent(oldName)}`, {
+    method: 'PUT',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ newName }),
+  });
+}
+
 // Hier kannst du später weitere Funktionen ergänzen:
-// export async function deleteGroup(id: number) { ... }
 // export async function updateGroup(id: number, name: string) { ... }
diff --git a/dashboard/src/infoscreen_groups.tsx b/dashboard/src/infoscreen_groups.tsx
index cb9abeb..b10cb2a 100644
--- a/dashboard/src/infoscreen_groups.tsx
+++ b/dashboard/src/infoscreen_groups.tsx
@@ -1,9 +1,10 @@
 import React, { useEffect, useState, useRef } from 'react';
-import { KanbanComponent, ColumnsDirective, ColumnDirective } from '@syncfusion/ej2-react-kanban';
+import { KanbanComponent } from '@syncfusion/ej2-react-kanban';
 import { fetchClients, updateClientGroup } from './apiClients';
-import { fetchGroups, createGroup } from './apiGroups';
+import { fetchGroups, createGroup, deleteGroup, renameGroup } from './apiGroups';
 import type { Client } from './apiClients';
 import type { KanbanComponent as KanbanComponentType } from '@syncfusion/ej2-react-kanban';
+import { DialogComponent } from '@syncfusion/ej2-react-popups';
 
 interface KanbanClient extends Client {
   Id: string;
@@ -30,6 +31,16 @@ const Infoscreen_groups: React.FC = () => {
   const [showDialog, setShowDialog] = useState(false);
   const [newGroupName, setNewGroupName] = useState('');
   const [draggedCard, setDraggedCard] = useState<{ id: string; fromColumn: string } | null>(null);
+  const [renameDialog, setRenameDialog] = useState<{
+    open: boolean;
+    oldName: string;
+    newName: string;
+  }>({ open: false, oldName: '', newName: '' });
+  const [deleteDialog, setDeleteDialog] = useState<{ open: boolean; groupName: string }>({
+    open: false,
+    groupName: '',
+  });
+  const [showDeleteConfirm, setShowDeleteConfirm] = useState(false);
   const kanbanRef = useRef<KanbanComponentType | null>(null); // Ref für Kanban
 
   // Lade Gruppen und Clients
@@ -71,6 +82,60 @@ const Infoscreen_groups: React.FC = () => {
     }
   };
 
+  // Löschen einer Gruppe
+  const handleDeleteGroup = async (groupName: string) => {
+    try {
+      // Clients der Gruppe in "Nicht zugeordnet" verschieben
+      const groupClients = clients.filter(c => c.Status === groupName);
+      if (groupClients.length > 0) {
+        await updateClientGroup(
+          groupClients.map(c => c.Id),
+          'Nicht zugeordnet'
+        );
+      }
+      await deleteGroup(groupName);
+      // Gruppen und Clients neu laden
+      const groupData = await fetchGroups();
+      const groupMap = Object.fromEntries(groupData.map((g: Group) => [g.id, g.name]));
+      setGroups(groupData.map((g: Group) => ({ keyField: g.name, headerText: g.name, id: g.id })));
+      const data = await fetchClients();
+      setClients(
+        data.map((c, i) => ({
+          ...c,
+          Id: c.uuid,
+          Status: groupMap[c.group_id] || 'Nicht zugeordnet',
+          Summary: c.location || `Client ${i + 1}`,
+        }))
+      );
+    } catch {
+      alert('Fehler beim Löschen der Gruppe');
+    }
+    setDeleteDialog({ open: false, groupName: '' });
+  };
+
+  // Umbenennen einer Gruppe
+  const handleRenameGroup = async () => {
+    try {
+      await renameGroup(renameDialog.oldName, renameDialog.newName);
+      // Gruppen und Clients neu laden
+      const groupData = await fetchGroups();
+      const groupMap = Object.fromEntries(groupData.map((g: Group) => [g.id, g.name]));
+      setGroups(groupData.map((g: Group) => ({ keyField: g.name, headerText: g.name, id: g.id })));
+      const data = await fetchClients();
+      setClients(
+        data.map((c, i) => ({
+          ...c,
+          Id: c.uuid,
+          Status: groupMap[c.group_id] || 'Nicht zugeordnet',
+          Summary: c.location || `Client ${i + 1}`,
+        }))
+      );
+    } catch {
+      alert('Fehler beim Umbenennen der Gruppe');
+    }
+    setRenameDialog({ open: false, oldName: '', newName: '' });
+  };
+
   const handleDragStart = (args: KanbanDragEventArgs) => {
     const element = Array.isArray(args.element) ? args.element[0] : args.element;
     const cardId = element.getAttribute('data-id');
@@ -144,15 +209,35 @@ const Infoscreen_groups: React.FC = () => {
     setDraggedCard(null);
   };
 
+  // Spalten-Array ohne Header-Buttons/Template
+  const kanbanColumns = groups.map(group => ({
+    keyField: group.keyField,
+    headerText: group.headerText,
+  }));
+
   return (
-    <div>
+    <div id="dialog-target">
       <h2 className="text-xl font-bold mb-4">Gruppen</h2>
-      <button
-        className="mb-4 px-4 py-2 bg-blue-500 text-white rounded"
-        onClick={() => setShowDialog(true)}
-      >
-        Neue Raumgruppe
-      </button>
+      <div className="flex gap-2 mb-4">
+        <button
+          className="px-4 py-2 bg-blue-500 text-white rounded"
+          onClick={() => setShowDialog(true)}
+        >
+          Neue Raumgruppe
+        </button>
+        <button
+          className="px-4 py-2 bg-yellow-500 text-white rounded"
+          onClick={() => setRenameDialog({ open: true, oldName: '', newName: '' })}
+        >
+          Gruppe umbenennen
+        </button>
+        <button
+          className="px-4 py-2 bg-red-500 text-white rounded"
+          onClick={() => setDeleteDialog({ open: true, groupName: '' })}
+        >
+          Gruppe löschen
+        </button>
+      </div>
       <KanbanComponent
         id="kanban"
         keyField="Status"
@@ -164,14 +249,9 @@ const Infoscreen_groups: React.FC = () => {
         allowDragAndDrop={true}
         dragStart={handleDragStart}
         dragStop={handleCardDrop}
-        ref={kanbanRef} // Ref zuweisen
-      >
-        <ColumnsDirective>
-          {groups.map(group => (
-            <ColumnDirective key={group.keyField} {...group} />
-          ))}
-        </ColumnsDirective>
-      </KanbanComponent>
+        ref={kanbanRef}
+        columns={kanbanColumns}
+      />
       {showDialog && (
         <div className="fixed inset-0 bg-black bg-opacity-30 flex items-center justify-center">
           <div className="bg-white p-6 rounded shadow">
@@ -196,6 +276,135 @@ const Infoscreen_groups: React.FC = () => {
           </div>
         </div>
       )}
+      {renameDialog.open && (
+        <div className="fixed inset-0 bg-black bg-opacity-30 flex items-center justify-center">
+          <div className="bg-white p-6 rounded shadow">
+            <h3 className="mb-2 font-bold">Raumgruppe umbenennen</h3>
+            <select
+              className="border p-2 mb-2 w-full"
+              value={renameDialog.oldName}
+              onChange={e =>
+                setRenameDialog({
+                  ...renameDialog,
+                  oldName: e.target.value,
+                  newName: e.target.value,
+                })
+              }
+            >
+              <option value="">Gruppe wählen</option>
+              {groups
+                .filter(g => g.headerText !== 'Nicht zugeordnet')
+                .map(g => (
+                  <option key={g.keyField} value={g.headerText}>
+                    {g.headerText}
+                  </option>
+                ))}
+            </select>
+            <input
+              className="border p-2 mb-2 w-full"
+              value={renameDialog.newName}
+              onChange={e => setRenameDialog({ ...renameDialog, newName: e.target.value })}
+              placeholder="Neuer Name"
+            />
+            <div className="flex gap-2">
+              <button
+                className="bg-blue-500 text-white px-4 py-2 rounded"
+                onClick={handleRenameGroup}
+                disabled={!renameDialog.oldName || !renameDialog.newName}
+              >
+                Umbenennen
+              </button>
+              <button
+                className="bg-gray-300 px-4 py-2 rounded"
+                onClick={() => setRenameDialog({ open: false, oldName: '', newName: '' })}
+              >
+                Abbrechen
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
+      {deleteDialog.open && (
+        <div className="fixed inset-0 bg-black bg-opacity-30 flex items-center justify-center">
+          <div className="bg-white p-6 rounded shadow">
+            <h3 className="mb-2 font-bold">Gruppe löschen</h3>
+            <select
+              className="border p-2 mb-2 w-full"
+              value={deleteDialog.groupName}
+              onChange={e => setDeleteDialog({ ...deleteDialog, groupName: e.target.value })}
+            >
+              <option value="">Gruppe wählen</option>
+              {groups
+                .filter(g => g.headerText !== 'Nicht zugeordnet')
+                .map(g => (
+                  <option key={g.keyField} value={g.headerText}>
+                    {g.headerText}
+                  </option>
+                ))}
+            </select>
+            <p>Alle Clients werden in "Nicht zugeordnet" verschoben.</p>
+            {deleteDialog.groupName && (
+              <div className="bg-yellow-100 text-yellow-800 p-2 rounded mb-2 text-sm">
+                <strong>Achtung:</strong> Möchten Sie die Gruppe <b>{deleteDialog.groupName}</b>{' '}
+                wirklich löschen?
+              </div>
+            )}
+            <div className="flex gap-2 mt-2">
+              <button
+                className="bg-red-500 text-white px-4 py-2 rounded"
+                onClick={() => setShowDeleteConfirm(true)}
+                disabled={!deleteDialog.groupName}
+              >
+                Löschen
+              </button>
+              <button
+                className="bg-gray-300 px-4 py-2 rounded"
+                onClick={() => setDeleteDialog({ open: false, groupName: '' })}
+              >
+                Abbrechen
+              </button>
+            </div>
+          </div>
+          {showDeleteConfirm && deleteDialog.groupName && (
+            <DialogComponent
+              width="350px"
+              header="Löschbestätigung"
+              visible={showDeleteConfirm}
+              close={() => setShowDeleteConfirm(false)}
+              footerTemplate={() => (
+                <div className="flex gap-2 justify-end">
+                  <button
+                    className="bg-red-500 text-white px-4 py-2 rounded"
+                    onClick={() => {
+                      handleDeleteGroup(deleteDialog.groupName);
+                      setShowDeleteConfirm(false);
+                    }}
+                  >
+                    Ja, löschen
+                  </button>
+                  <button
+                    className="bg-gray-300 px-4 py-2 rounded"
+                    onClick={() => {
+                      setShowDeleteConfirm(false);
+                      setDeleteDialog({ open: false, groupName: '' });
+                    }}
+                  >
+                    Abbrechen
+                  </button>
+                </div>
+              )}
+            >
+              <div>
+                Möchten Sie die Gruppe <b>{deleteDialog.groupName}</b> wirklich löschen?
+                <br />
+                <span className="text-sm text-gray-500">
+                  Alle Clients werden in "Nicht zugeordnet" verschoben.
+                </span>
+              </div>
+            </DialogComponent>
+          )}
+        </div>
+      )}
     </div>
   );
 };