diff --git a/frontend/src/components/users/UserManagementPage.tsx b/frontend/src/components/users/UserManagementPage.tsx
index 49d5b62..2e9a83a 100644
--- a/frontend/src/components/users/UserManagementPage.tsx
+++ b/frontend/src/components/users/UserManagementPage.tsx
@@ -101,37 +101,35 @@ export default function UserManagementPage() {
     return (
         <PageContainer>
             <ContentBackground>
-                <StickyHeader>
-                    <div className="flex justify-between items-center">
-                        <h1>Benutzerverwaltung</h1>
-                        <ButtonGroupLayout>
-                            {isAdmin && (
-                                <Button
-                                    icon={Plus}
-                                    onClick={handleAddUser}
-                                    text="Neuer Benutzer"
-                                    buttonType={ButtonType.PrimaryButton}
-                                />
-                            )}
-                            <ButtonLink
-                                icon={X}
-                                to={getRecipeListUrl()}
+                <StickyHeader className={"flex justify-between items-center"}>
+                    <h1>Benutzerverwaltung</h1>
+                    <ButtonGroupLayout>
+                        {isAdmin && (
+                            <Button
+                                icon={Plus}
+                                onClick={handleAddUser}
+                                text="Neuer Benutzer"
+                                buttonType={ButtonType.PrimaryButton}
                             />
-                        </ButtonGroupLayout>
-                    </div>
+                        )}
+                        <ButtonLink
+                            icon={X}
+                            to={getRecipeListUrl()}
+                        />
+                    </ButtonGroupLayout>
                 </StickyHeader>
 
                 <ContentBody>
                     <div className="flex flex-col md:flex-row gap-6">
-                        {/* User List */}
+                        {/* User List @todo selector component!*/}
                         <div className="md:w-1/3 border-r border-gray-300">
-                            <h2 className="mb-2 text-lg font-semibold">Benutzer</h2>
+                            <h2>Benutzer</h2>
                             <ul>
                                 {users.map((user) => (
                                     <li
                                         key={user.id ?? user.userName}
                                         className={clsx(
-                                            "p-2 cursor-pointer rounded hover:bg-gray-200",
+                                            "p-2 hover:bg-gray-200",
                                             selectedUser?.id === user.id && "bg-gray-300 font-semibold"
                                         )}
                                         onClick={() => handleSelectUser(user)}
@@ -146,7 +144,7 @@ export default function UserManagementPage() {
                         <div className="md:w-2/3">
                             {selectedUser ? (
                                 <div>
-                                    <h2 className="text-lg font-semibold mb-4">
+                                    <h2>
                                         {selectedUser.id ? "Benutzer bearbeiten" : "Neuen Benutzer anlegen"}
                                     </h2>
                                     <form