diff --git a/shop/components/admin/user-dialog.tsx b/shop/components/admin/user-dialog.tsx
index c9236b5..d97e12a 100644
--- a/shop/components/admin/user-dialog.tsx
+++ b/shop/components/admin/user-dialog.tsx
@@ -197,24 +197,24 @@ export function UserDialog({ companies }: UserDialogProps) {
               render={({ field }) => {
                 const selectedCompany = localCompanies.find((c) => c.id === field.value)
                 return (
-                  <FormItem className="flex flex-col">
+                  <FormItem className="w-full">
                     <FormLabel className="text-slate-900 dark:text-white">Firma</FormLabel>
                     <FormControl>
-                      <div className="flex flex-col gap-2">
-                        <div className="relative" ref={dropdownRef}>
-                          <div className="flex items-center gap-2">
-                            <Building2 className="w-4 h-4 text-slate-500 shrink-0" />
+                      <div className="flex flex-col gap-2 w-full">
+                        <div className="relative w-full" ref={dropdownRef}>
+                          <div className="flex flex-col gap-1 w-full">
                             <button
                               type="button"
                               onClick={() => {
                                 setDropdownOpen(!dropdownOpen)
                                 setSearch('')
                               }}
-                              className="w-full text-left text-sm bg-slate-50 dark:bg-white/5 border border-slate-200 dark:border-white/10 rounded-md px-3 py-2 text-slate-700 dark:text-slate-300 hover:bg-slate-100 dark:hover:bg-white/10 cursor-pointer focus:outline-none focus:ring-2 focus:ring-primary focus:ring-offset-2 max-w-full truncate"
+                              className="w-full text-left text-sm bg-slate-50 dark:bg-white/5 border border-slate-200 dark:border-white/10 rounded-md px-3 py-2 text-slate-700 dark:text-slate-300 hover:bg-slate-100 dark:hover:bg-white/10 cursor-pointer focus:outline-none focus:ring-2 focus:ring-primary focus:ring-offset-2 truncate"
                             >
                               {selectedCompany ? selectedCompany.name : 'Keine Firma'}
                             </button>
                           </div>
+
                           {dropdownOpen && (
                             <div className="absolute z-50 mt-1 left-0 w-full bg-white dark:bg-slate-900 border border-slate-200 dark:border-white/10 rounded-lg shadow-xl overflow-hidden">
                               <div className="p-2 border-b border-slate-200 dark:border-white/10">
@@ -227,7 +227,7 @@ export function UserDialog({ companies }: UserDialogProps) {
                                   autoFocus
                                 />
                               </div>
-                              <div className="max-h-40 overflow-y-auto">
+                              <div className="max-h-40 overflow-y-auto flex flex-col">
                                 <button
                                   type="button"
                                   onClick={() => {
@@ -235,9 +235,8 @@ export function UserDialog({ companies }: UserDialogProps) {
                                     setDropdownOpen(false)
                                     setSearch('')
                                   }}
-                                  className={`w-full text-left text-xs px-3 py-2 hover:bg-slate-100 dark:hover:bg-white/10 transition-colors ${
-                                    !field.value ? 'text-primary font-semibold' : 'text-slate-700 dark:text-slate-300'
-                                  }`}
+                                  className={`w-full text-left text-xs px-3 py-2 hover:bg-slate-100 dark:hover:bg-white/10 transition-colors ${!field.value ? 'text-primary font-semibold' : 'text-slate-700 dark:text-slate-300'
+                                    }`}
                                 >
                                   Keine Firma
                                 </button>
@@ -252,9 +251,8 @@ export function UserDialog({ companies }: UserDialogProps) {
                                         setDropdownOpen(false)
                                         setSearch('')
                                       }}
-                                      className={`w-full text-left text-xs px-3 py-2 hover:bg-slate-100 dark:hover:bg-white/10 transition-colors ${
-                                        field.value === c.id ? 'text-primary font-semibold' : 'text-slate-700 dark:text-slate-300'
-                                      }`}
+                                      className={`w-full text-left text-xs px-3 py-2 hover:bg-slate-100 dark:hover:bg-white/10 transition-colors truncate ${field.value === c.id ? 'text-primary font-semibold' : 'text-slate-700 dark:text-slate-300'
+                                        }`}
                                     >
                                       {c.name}
                                     </button>
@@ -265,53 +263,55 @@ export function UserDialog({ companies }: UserDialogProps) {
                         </div>
 
                         {showNewCompanyInput ? (
-                          <div className="flex gap-2 mt-1">
+                          <div className="flex flex-col sm:flex-row gap-2 mt-1 w-full">
                             <Input
                               placeholder="Name der neuen Firma"
                               value={newCompanyName}
                               onChange={(e) => setNewCompanyName(e.target.value)}
-                              className="bg-slate-50 dark:bg-white/5 border-slate-200 dark:border-white/10 text-slate-900 dark:text-white text-xs h-8"
+                              className="bg-slate-50 dark:bg-white/5 border-slate-200 dark:border-white/10 text-slate-900 dark:text-white text-xs h-8 w-full"
                             />
-                            <Button
-                              type="button"
-                              size="sm"
-                              onClick={async () => {
-                                const trimmed = newCompanyName.trim()
-                                if (trimmed) {
-                                  setIsCreatingCompany(true)
-                                  try {
-                                    const created = await createCompany({ name: trimmed })
-                                    if (created) {
-                                      setLocalCompanies((prev) => [...prev, created])
-                                      field.onChange(created.id)
-                                      setShowNewCompanyInput(false)
-                                      setNewCompanyName('')
-                                      router.refresh()
+                            <div className="flex gap-2 justify-end">
+                              <Button
+                                type="button"
+                                size="sm"
+                                onClick={async () => {
+                                  const trimmed = newCompanyName.trim()
+                                  if (trimmed) {
+                                    setIsCreatingCompany(true)
+                                    try {
+                                      const created = await createCompany({ name: trimmed })
+                                      if (created) {
+                                        setLocalCompanies((prev) => [...prev, created])
+                                        field.onChange(created.id)
+                                        setShowNewCompanyInput(false)
+                                        setNewCompanyName('')
+                                        router.refresh()
+                                      }
+                                    } catch (err) {
+                                      console.error('Failed to create company:', err)
+                                    } finally {
+                                      setIsCreatingCompany(false)
                                     }
-                                  } catch (err) {
-                                    console.error('Failed to create company:', err)
-                                  } finally {
-                                    setIsCreatingCompany(false)
                                   }
-                                }
-                              }}
-                              disabled={isCreatingCompany}
-                              className="bg-primary text-xs h-8"
-                            >
-                              {isCreatingCompany ? 'Erstellt...' : 'Speichern'}
-                            </Button>
-                            <Button
-                              type="button"
-                              size="sm"
-                              variant="ghost"
-                              onClick={() => {
-                                setShowNewCompanyInput(false)
-                                setNewCompanyName('')
-                              }}
-                              className="text-xs h-8 text-slate-500 dark:text-slate-400"
-                            >
-                              Abbrechen
-                            </Button>
+                                }}
+                                disabled={isCreatingCompany}
+                                className="bg-primary text-xs h-8"
+                              >
+                                {isCreatingCompany ? 'Erstellt...' : 'Speichern'}
+                              </Button>
+                              <Button
+                                type="button"
+                                size="sm"
+                                variant="ghost"
+                                onClick={() => {
+                                  setShowNewCompanyInput(false)
+                                  setNewCompanyName('')
+                                }}
+                                className="text-xs h-8 text-slate-500 dark:text-slate-400"
+                              >
+                                Abbrechen
+                              </Button>
+                            </div>
                           </div>
                         ) : (
                           <button