diff --git a/nginx.conf b/nginx.conf
index 9021112..a256f76 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -8,8 +8,8 @@ server {
     }
 
     location /api {
-        proxy_pass https://restapi.testsite.deinedorfapp.de;
-        proxy_set_header Host restapi.testsite.deinedorfapp.de;
+        proxy_pass http://backend:5173;
+        proxy_set_header Host backend;
         proxy_set_header X-Real-IP $remote_addr;
     }
 }
\ No newline at end of file
diff --git a/src/App.jsx b/src/App.jsx
index 74c27e3..456282f 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -10,6 +10,7 @@ import PostsPage from './pages/PostsPage';
 import CreateNewsPage from './pages/CreateNewsPage';
 import OrganizationPage from './pages/OrganizationPage';
 import PushPage from './pages/PushPage';
+import HomePage from './pages/HomePage';
 import EditOrganizationPage from "./pages/EditOrganizationPage.jsx";
 
 const theme = createTheme({
@@ -53,7 +54,7 @@ export default function App() {
                 </PrivateRoute>
               }
             >
-              <Route index element={<Navigate to="/users" replace />} />
+              <Route index element={<HomePage />} />
               <Route
                 path="users"
                 element={
diff --git a/src/api/axiosInstance.js b/src/api/axiosInstance.js
index 88f2515..418dcf5 100644
--- a/src/api/axiosInstance.js
+++ b/src/api/axiosInstance.js
@@ -1,9 +1,16 @@
 import axios from 'axios';
-
+/*
 const axiosInstance = axios.create({
     baseURL: '/api',
     headers: { 'Content-Type': 'application/json' },
 });
+*/
+
+const axiosInstance = axios.create({
+    baseURL: 'https://api.testsite.deinedorfapp.de/api',
+    //baseURL: 'http://localhost:5173/api',
+    headers: { 'Content-Type': 'application/json' },
+});
 
 axiosInstance.interceptors.request.use((config) => {
     const token = localStorage.getItem('jwt_token');
diff --git a/src/components/Layout.jsx b/src/components/Layout.jsx
index 0fe82e3..d38d206 100644
--- a/src/components/Layout.jsx
+++ b/src/components/Layout.jsx
@@ -1,4 +1,3 @@
-import { useState } from 'react';
 import { useNavigate, useLocation, Outlet } from 'react-router-dom';
 import {
   Box, Drawer, List, ListItem, ListItemButton, ListItemIcon, ListItemText,
@@ -10,91 +9,109 @@ import NotificationsActiveIcon from '@mui/icons-material/NotificationsActive';
 import CorporateFareIcon from '@mui/icons-material/CorporateFare';
 import LogoutIcon from '@mui/icons-material/Logout';
 import DashboardIcon from '@mui/icons-material/Dashboard';
+import HomeIcon from '@mui/icons-material/Home';
 import { useAuth } from '../context/AuthContext';
 
 const DRAWER_WIDTH = 240;
 
 const navItems = [
-  { label: 'Users', path: '/users', icon: <PeopleIcon />, roles: ['ADMIN'] },
-  { label: 'Posts', path: '/posts', icon: <ArticleIcon />, roles: ['ADMIN', 'REPORTER'] },
-  { label: 'Push', path: '/push', icon: <NotificationsActiveIcon />, roles: ['ADMIN'] },
-  { label: 'Organization', path: '/organizations', icon: <CorporateFareIcon />, roles: ['ADMIN', 'REPORTER'] },
+  { label: 'Home',         path: '/',             icon: <HomeIcon />,                  roles: null },
+  { label: 'Users',        path: '/users',         icon: <PeopleIcon />,                roles: ['ADMIN'] },
+  { label: 'Posts',        path: '/posts',         icon: <ArticleIcon />,               roles: ['ADMIN', 'REPORTER'] },
+  { label: 'Push',         path: '/push',          icon: <NotificationsActiveIcon />,   roles: ['ADMIN'] },
+  { label: 'Organization', path: '/organizations', icon: <CorporateFareIcon />,         roles: ['ADMIN', 'SITE_OWNER'] },
 ];
 
+function getActiveLabel(pathname) {
+  // Exakter Match für "/" zuerst prüfen, dann startsWith für den Rest
+  const exact = navItems.find((i) => i.path === pathname);
+  if (exact) return exact.label;
+  const partial = navItems.find((i) => i.path !== '/' && pathname.startsWith(i.path));
+  return partial?.label ?? 'Admin';
+}
+
 export default function Layout() {
   const navigate = useNavigate();
   const location = useLocation();
-  const { logout } = useAuth();
+  const { logout, role } = useAuth();
+
+  const visibleNavItems = navItems.filter(
+      (item) => !item.roles || item.roles.includes(role)
+  );
 
   return (
-    <Box sx={{ display: 'flex' }}>
-      {/* Sidebar */}
-      <Drawer
-        variant="permanent"
-        sx={{
-          width: DRAWER_WIDTH,
-          flexShrink: 0,
-          '& .MuiDrawer-paper': {
-            width: DRAWER_WIDTH,
-            boxSizing: 'border-box',
-            borderRight: '1px solid',
-            borderColor: 'divider',
-          },
-        }}
-      >
-        <Toolbar sx={{ px: 2 }}>
-          <DashboardIcon sx={{ mr: 1, color: 'primary.main' }} />
-          <Typography variant="h6" fontWeight={600} color="primary.main">
-            Admin Panel
-          </Typography>
-        </Toolbar>
-        <Divider />
-        <List sx={{ px: 1, pt: 1 }}>
-          {navItems.map((item) => (
-            <ListItem key={item.path} disablePadding sx={{ mb: 0.5 }}>
-              <ListItemButton
-                selected={location.pathname.startsWith(item.path)}
-                onClick={() => navigate(item.path)}
-                sx={{ borderRadius: 2 }}
-              >
-                <ListItemIcon sx={{ minWidth: 36 }}>{item.icon}</ListItemIcon>
-                <ListItemText primary={item.label} />
+      <Box sx={{ display: 'flex' }}>
+        {/* Sidebar */}
+        <Drawer
+            variant="permanent"
+            sx={{
+              width: DRAWER_WIDTH,
+              flexShrink: 0,
+              '& .MuiDrawer-paper': {
+                width: DRAWER_WIDTH,
+                boxSizing: 'border-box',
+                borderRight: '1px solid',
+                borderColor: 'divider',
+              },
+            }}
+        >
+          <Toolbar sx={{ px: 2 }}>
+            <DashboardIcon sx={{ mr: 1, color: 'primary.main' }} />
+            <Typography variant="h6" fontWeight={600} color="primary.main">
+              Admin Panel
+            </Typography>
+          </Toolbar>
+          <Divider />
+          <List sx={{ px: 1, pt: 1 }}>
+            {visibleNavItems.map((item) => (
+                <ListItem key={item.path} disablePadding sx={{ mb: 0.5 }}>
+                  <ListItemButton
+                      selected={
+                        item.path === '/'
+                            ? location.pathname === '/'
+                            : location.pathname.startsWith(item.path)
+                      }
+                      onClick={() => navigate(item.path)}
+                      sx={{ borderRadius: 2 }}
+                  >
+                    <ListItemIcon sx={{ minWidth: 36 }}>{item.icon}</ListItemIcon>
+                    <ListItemText primary={item.label} />
+                  </ListItemButton>
+                </ListItem>
+            ))}
+          </List>
+          <Box sx={{ flexGrow: 1 }} />
+          <Divider />
+          <List sx={{ px: 1, py: 1 }}>
+            <ListItem disablePadding>
+              <ListItemButton onClick={logout} sx={{ borderRadius: 2 }}>
+                <ListItemIcon sx={{ minWidth: 36 }}><LogoutIcon /></ListItemIcon>
+                <ListItemText primary="Logout" />
               </ListItemButton>
             </ListItem>
-          ))}
-        </List>
-        <Box sx={{ flexGrow: 1 }} />
-        <Divider />
-        <List sx={{ px: 1, py: 1 }}>
-          <ListItem disablePadding>
-            <ListItemButton onClick={logout} sx={{ borderRadius: 2 }}>
-              <ListItemIcon sx={{ minWidth: 36 }}><LogoutIcon /></ListItemIcon>
-              <ListItemText primary="Logout" />
-            </ListItemButton>
-          </ListItem>
-        </List>
-      </Drawer>
+          </List>
+        </Drawer>
 
-      {/* Main content */}
-      <Box component="main" sx={{ flexGrow: 1, minHeight: '100vh', bgcolor: 'grey.50' }}>
-        <AppBar
-          position="static"
-          elevation={0}
-          sx={{ bgcolor: 'white', borderBottom: '1px solid', borderColor: 'divider' }}
-        >
-          <Toolbar>
-            <Typography variant="h6" color="text.primary" sx={{ flexGrow: 1 }}>
-              {navItems.find((i) => location.pathname.startsWith(i.path))?.label ?? 'Admin'}
-            </Typography>
-            <Tooltip title="Account">
-              <Avatar sx={{ width: 32, height: 32, bgcolor: 'primary.main', fontSize: 14 }}>A</Avatar>
-            </Tooltip>
-          </Toolbar>
-        </AppBar>
-        <Box sx={{ p: 3 }}>
-          <Outlet />
+        {/* Main content */}
+        <Box component="main" sx={{ flexGrow: 1, minHeight: '100vh', bgcolor: 'grey.50' }}>
+          <AppBar
+              position="static"
+              elevation={0}
+              sx={{ bgcolor: 'white', borderBottom: '1px solid', borderColor: 'divider' }}
+          >
+            <Toolbar>
+              <Typography variant="h6" color="text.primary" sx={{ flexGrow: 1 }}>
+                {getActiveLabel(location.pathname)}
+              </Typography>
+              <Tooltip title="Account">
+                <Avatar sx={{ width: 32, height: 32, bgcolor: 'primary.main', fontSize: 14 }}>A</Avatar>
+              </Tooltip>
+            </Toolbar>
+          </AppBar>
+          <Box sx={{ p: 3 }}>
+            <Outlet />
+          </Box>
         </Box>
       </Box>
-    </Box>
   );
-}
+}
\ No newline at end of file
diff --git a/src/pages/EditOrganizationPage.jsx b/src/pages/EditOrganizationPage.jsx
index 967c576..c0e1b68 100644
--- a/src/pages/EditOrganizationPage.jsx
+++ b/src/pages/EditOrganizationPage.jsx
@@ -30,28 +30,35 @@ const EMPTY_FORM = {
     active: false,
 }
 
+
 export default function EditOrganizationPage() {
     const navigate = useNavigate();
     const [form, setForm] = useState(EMPTY_FORM);
-    const [files, setFiles] = useState([]);
-    const [previews, setPreviews] = useState([]);
-    const [existingImages, setExistingImages] = useState([]);
+    const [name, setName] = useState('');
     const [saving, setSaving] = useState(false);
     const [error, setError] = useState('');
     const { id } = useParams();
-    const [data, setData] = useState([]);
+
+    // Titelbild
+    const [titleImageUrl, setTitleImageUrl] = useState(null);
+    const [titleImageFile, setTitleImageFile] = useState(null);
+    const [titleImagePreview, setTitleImagePreview] = useState(null);
+
+    // Weitere Bilder
+    const [otherImageUrls, setOtherImageUrls] = useState([]);
+    const [otherFiles, setOtherFiles] = useState([]);
+    const [otherPreviews, setOtherPreviews] = useState([]);
 
     useEffect(() => {
         const fetchData = async () => {
             try {
-                const response = await axiosInstance.get('/organizations/' + id);
+                const response = await axiosInstance.get('/organization/' + id);
                 const data = response.data;
 
-                setData(data);
-
+                setName(data.name || '');
                 setForm({
                     description: data.description || '',
-                    phone: data.phone || '',
+                    phone: data.number || '',
                     email: data.email || '',
                     address: data.address || '',
                     website: data.website || '',
@@ -59,7 +66,9 @@ export default function EditOrganizationPage() {
                     active: data.active || false,
                 });
 
-                setExistingImages(data.images || []);
+                const imgs = data.pictures || [];
+                setTitleImageUrl(imgs[0] || null);
+                setOtherImageUrls(imgs.slice(1));
             } catch (err) {
                 setError(err.response?.data || 'Fehler beim Laden');
             }
@@ -75,31 +84,74 @@ export default function EditOrganizationPage() {
         }));
     };
 
-    const handleRemoveExisting = (index) => {
-        setExistingImages((prev) => prev.filter((_, i) => i !== index));
-    };
-
-    const handleSubmit = (e) => {
-        /*
-        Drauf achten alte und neue Bilder zu verwenden
-        Vielleicht extra Feld für Anzeigebild, anstatt erstes zu nehmen
-         */
-    }
-
-    const handleFileChange = (e) => {
-        const selected = Array.from(e.target.files);
-        setFiles((prev) => [...prev, ...selected]);
-        const newPreviews = selected.map((f) => URL.createObjectURL(f));
-        setPreviews((prev) => [...prev, ...newPreviews]);
+    // Titelbild-Handler
+    const handleTitleImageChange = (e) => {
+        const f = e.target.files[0];
+        if (!f) return;
+        if (titleImagePreview) URL.revokeObjectURL(titleImagePreview);
+        setTitleImageFile(f);
+        setTitleImagePreview(URL.createObjectURL(f));
         e.target.value = '';
     };
 
-    const handleRemoveFile = (index) => {
-        URL.revokeObjectURL(previews[index]);
-        setFiles((prev) => prev.filter((_, i) => i !== index));
-        setPreviews((prev) => prev.filter((_, i) => i !== index));
+    const handleRemoveTitleImage = () => {
+        if (titleImagePreview) URL.revokeObjectURL(titleImagePreview);
+        setTitleImageUrl(null);
+        setTitleImageFile(null);
+        setTitleImagePreview(null);
     };
 
+    // Weitere Bilder-Handler
+    const handleOtherFilesChange = (e) => {
+        const selected = Array.from(e.target.files);
+        setOtherFiles((prev) => [...prev, ...selected]);
+        const newPreviews = selected.map((f) => URL.createObjectURL(f));
+        setOtherPreviews((prev) => [...prev, ...newPreviews]);
+        e.target.value = '';
+    };
+
+    const handleRemoveOtherFile = (index) => {
+        URL.revokeObjectURL(otherPreviews[index]);
+        setOtherFiles((prev) => prev.filter((_, i) => i !== index));
+        setOtherPreviews((prev) => prev.filter((_, i) => i !== index));
+    };
+
+    const handleRemoveOtherUrl = (index) => {
+        setOtherImageUrls((prev) => prev.filter((_, i) => i !== index));
+    };
+
+    const handleSubmit = async (e) => {
+        e.preventDefault();
+        setSaving(true);
+        setError('');
+
+        try {
+            const formData = new FormData();
+
+            formData.append(
+                'data',
+                new Blob([JSON.stringify({
+                    ...form,
+                    existingTitleImage: titleImageUrl || null,
+                    existingOtherImages: otherImageUrls,
+                })], { type: 'application/json' })
+            );
+
+            if (titleImageFile) formData.append('images', titleImageFile);
+            otherFiles.forEach((f) => formData.append('images', f));
+
+            await axiosInstance.put(`/organization/${id}`, formData, {
+                headers: { 'Content-Type': undefined }
+            });
+            navigate('/organizations');
+        } catch (err) {
+            setError(err.response?.data || 'Fehler beim Speichern');
+            setSaving(false);
+        }
+    };
+
+    const hasTitleImage = titleImageUrl || titleImageFile;
+
     return (
         <Box>
             <Box sx={{ display: 'flex', alignItems: 'center', gap: 1, mb: 3 }}>
@@ -110,17 +162,18 @@ export default function EditOrganizationPage() {
             </Box>
 
             <Card sx={{ maxWidth: 680 }}>
-                <CardContent sx={{ p: 3}}>
+                <CardContent sx={{ p: 3 }}>
                     <Box component="form" onSubmit={handleSubmit}>
                         <Stack spacing={3}>
                             {error && <Alert severity="error">{error}</Alert>}
 
-                            <TextField label="Beschreibung" name="description" value={form.description} onChange={handleChange} required fullWidth autoFocus multiline rows={6}/>
-                            <TextField label="Telefonnummber" name="phone" value={form.phone} onChange={handleChange} required fullWidth/>
-                            <TextField label="Email Adresse" name="email" value={form.email} onChange={handleChange} required fullWidth/>
-                            <TextField label="Adresse" name="address" value={form.address} onChange={handleChange} required fullWidth/>
-                            <TextField label="Webseite" name="website" value={form.website} onChange={handleChange} required fullWidth/>
-                            <TextField label="Kontaktperson" name="contactPerson" value={form.contactPerson} onChange={handleChange} required fullWidth/>
+                            <TextField label="Name" value={name} fullWidth InputProps={{ readOnly: true }} helperText="Der Name kann nicht geändert werden." />
+                            <TextField label="Beschreibung" name="description" value={form.description} onChange={handleChange} required fullWidth autoFocus multiline rows={6} />
+                            <TextField label="Telefonnummer" name="phone" value={form.phone} onChange={handleChange} required fullWidth />
+                            <TextField label="Email Adresse" name="email" value={form.email} onChange={handleChange} required fullWidth />
+                            <TextField label="Adresse" name="address" value={form.address} onChange={handleChange} required fullWidth />
+                            <TextField label="Webseite" name="website" value={form.website} onChange={handleChange} required fullWidth />
+                            <TextField label="Kontaktperson" name="contactPerson" value={form.contactPerson} onChange={handleChange} required fullWidth />
                             <FormControlLabel
                                 control={
                                     <Checkbox
@@ -136,60 +189,125 @@ export default function EditOrganizationPage() {
 
                             <Divider />
 
-                            {/* Bild-Upload */}
+                            {/* ── Titelbild ── */}
                             <Box>
-                                <Box sx={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', mb: 1.5 }}>
-                                    <Typography variant="subtitle2" fontWeight={500}>Bilder</Typography>
-                                    {files.length > 0 && (
-                                        <Typography variant="caption" color="text.secondary">
-                                            Das erste Bild wird als Vorschaubild verwendet
-                                        </Typography>
-                                    )}
-                                    {existingImages.map((src, i) => (
-                                        <Box key={`existing-${i}`}>
-                                            <img src={src} width={64} height={64} />
-                                            <IconButton onClick={() => handleRemoveExisting(i)}>
-                                                <DeleteOutlineIcon />
-                                            </IconButton>
-                                        </Box>
-                                    ))}
+                                <Box sx={{ display: 'flex', alignItems: 'center', gap: 1, mb: 1.5 }}>
+                                    <Chip
+                                        icon={<StarIcon sx={{ fontSize: '13px !important' }} />}
+                                        label="Titelbild"
+                                        size="small"
+                                        color="primary"
+                                        sx={{ height: 22, fontSize: 11 }}
+                                    />
+                                    <Typography variant="caption" color="text.secondary">
+                                        Wird als Vorschaubild der Organisation verwendet
+                                    </Typography>
                                 </Box>
 
-                                <Stack spacing={1.5}>
-                                    {previews.map((src, i) => (
+                                {hasTitleImage ? (
+                                    <Box
+                                        sx={{
+                                            display: 'flex', alignItems: 'center', gap: 1.5,
+                                            p: 1, borderRadius: 1,
+                                            border: '1px solid',
+                                            borderColor: 'primary.main',
+                                            bgcolor: 'primary.50',
+                                        }}
+                                    >
                                         <Box
-                                            key={i}
+                                            component="img"
+                                            src={titleImagePreview || titleImageUrl}
+                                            alt="Titelbild"
+                                            sx={{ width: 72, height: 72, objectFit: 'cover', borderRadius: 1, flexShrink: 0 }}
+                                        />
+                                        <Box sx={{ flex: 1, minWidth: 0 }}>
+                                            <Typography variant="body2" color="text.secondary" sx={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>
+                                                {titleImageFile ? titleImageFile.name : titleImageUrl}
+                                            </Typography>
+                                            {/* Titelbild tauschen ohne zu löschen */}
+                                            <Button
+                                                component="label"
+                                                size="small"
+                                                sx={{ mt: 0.5, px: 0, minWidth: 0, fontSize: 12 }}
+                                            >
+                                                Bild ersetzen
+                                                <input type="file" hidden accept="image/*" onChange={handleTitleImageChange} />
+                                            </Button>
+                                        </Box>
+                                        <IconButton size="small" color="error" onClick={handleRemoveTitleImage}>
+                                            <DeleteOutlineIcon fontSize="small" />
+                                        </IconButton>
+                                    </Box>
+                                ) : (
+                                    <Button
+                                        component="label"
+                                        startIcon={<AddPhotoAlternateOutlinedIcon />}
+                                        size="small"
+                                        variant="outlined"
+                                        sx={{ alignSelf: 'flex-start' }}
+                                    >
+                                        Titelbild hochladen
+                                        <input type="file" hidden accept="image/*" onChange={handleTitleImageChange} />
+                                    </Button>
+                                )}
+                            </Box>
+
+                            <Divider />
+
+                            {/* ── Weitere Bilder ── */}
+                            <Box>
+                                <Typography variant="subtitle2" fontWeight={500} mb={1.5}>
+                                    Weitere Bilder
+                                </Typography>
+
+                                <Stack spacing={1.5}>
+                                    {/* Bestehende weitere Bilder */}
+                                    {otherImageUrls.map((src, i) => (
+                                        <Box
+                                            key={`existing-${i}`}
                                             sx={{
                                                 display: 'flex', alignItems: 'center', gap: 1.5,
                                                 p: 1, borderRadius: 1,
                                                 border: '1px solid',
-                                                borderColor: i === 0 ? 'primary.main' : 'divider',
-                                                bgcolor: i === 0 ? 'primary.50' : 'transparent',
+                                                borderColor: 'divider',
                                             }}
                                         >
                                             <Box
                                                 component="img"
                                                 src={src}
-                                                alt={`Vorschau ${i + 1}`}
+                                                alt={`Bild ${i + 1}`}
                                                 sx={{ width: 64, height: 64, objectFit: 'cover', borderRadius: 1, flexShrink: 0 }}
                                             />
-                                            <Box sx={{ flex: 1, minWidth: 0 }}>
-                                                <Box sx={{ display: 'flex', alignItems: 'center', gap: 1, mb: 0.5 }}>
-                                                    {i === 0 && (
-                                                        <Chip
-                                                            icon={<StarIcon sx={{ fontSize: '13px !important' }} />}
-                                                            label="Vorschaubild"
-                                                            size="small"
-                                                            color="primary"
-                                                            sx={{ height: 20, fontSize: 11 }}
-                                                        />
-                                                    )}
-                                                </Box>
-                                                <Typography variant="body2" color="text.secondary" sx={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>
-                                                    {files[i]?.name}
-                                                </Typography>
-                                            </Box>
-                                            <IconButton size="small" color="error" onClick={() => handleRemoveFile(i)}>
+                                            <Typography variant="body2" color="text.secondary" sx={{ flex: 1, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>
+                                                {src}
+                                            </Typography>
+                                            <IconButton size="small" color="error" onClick={() => handleRemoveOtherUrl(i)}>
+                                                <DeleteOutlineIcon fontSize="small" />
+                                            </IconButton>
+                                        </Box>
+                                    ))}
+
+                                    {/* Neu hinzugefügte weitere Bilder */}
+                                    {otherPreviews.map((src, i) => (
+                                        <Box
+                                            key={`new-${i}`}
+                                            sx={{
+                                                display: 'flex', alignItems: 'center', gap: 1.5,
+                                                p: 1, borderRadius: 1,
+                                                border: '1px solid',
+                                                borderColor: 'divider',
+                                            }}
+                                        >
+                                            <Box
+                                                component="img"
+                                                src={src}
+                                                alt={`Neues Bild ${i + 1}`}
+                                                sx={{ width: 64, height: 64, objectFit: 'cover', borderRadius: 1, flexShrink: 0 }}
+                                            />
+                                            <Typography variant="body2" color="text.secondary" sx={{ flex: 1, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>
+                                                {otherFiles[i]?.name}
+                                            </Typography>
+                                            <IconButton size="small" color="error" onClick={() => handleRemoveOtherFile(i)}>
                                                 <DeleteOutlineIcon fontSize="small" />
                                             </IconButton>
                                         </Box>
@@ -201,8 +319,8 @@ export default function EditOrganizationPage() {
                                         size="small"
                                         sx={{ alignSelf: 'flex-start' }}
                                     >
-                                        {files.length === 0 ? 'Vorschaubild hinzufügen' : 'Weiteres Bild hinzufügen'}
-                                        <input type="file" hidden accept="image/*" multiple onChange={handleFileChange} />
+                                        Bild hinzufügen
+                                        <input type="file" hidden accept="image/*" multiple onChange={handleOtherFilesChange} />
                                     </Button>
                                 </Stack>
                             </Box>
@@ -212,16 +330,16 @@ export default function EditOrganizationPage() {
                                 <Button
                                     type="submit"
                                     variant="contained"
+                                    disabled={saving}
                                     startIcon={saving ? <CircularProgress size={16} color="inherit" /> : null}
                                 >
                                     Speichern
                                 </Button>
                             </Box>
-
                         </Stack>
                     </Box>
                 </CardContent>
             </Card>
         </Box>
-    )
+    );
 }
\ No newline at end of file
diff --git a/src/pages/HomePage.jsx b/src/pages/HomePage.jsx
new file mode 100644
index 0000000..6a0080a
--- /dev/null
+++ b/src/pages/HomePage.jsx
@@ -0,0 +1,14 @@
+import { Box, Typography } from '@mui/material';
+
+export default function HomePage() {
+    return (
+        <Box>
+            <Typography variant="h5" fontWeight={600} gutterBottom>
+                Willkommen im Admin Panel
+            </Typography>
+            <Typography variant="body1" color="text.secondary">
+                Wähle links im Menü einen Bereich aus.
+            </Typography>
+        </Box>
+    );
+}
\ No newline at end of file
diff --git a/src/pages/LoginPage.jsx b/src/pages/LoginPage.jsx
index 7059994..b305ce9 100644
--- a/src/pages/LoginPage.jsx
+++ b/src/pages/LoginPage.jsx
@@ -23,7 +23,7 @@ export default function LoginPage() {
     setLoading(true);
     try {
       await login(email, password);
-      navigate('/users');
+      navigate('/');
     } catch (err) {
       setError(err.response?.data?.message ?? 'Login fehlgeschlagen');
     } finally {
diff --git a/src/pages/OrganizationPage.jsx b/src/pages/OrganizationPage.jsx
index 05b4c96..6354d85 100644
--- a/src/pages/OrganizationPage.jsx
+++ b/src/pages/OrganizationPage.jsx
@@ -122,11 +122,11 @@ export default function OrganizationPage() {
             width: 120,
             sortable: false,
             renderCell: ({ row }) => (
-                <Tooltip title="Löschen">
-                    <IconButton size="small" color="error" onClick={() => handleDelete(row.id)}>
+                <Tooltip title="">
+                    <IconButton title="löschen" size="small" color="error" onClick={() => handleDelete(row.id)}>
                         <DeleteOutlineIcon fontSize="small" />
                     </IconButton>
-                    <IconButton size="small" color="grey" onClick={() => handleEdit(row.id)}>
+                    <IconButton title="bearbeiten" size="small" color="grey" onClick={() => handleEdit(row.id)}>
                         <EditOutlinedIcon fontSize="small" />
                     </IconButton>
                 </Tooltip>
diff --git a/src/pages/PostsPage.jsx b/src/pages/PostsPage.jsx
index d1eba8c..e201811 100644
--- a/src/pages/PostsPage.jsx
+++ b/src/pages/PostsPage.jsx
@@ -60,7 +60,7 @@ export default function PostsPage() {
     { field: 'author', headerName: 'Autor', width: 130 },
     { field: 'category', headerName: 'Kategorie', width: 130 },
     {
-      field: 'picture',
+      field: 'pictures',
       headerName: 'Bilder',
       width: 80,
       sortable: false,
@@ -140,11 +140,11 @@ export default function PostsPage() {
                 </Typography>
               </Box>
             </Box>
-            {Array.isArray(detailNews?.picture) && detailNews.picture.length > 0 && (
+            {Array.isArray(detailNews?.pictures) && detailNews.pictures.length > 0 && (
               <Box>
                 <Typography variant="caption" color="text.secondary">Bilder</Typography>
                 <Stack spacing={1} sx={{ mt: 0.5 }}>
-                  {detailNews.picture.map((url, i) => (
+                  {detailNews.pictures.map((url, i) => (
                     <Box
                       key={i}
                       component="img"