diff --git a/backend/app/main.py b/backend/app/main.py
index 0dbdd8e..f5badb4 100644
--- a/backend/app/main.py
+++ b/backend/app/main.py
@@ -1,10 +1,13 @@
-from fastapi import FastAPI
+from fastapi import FastAPI, Depends
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.staticfiles import StaticFiles
 from pathlib import Path
-from app.database import create_db_and_tables
+from app.database import create_db_and_tables, get_session
 from app.config import get_settings
 from app.routers import auth, departments, channels, messages, files, websocket, snippets, admin, direct_messages, kanban
+from app.auth import get_current_user
+from app.models import User
+from sqlmodel import Session, select
 
 settings = get_settings()
 
@@ -18,9 +21,10 @@ app = FastAPI(
 app.add_middleware(
     CORSMiddleware,
     allow_origins=[
-        settings.frontend_url, 
-        "http://localhost:5173", 
+        "http://localhost:5173",
         "http://localhost:3000",
+        "http://127.0.0.1:5173",
+        "http://127.0.0.1:3000",
         "https://collabrix.apex-project.de",
         "http://collabrix.apex-project.de"
     ],
@@ -71,3 +75,32 @@ def read_root():
 def health_check():
     """Health check endpoint"""
     return {"status": "healthy"}
+
+
+@app.get("/user-status")
+def get_user_statuses(session: Session = Depends(get_session), current_user: User = Depends(get_current_user)):
+    """Get online status for all users"""
+    from app.websocket import manager
+    
+    # Get all users
+    statement = select(User)
+    users = session.exec(statement).all()
+    
+    # Get their statuses
+    statuses = manager.get_all_user_statuses()
+    
+    # Build response
+    result = []
+    for user in users:
+        status = statuses.get(user.id, "offline")
+        # If user has no WebSocket connection but is the current user, mark as online
+        if status == "offline" and user.id == current_user.id:
+            status = "online"
+        result.append({
+            "user_id": user.id,
+            "username": user.username,
+            "full_name": user.full_name,
+            "status": status
+        })
+    
+    return result
diff --git a/backend/app/models.py b/backend/app/models.py
index 7083a79..1ce0894 100644
--- a/backend/app/models.py
+++ b/backend/app/models.py
@@ -10,6 +10,12 @@ class SnippetVisibility(str, Enum):
     ORGANIZATION = "organization"
 
 
+class UserRole(str, Enum):
+    USER = "user"
+    ADMIN = "admin"
+    SUPERADMIN = "superadmin"
+
+
 class Language(SQLModel, table=True):
     __tablename__ = "language"
 
@@ -64,7 +70,7 @@ class User(SQLModel, table=True):
     profile_picture: Optional[str] = None
     theme: str = Field(default="light")  # 'light' or 'dark'
     is_active: bool = Field(default=True)
-    is_admin: bool = Field(default=False)
+    role: UserRole = Field(default=UserRole.USER)
     created_at: datetime = Field(default_factory=datetime.utcnow)
     
     # Relationships
diff --git a/backend/app/routers/admin.py b/backend/app/routers/admin.py
index 3fd09c7..d1bf2fe 100644
--- a/backend/app/routers/admin.py
+++ b/backend/app/routers/admin.py
@@ -2,7 +2,7 @@ from fastapi import APIRouter, Depends, HTTPException, status
 from sqlmodel import Session, select
 from typing import List
 from app.database import get_session
-from app.models import User, Department, UserDepartmentLink, Channel, Snippet, SnippetDepartmentLink, Language, Translation
+from app.models import User, Department, UserDepartmentLink, Channel, Snippet, SnippetDepartmentLink, Language, Translation, UserRole
 from app.schemas import (
     DepartmentCreate, DepartmentResponse, 
     ChannelCreate, ChannelResponse,
@@ -32,7 +32,7 @@ class UserDepartmentAssignment(BaseModel):
 
 class UserAdminUpdate(BaseModel):
     user_id: int
-    is_admin: bool
+    role: UserRole
 
 
 class SnippetDepartmentAccess(BaseModel):
@@ -43,8 +43,8 @@ class SnippetDepartmentAccess(BaseModel):
 
 
 def require_admin(current_user: User = Depends(get_current_user)) -> User:
-    """Verify that the current user is an admin"""
-    if not current_user.is_admin:
+    """Verify that the current user is an admin or superadmin"""
+    if current_user.role not in [UserRole.ADMIN, UserRole.SUPERADMIN]:
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
             detail="Admin privileges required"
@@ -52,12 +52,22 @@ def require_admin(current_user: User = Depends(get_current_user)) -> User:
     return current_user
 
 
+def require_superadmin(current_user: User = Depends(get_current_user)) -> User:
+    """Verify that the current user is a superadmin"""
+    if current_user.role != UserRole.SUPERADMIN:
+        raise HTTPException(
+            status_code=status.HTTP_403_FORBIDDEN,
+            detail="Superadmin privileges required"
+        )
+    return current_user
+
+
 # ========== User Management ==========
 
 @router.get("/users", response_model=List[UserResponse])
 def get_all_users(
     session: Session = Depends(get_session),
-    admin: User = Depends(require_admin)
+    admin: User = Depends(require_superadmin)
 ):
     """Get all users (Admin only)"""
     statement = select(User)
@@ -65,14 +75,14 @@ def get_all_users(
     return users
 
 
-@router.patch("/users/{user_id}/admin")
-def toggle_admin_status(
+@router.patch("/users/{user_id}/role")
+def update_user_role(
     user_id: int,
-    is_admin: bool,
+    role: UserRole,
     session: Session = Depends(get_session),
-    admin: User = Depends(require_admin)
+    admin: User = Depends(require_superadmin)
 ):
-    """Make a user admin or remove admin privileges"""
+    """Update a user's role (Superadmin only)"""
     user = session.get(User, user_id)
     if not user:
         raise HTTPException(
@@ -80,12 +90,19 @@ def toggle_admin_status(
             detail="User not found"
         )
     
-    user.is_admin = is_admin
+    # Prevent superadmin from demoting themselves
+    if admin.id == user_id and role != UserRole.SUPERADMIN:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail="Cannot change your own superadmin role"
+        )
+    
+    user.role = role
     session.add(user)
     session.commit()
     session.refresh(user)
     
-    return {"message": f"User {user.username} admin status updated", "is_admin": is_admin}
+    return {"message": f"User {user.username} role updated to {role.value}", "role": role}
 
 
 # ========== Department Management ==========
@@ -94,7 +111,7 @@ def toggle_admin_status(
 def create_department(
     department_data: DepartmentCreate,
     session: Session = Depends(get_session),
-    admin: User = Depends(require_admin)
+    admin: User = Depends(require_superadmin)
 ):
     """Create a new department (Admin only)"""
     department = Department(**department_data.model_dump())
@@ -107,7 +124,7 @@ def create_department(
 @router.get("/departments", response_model=List[DepartmentResponse])
 def get_all_departments(
     session: Session = Depends(get_session),
-    admin: User = Depends(require_admin)
+    admin: User = Depends(require_superadmin)
 ):
     """Get all departments (Admin only)"""
     statement = select(Department)
@@ -120,7 +137,7 @@ def update_department(
     department_id: int,
     department_data: DepartmentCreate,
     session: Session = Depends(get_session),
-    admin: User = Depends(require_admin)
+    admin: User = Depends(require_superadmin)
 ):
     """Update a department (Admin only)"""
     department = session.get(Department, department_id)
@@ -145,7 +162,7 @@ def toggle_department_snippets(
     department_id: int,
     enabled: bool,
     session: Session = Depends(get_session),
-    admin: User = Depends(require_admin)
+    admin: User = Depends(require_superadmin)
 ):
     """Enable or disable snippet access for entire department (master switch)"""
     department = session.get(Department, department_id)
@@ -171,7 +188,7 @@ def toggle_department_snippets(
 def delete_department(
     department_id: int,
     session: Session = Depends(get_session),
-    admin: User = Depends(require_admin)
+    admin: User = Depends(require_superadmin)
 ):
     """Delete a department (Admin only)"""
     department = session.get(Department, department_id)
@@ -209,7 +226,7 @@ def assign_user_to_department(
     department_id: int,
     user_id: int,
     session: Session = Depends(get_session),
-    admin: User = Depends(require_admin)
+    admin: User = Depends(require_superadmin)
 ):
     """Assign a user to a department (Admin only)"""
     # Check if department exists
@@ -254,7 +271,7 @@ def remove_user_from_department(
     department_id: int,
     user_id: int,
     session: Session = Depends(get_session),
-    admin: User = Depends(require_admin)
+    admin: User = Depends(require_superadmin)
 ):
     """Remove a user from a department (Admin only)"""
     statement = select(UserDepartmentLink).where(
@@ -279,7 +296,7 @@ def remove_user_from_department(
 def get_department_members(
     department_id: int,
     session: Session = Depends(get_session),
-    admin: User = Depends(require_admin)
+    admin: User = Depends(require_superadmin)
 ):
     """Get all members of a department (Admin only)"""
     department = session.get(Department, department_id)
@@ -352,7 +369,7 @@ def delete_channel(
 @router.get("/languages", response_model=List[LanguageResponse])
 def get_languages(
     session: Session = Depends(get_session),
-    admin: User = Depends(require_admin)
+    admin: User = Depends(require_superadmin)
 ):
     """List all available UI languages."""
     ensure_default_languages(session)
@@ -364,7 +381,7 @@ def get_languages(
 def create_language(
     language_data: LanguageCreate,
     session: Session = Depends(get_session),
-    admin: User = Depends(require_admin)
+    admin: User = Depends(require_superadmin)
 ):
     """Create a new UI language."""
     code = language_data.code.strip().lower()
@@ -408,7 +425,7 @@ def create_language(
 def delete_language(
     language_id: int,
     session: Session = Depends(get_session),
-    admin: User = Depends(require_admin)
+    admin: User = Depends(require_superadmin)
 ):
     """Remove a UI language."""
     language = session.get(Language, language_id)
@@ -438,7 +455,7 @@ def delete_language(
 @router.get("/translations", response_model=List[TranslationGroupResponse])
 def get_translations(
     session: Session = Depends(get_session),
-    admin: User = Depends(require_admin)
+    admin: User = Depends(require_superadmin)
 ):
     """Retrieve translation values grouped by attribute."""
     ensure_default_languages(session)
@@ -498,7 +515,7 @@ def get_translations(
 def update_translation(
     payload: TranslationUpdateRequest,
     session: Session = Depends(get_session),
-    admin: User = Depends(require_admin)
+    admin: User = Depends(require_superadmin)
 ):
     """Update a single translation entry."""
     translation = session.get(Translation, payload.translation_id)
@@ -527,7 +544,7 @@ def update_translation(
 def get_snippet_departments(
     snippet_id: int,
     session: Session = Depends(get_session),
-    admin: User = Depends(require_admin)
+    admin: User = Depends(require_superadmin)
 ):
     """Get all departments and their access status for a snippet.
     By default, snippets are disabled for all departments.
@@ -563,7 +580,7 @@ def get_snippet_departments(
 def toggle_snippet_department_access(
     access_data: SnippetDepartmentAccess,
     session: Session = Depends(get_session),
-    admin: User = Depends(require_admin)
+    admin: User = Depends(require_superadmin)
 ):
     """Enable or disable a snippet for a specific department.
     By default, all snippets are disabled for all departments.
diff --git a/backend/app/routers/channels.py b/backend/app/routers/channels.py
index 8b10f98..b599e5b 100644
--- a/backend/app/routers/channels.py
+++ b/backend/app/routers/channels.py
@@ -2,7 +2,7 @@ from fastapi import APIRouter, Depends, HTTPException, status
 from sqlmodel import Session, select
 from typing import List
 from app.database import get_session
-from app.models import Channel, Department, User, KanbanBoard, KanbanColumn
+from app.models import Channel, Department, User, KanbanBoard, KanbanColumn, UserRole
 from app.schemas import ChannelCreate, ChannelResponse
 from app.auth import get_current_user
 
@@ -107,7 +107,7 @@ def get_channel(
     user = session.exec(statement).first()
     
     user_dept_ids = [dept.id for dept in user.departments] if user else []
-    if channel.department_id not in user_dept_ids:
+    if channel.department_id not in user_dept_ids and current_user.role != UserRole.SUPERADMIN:
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
             detail="You don't have access to this channel"
@@ -128,7 +128,7 @@ def get_channels_by_department(
     user = session.exec(statement).first()
     
     user_dept_ids = [dept.id for dept in user.departments] if user else []
-    if department_id not in user_dept_ids:
+    if department_id not in user_dept_ids and current_user.role != UserRole.SUPERADMIN:
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
             detail="You don't have access to this department"
diff --git a/backend/app/routers/direct_messages.py b/backend/app/routers/direct_messages.py
index 1153e50..3558b11 100644
--- a/backend/app/routers/direct_messages.py
+++ b/backend/app/routers/direct_messages.py
@@ -1,8 +1,9 @@
 from fastapi import APIRouter, Depends, HTTPException, status
 from sqlmodel import Session, select, or_, and_
+from sqlalchemy.orm import joinedload
 from typing import List
 from app.database import get_session
-from app.models import DirectMessage, User
+from app.models import DirectMessage, User, Snippet
 from app.schemas import DirectMessageCreate, DirectMessageResponse
 from app.auth import get_current_user
 from app.websocket import manager
@@ -50,6 +51,20 @@ async def create_direct_message(
     response.sender_full_name = current_user.full_name
     response.sender_profile_picture = current_user.profile_picture
     
+    # Load snippet data if present
+    snippet_data = None
+    if new_message.snippet_id:
+        snippet = session.get(Snippet, new_message.snippet_id)
+        if snippet:
+            snippet_data = {
+                "id": snippet.id,
+                "title": snippet.title,
+                "content": snippet.content,
+                "language": snippet.language,
+                "created_at": snippet.created_at.isoformat(),
+                "updated_at": snippet.updated_at.isoformat()
+            }
+    
     # Broadcast via WebSocket to receiver (using negative user ID as "channel")
     response_data = {
         "id": new_message.id,
@@ -63,7 +78,7 @@ async def create_direct_message(
         "created_at": new_message.created_at.isoformat(),
         "is_read": new_message.is_read,
         "snippet_id": new_message.snippet_id,
-        "snippet": None
+        "snippet": snippet_data
     }
     
     # Broadcast to both sender and receiver using their user IDs as "channel"
@@ -76,6 +91,9 @@ async def create_direct_message(
         -current_user.id
     )
     
+    # Update user activity
+    manager.update_activity(current_user.id)
+    
     return response
 
 
@@ -105,6 +123,7 @@ def get_conversation(
                 and_(DirectMessage.sender_id == user_id, DirectMessage.receiver_id == current_user.id)
             )
         )
+        .options(joinedload(DirectMessage.snippet))
         .order_by(DirectMessage.created_at.desc())
         .offset(offset)
         .limit(limit)
diff --git a/backend/app/routers/files.py b/backend/app/routers/files.py
index 9cbf2d2..2d7fc45 100644
--- a/backend/app/routers/files.py
+++ b/backend/app/routers/files.py
@@ -7,7 +7,7 @@ import uuid
 import aiofiles
 from urllib.parse import quote
 from app.database import get_session
-from app.models import FileAttachment, Message, User, Channel
+from app.models import FileAttachment, Message, User, Channel, UserRole
 from app.schemas import FileAttachmentResponse, MessageResponse
 from app.auth import get_current_user
 from app.config import get_settings
@@ -266,7 +266,8 @@ async def upload_file_with_message(
             reply_to_data = {
                 "id": reply_msg.id,
                 "content": reply_msg.content,
-                "sender_username": reply_sender.username if reply_sender else "Unknown"
+                "sender_username": reply_sender.username if reply_sender else "Unknown",
+                "sender_full_name": reply_sender.full_name if reply_sender else None
             }
     
     attachment_data = {
@@ -409,7 +410,7 @@ async def update_file_permission(
         )
     
     # Check if user is the uploader or an admin
-    if file_attachment.uploader_id != current_user.id and not current_user.is_admin:
+    if file_attachment.uploader_id != current_user.id and current_user.role not in [UserRole.ADMIN, UserRole.SUPERADMIN]:
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
             detail="Only the uploader or an admin can change file permissions"
diff --git a/backend/app/routers/kanban.py b/backend/app/routers/kanban.py
index eab5151..160eede 100644
--- a/backend/app/routers/kanban.py
+++ b/backend/app/routers/kanban.py
@@ -4,7 +4,7 @@ from typing import List
 from app.database import get_session
 from app.models import (
     KanbanBoard, KanbanColumn, KanbanCard, Channel, User,
-    KanbanChecklist, KanbanChecklistItem
+    KanbanChecklist, KanbanChecklistItem, UserRole
 )
 from app.schemas import (
     KanbanBoardCreate, KanbanBoardUpdate, KanbanBoardResponse,
@@ -38,7 +38,7 @@ def create_board(
 
     # Check if user has access to the channel's department
     user_departments = [dept.id for dept in current_user.departments]
-    if channel.department_id not in user_departments and not current_user.is_admin:
+    if channel.department_id not in user_departments and current_user.role not in [UserRole.ADMIN, UserRole.SUPERADMIN]:
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
             detail="Access denied to this channel"
@@ -82,7 +82,7 @@ def get_board_by_channel(
         )
 
     user_departments = [dept.id for dept in current_user.departments]
-    if channel.department_id not in user_departments and not current_user.is_admin:
+    if channel.department_id not in user_departments and current_user.role not in [UserRole.ADMIN, UserRole.SUPERADMIN]:
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
             detail="Access denied to this channel"
@@ -141,7 +141,7 @@ def update_board(
     # Check access via channel
     channel = session.get(Channel, board.channel_id)
     user_departments = [dept.id for dept in current_user.departments]
-    if channel.department_id not in user_departments and not current_user.is_admin:
+    if channel.department_id not in user_departments and current_user.role not in [UserRole.ADMIN, UserRole.SUPERADMIN]:
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
             detail="Access denied"
@@ -174,7 +174,7 @@ def create_column(
 
     channel = session.get(Channel, board.channel_id)
     user_departments = [dept.id for dept in current_user.departments]
-    if channel.department_id not in user_departments and not current_user.is_admin:
+    if channel.department_id not in user_departments and current_user.role not in [UserRole.ADMIN, UserRole.SUPERADMIN]:
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
             detail="Access denied"
@@ -213,7 +213,7 @@ def update_column(
     board = session.get(KanbanBoard, column.board_id)
     channel = session.get(Channel, board.channel_id)
     user_departments = [dept.id for dept in current_user.departments]
-    if channel.department_id not in user_departments and not current_user.is_admin:
+    if channel.department_id not in user_departments and current_user.role not in [UserRole.ADMIN, UserRole.SUPERADMIN]:
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
             detail="Access denied"
@@ -246,7 +246,7 @@ def delete_column(
     board = session.get(KanbanBoard, column.board_id)
     channel = session.get(Channel, board.channel_id)
     user_departments = [dept.id for dept in current_user.departments]
-    if channel.department_id not in user_departments and not current_user.is_admin:
+    if channel.department_id not in user_departments and current_user.role not in [UserRole.ADMIN, UserRole.SUPERADMIN]:
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
             detail="Access denied"
@@ -276,7 +276,7 @@ def create_card(
     board = session.get(KanbanBoard, column.board_id)
     channel = session.get(Channel, board.channel_id)
     user_departments = [dept.id for dept in current_user.departments]
-    if channel.department_id not in user_departments and not current_user.is_admin:
+    if channel.department_id not in user_departments and current_user.role not in [UserRole.ADMIN, UserRole.SUPERADMIN]:
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
             detail="Access denied"
@@ -320,7 +320,7 @@ def update_card(
     board = session.get(KanbanBoard, column.board_id)
     channel = session.get(Channel, board.channel_id)
     user_departments = [dept.id for dept in current_user.departments]
-    if channel.department_id not in user_departments and not current_user.is_admin:
+    if channel.department_id not in user_departments and current_user.role not in [UserRole.ADMIN, UserRole.SUPERADMIN]:
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
             detail="Access denied"
@@ -354,7 +354,7 @@ def delete_card(
     board = session.get(KanbanBoard, column.board_id)
     channel = session.get(Channel, board.channel_id)
     user_departments = [dept.id for dept in current_user.departments]
-    if channel.department_id not in user_departments and not current_user.is_admin:
+    if channel.department_id not in user_departments and current_user.role not in [UserRole.ADMIN, UserRole.SUPERADMIN]:
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
             detail="Access denied"
@@ -401,7 +401,7 @@ def move_card(
 
     channel = session.get(Channel, source_board.channel_id)
     user_departments = [dept.id for dept in current_user.departments]
-    if channel.department_id not in user_departments and not current_user.is_admin:
+    if channel.department_id not in user_departments and current_user.role not in [UserRole.ADMIN, UserRole.SUPERADMIN]:
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
             detail="Access denied"
@@ -436,7 +436,7 @@ def create_checklist(
     board = session.get(KanbanBoard, card.column.board_id)
     channel = session.get(Channel, board.channel_id)
     user_departments = [dept.id for dept in current_user.departments]
-    if channel.department_id not in user_departments and not current_user.is_admin:
+    if channel.department_id not in user_departments and current_user.role not in [UserRole.ADMIN, UserRole.SUPERADMIN]:
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
             detail="Access denied"
@@ -473,7 +473,7 @@ def get_checklist(
     board = session.get(KanbanBoard, checklist.card.column.board_id)
     channel = session.get(Channel, board.channel_id)
     user_departments = [dept.id for dept in current_user.departments]
-    if channel.department_id not in user_departments and not current_user.is_admin:
+    if channel.department_id not in user_departments and current_user.role not in [UserRole.ADMIN, UserRole.SUPERADMIN]:
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
             detail="Access denied"
@@ -501,7 +501,7 @@ def update_checklist(
     board = session.get(KanbanBoard, checklist.card.column.board_id)
     channel = session.get(Channel, board.channel_id)
     user_departments = [dept.id for dept in current_user.departments]
-    if channel.department_id not in user_departments and not current_user.is_admin:
+    if channel.department_id not in user_departments and current_user.role not in [UserRole.ADMIN, UserRole.SUPERADMIN]:
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
             detail="Access denied"
@@ -537,7 +537,7 @@ def delete_checklist(
     board = session.get(KanbanBoard, checklist.card.column.board_id)
     channel = session.get(Channel, board.channel_id)
     user_departments = [dept.id for dept in current_user.departments]
-    if channel.department_id not in user_departments and not current_user.is_admin:
+    if channel.department_id not in user_departments and current_user.role not in [UserRole.ADMIN, UserRole.SUPERADMIN]:
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
             detail="Access denied"
@@ -569,7 +569,7 @@ def create_checklist_item(
     board = session.get(KanbanBoard, checklist.card.column.board_id)
     channel = session.get(Channel, board.channel_id)
     user_departments = [dept.id for dept in current_user.departments]
-    if channel.department_id not in user_departments and not current_user.is_admin:
+    if channel.department_id not in user_departments and current_user.role not in [UserRole.ADMIN, UserRole.SUPERADMIN]:
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
             detail="Access denied"
@@ -608,7 +608,7 @@ def update_checklist_item(
     board = session.get(KanbanBoard, item.checklist.card.column.board_id)
     channel = session.get(Channel, board.channel_id)
     user_departments = [dept.id for dept in current_user.departments]
-    if channel.department_id not in user_departments and not current_user.is_admin:
+    if channel.department_id not in user_departments and current_user.role not in [UserRole.ADMIN, UserRole.SUPERADMIN]:
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
             detail="Access denied"
@@ -646,7 +646,7 @@ def delete_checklist_item(
     board = session.get(KanbanBoard, item.checklist.card.column.board_id)
     channel = session.get(Channel, board.channel_id)
     user_departments = [dept.id for dept in current_user.departments]
-    if channel.department_id not in user_departments and not current_user.is_admin:
+    if channel.department_id not in user_departments and current_user.role not in [UserRole.ADMIN, UserRole.SUPERADMIN]:
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
             detail="Access denied"
@@ -677,7 +677,7 @@ def get_card_checklists(
     board = session.get(KanbanBoard, card.column.board_id)
     channel = session.get(Channel, board.channel_id)
     user_departments = [dept.id for dept in current_user.departments]
-    if channel.department_id not in user_departments and not current_user.is_admin:
+    if channel.department_id not in user_departments and current_user.role not in [UserRole.ADMIN, UserRole.SUPERADMIN]:
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
             detail="Access denied"
diff --git a/backend/app/routers/messages.py b/backend/app/routers/messages.py
index b165a6b..2b1c640 100644
--- a/backend/app/routers/messages.py
+++ b/backend/app/routers/messages.py
@@ -4,7 +4,7 @@ from sqlalchemy.orm import joinedload
 from typing import List
 import os
 from app.database import get_session
-from app.models import Message, Channel, User, FileAttachment
+from app.models import Message, Channel, User, FileAttachment, Snippet
 from app.schemas import MessageCreate, MessageResponse
 from app.auth import get_current_user
 from app.websocket import manager
@@ -66,7 +66,22 @@ async def create_message(
             reply_to_data = {
                 "id": reply_msg.id,
                 "content": reply_msg.content,
-                "sender_username": reply_sender.username if reply_sender else "Unknown"
+                "sender_username": reply_sender.username if reply_sender else "Unknown",
+                "sender_full_name": reply_sender.full_name if reply_sender else None
+            }
+    
+    # Load snippet data if present
+    snippet_data = None
+    if new_message.snippet_id:
+        snippet = session.get(Snippet, new_message.snippet_id)
+        if snippet:
+            snippet_data = {
+                "id": snippet.id,
+                "title": snippet.title,
+                "content": snippet.content,
+                "language": snippet.language,
+                "created_at": snippet.created_at.isoformat(),
+                "updated_at": snippet.updated_at.isoformat()
             }
     
     response_data = {
@@ -81,7 +96,7 @@ async def create_message(
         "snippet_id": new_message.snippet_id,
         "reply_to_id": new_message.reply_to_id,
         "reply_to": reply_to_data,
-        "snippet": None,
+        "snippet": snippet_data,
         "attachments": [],
         "is_deleted": False
     }
@@ -95,6 +110,9 @@ async def create_message(
         message_data.channel_id
     )
     
+    # Update user activity
+    manager.update_activity(current_user.id)
+    
     # Return proper response
     response = MessageResponse.model_validate(new_message)
     response.sender_username = current_user.username
@@ -124,6 +142,7 @@ def get_channel_messages(
         select(Message)
         .where(Message.channel_id == channel_id)
         .options(joinedload(Message.attachments))
+        .options(joinedload(Message.snippet))
         .order_by(Message.created_at.desc())
         .offset(offset)
         .limit(limit)
@@ -147,7 +166,8 @@ def get_channel_messages(
                 msg_response.reply_to = {
                     "id": reply_msg.id,
                     "content": reply_msg.content,
-                    "sender_username": reply_sender.username if reply_sender else "Unknown"
+                    "sender_username": reply_sender.username if reply_sender else "Unknown",
+                    "sender_full_name": reply_sender.full_name if reply_sender else None
                 }
         
         responses.append(msg_response)
diff --git a/backend/app/routers/snippets.py b/backend/app/routers/snippets.py
index 34c6cda..42f77ae 100644
--- a/backend/app/routers/snippets.py
+++ b/backend/app/routers/snippets.py
@@ -3,7 +3,7 @@ from sqlmodel import Session, select, or_, and_
 from typing import List, Optional
 from datetime import datetime
 from app.database import get_session
-from app.models import Snippet, User, Department, SnippetVisibility, SnippetDepartmentLink
+from app.models import Snippet, User, Department, SnippetVisibility, SnippetDepartmentLink, UserRole
 from app.schemas import (
     SnippetCreate,
     SnippetUpdate,
@@ -83,7 +83,7 @@ def create_snippet(
         
         # Check if user belongs to that department
         user_dept_ids = [dept.id for dept in current_user.departments]
-        if snippet_data.department_id not in user_dept_ids:
+        if snippet_data.department_id not in user_dept_ids and current_user.role != UserRole.SUPERADMIN:
             raise HTTPException(
                 status_code=status.HTTP_403_FORBIDDEN,
                 detail="You don't belong to this department"
diff --git a/backend/app/routers/websocket.py b/backend/app/routers/websocket.py
index 34d4fa0..8ee784d 100644
--- a/backend/app/routers/websocket.py
+++ b/backend/app/routers/websocket.py
@@ -2,12 +2,12 @@ from fastapi import APIRouter, WebSocket, WebSocketDisconnect, Depends, Query
 from sqlmodel import Session
 from app.database import get_session
 from app.websocket import manager
-from app.auth import decode_access_token
-from app.models import User, Channel
+from app.auth import decode_access_token, get_current_user
+from app.models import User, Channel, UserRole
 from sqlmodel import select
 import json
 
-router = APIRouter()
+router = APIRouter(tags=["WebSocket"])
 
 
 @router.websocket("/ws/{channel_id}")
@@ -34,12 +34,13 @@ async def websocket_endpoint(
             return
         
         # Negative channel_id means direct messages (user_id)
+        # channel_id 0 means presence-only connection
         if channel_id < 0:
             # Direct message connection - verify it's the user's own connection
             if -channel_id != user.id:
                 await websocket.close(code=1008, reason="Access denied")
                 return
-        else:
+        elif channel_id > 0:
             # Regular channel - verify channel exists and user has access
             channel = session.get(Channel, channel_id)
             if not channel:
@@ -47,12 +48,16 @@ async def websocket_endpoint(
                 return
             
             user_dept_ids = [dept.id for dept in user.departments]
-            if channel.department_id not in user_dept_ids:
+            if channel.department_id not in user_dept_ids and user.role != UserRole.SUPERADMIN:
                 await websocket.close(code=1008, reason="Access denied")
                 return
+        # channel_id 0 is allowed for presence-only connections
     
     # Connect to channel
-    await manager.connect(websocket, channel_id)
+    await manager.connect(websocket, channel_id, user.id)
+    
+    # Broadcast user status update (online)
+    await manager.broadcast_user_status_update(user.id, "online")
     
     try:
         # Send welcome message
@@ -89,7 +94,11 @@ async def websocket_endpoint(
                 )
     
     except WebSocketDisconnect:
-        manager.disconnect(websocket, channel_id)
+        manager.disconnect(websocket, channel_id, user.id)
+        # Broadcast user status update (offline)
+        await manager.broadcast_user_status_update(user.id, "offline")
     except Exception as e:
-        manager.disconnect(websocket, channel_id)
+        manager.disconnect(websocket, channel_id, user.id)
+        # Broadcast user status update (offline)
+        await manager.broadcast_user_status_update(user.id, "offline")
         print(f"WebSocket error: {e}")
diff --git a/backend/app/schemas.py b/backend/app/schemas.py
index 54901ee..680a8c1 100644
--- a/backend/app/schemas.py
+++ b/backend/app/schemas.py
@@ -1,6 +1,13 @@
 from pydantic import BaseModel, EmailStr
 from typing import Optional, List
 from datetime import datetime
+from enum import Enum
+
+
+class UserRole(str, Enum):
+    USER = "user"
+    ADMIN = "admin"
+    SUPERADMIN = "superadmin"
 
 
 # User Schemas
@@ -31,7 +38,7 @@ class UserLogin(BaseModel):
 class UserResponse(UserBase):
     id: int
     is_active: bool
-    is_admin: bool = False
+    role: UserRole = UserRole.USER
     created_at: datetime
     
     class Config:
diff --git a/backend/app/websocket.py b/backend/app/websocket.py
index 2f6b329..6c2f09b 100644
--- a/backend/app/websocket.py
+++ b/backend/app/websocket.py
@@ -1,21 +1,33 @@
 from fastapi import WebSocket, WebSocketDisconnect
-from typing import Dict, List
+from typing import Dict, List, Optional
 import json
+import time
+from datetime import datetime, timedelta
 
 
 class ConnectionManager:
     def __init__(self):
         # Maps channel_id to list of WebSocket connections
         self.active_connections: Dict[int, List[WebSocket]] = {}
+        # Maps user_id to their connection info
+        self.user_connections: Dict[int, Dict] = {}
     
-    async def connect(self, websocket: WebSocket, channel_id: int):
+    async def connect(self, websocket: WebSocket, channel_id: int, user_id: int):
         """Accept a new WebSocket connection for a channel"""
         await websocket.accept()
         if channel_id not in self.active_connections:
             self.active_connections[channel_id] = []
         self.active_connections[channel_id].append(websocket)
+        
+        # Track user connection
+        self.user_connections[user_id] = {
+            'websocket': websocket,
+            'channel_id': channel_id,
+            'last_activity': time.time(),
+            'connected_at': time.time()
+        }
     
-    def disconnect(self, websocket: WebSocket, channel_id: int):
+    def disconnect(self, websocket: WebSocket, channel_id: int, user_id: int):
         """Remove a WebSocket connection"""
         if channel_id in self.active_connections:
             if websocket in self.active_connections[channel_id]:
@@ -24,6 +36,30 @@ class ConnectionManager:
             # Clean up empty channel lists
             if not self.active_connections[channel_id]:
                 del self.active_connections[channel_id]
+        
+        # Remove user connection
+        if user_id in self.user_connections:
+            del self.user_connections[user_id]
+    
+    def update_activity(self, user_id: int):
+        """Update last activity time for a user"""
+        if user_id in self.user_connections:
+            self.user_connections[user_id]['last_activity'] = time.time()
+    
+    def get_user_status(self, user_id: int) -> str:
+        """Get user online status"""
+        if user_id not in self.user_connections:
+            return 'offline'
+        
+        # User is online as long as they have an active connection
+        return 'online'
+    
+    def get_all_user_statuses(self) -> Dict[int, str]:
+        """Get status for all users"""
+        statuses = {}
+        for user_id in self.user_connections:
+            statuses[user_id] = self.get_user_status(user_id)
+        return statuses
     
     async def send_personal_message(self, message: str, websocket: WebSocket):
         """Send a message to a specific WebSocket"""
@@ -42,9 +78,43 @@ class ConnectionManager:
                     # Mark for removal if send fails
                     disconnected.append(connection)
             
-            # Remove disconnected clients
+            # Also broadcast to channel 0 (global listeners) for messages
+            if message.get("type") in ["message", "direct_message"] and 0 in self.active_connections:
+                for connection in self.active_connections[0]:
+                    try:
+                        await connection.send_text(message_str)
+                    except Exception:
+                        pass
+            
+    async def broadcast_user_status_update(self, user_id: int, status: str):
+        """Broadcast user status update to all connected clients"""
+        message = {
+            "type": "user_status_update",
+            "user_id": user_id,
+            "status": status,
+            "timestamp": time.time()
+        }
+        
+        # Broadcast to all channels (presence connections are on channel 0)
+        for channel_id in self.active_connections:
+            message_str = json.dumps(message)
+            disconnected = []
+            
+            for connection in self.active_connections[channel_id]:
+                try:
+                    await connection.send_text(message_str)
+                except Exception:
+                    disconnected.append(connection)
+            
+            # Clean up disconnected clients
             for connection in disconnected:
-                self.disconnect(connection, channel_id)
+                user_id_to_remove = None
+                for uid, conn_info in self.user_connections.items():
+                    if conn_info['websocket'] == connection:
+                        user_id_to_remove = uid
+                        break
+                if user_id_to_remove:
+                    self.disconnect(connection, channel_id, user_id_to_remove)
 
 
 # Global connection manager instance
diff --git a/backend/scripts/migrate_user_roles.py b/backend/scripts/migrate_user_roles.py
new file mode 100644
index 0000000..5cf0f19
--- /dev/null
+++ b/backend/scripts/migrate_user_roles.py
@@ -0,0 +1,91 @@
+#!/usr/bin/env python3
+"""
+Migration script to migrate is_admin to role column in user table
+"""
+import sys
+import os
+
+# Add parent directory to path to import app modules
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from sqlalchemy import text
+from app.database import engine
+
+
+def migrate():
+    """Migrate is_admin column to role column in user table"""
+    with engine.connect() as conn:
+        # Check if role column already exists
+        result = conn.execute(text("""
+            SELECT column_name
+            FROM information_schema.columns
+            WHERE table_name='user' AND column_name='role'
+        """))
+
+        if result.fetchone():
+            print("✅ Column 'role' already exists in user table")
+            # Check if is_admin column still exists
+            result2 = conn.execute(text("""
+                SELECT column_name
+                FROM information_schema.columns
+                WHERE table_name='user' AND column_name='is_admin'
+            """))
+            if result2.fetchone():
+                # Migrate existing admin users
+                conn.execute(text("""
+                    UPDATE "user" SET role = 'ADMIN' WHERE is_admin = true
+                """))
+                # Set default role for non-admin users
+                conn.execute(text("""
+                    UPDATE "user" SET role = 'USER' WHERE role IS NULL OR role = 'user'
+                """))
+                # Drop the old is_admin column
+                conn.execute(text("""
+                    ALTER TABLE "user" DROP COLUMN is_admin
+                """))
+                conn.commit()
+                print("✅ Migrated existing data and dropped is_admin column")
+            else:
+                # Correct any wrong values
+                conn.execute(text("""
+                    UPDATE "user" SET role = 'ADMIN' WHERE role = 'admin'
+                """))
+                conn.execute(text("""
+                    UPDATE "user" SET role = 'USER' WHERE role = 'user'
+                """))
+                conn.execute(text("""
+                    UPDATE "user" SET role = 'SUPERADMIN' WHERE role = 'superadmin'
+                """))
+                conn.commit()
+                print("✅ Corrected role values to enum names")
+            return
+
+        # Add role column
+        conn.execute(text("""
+            ALTER TABLE "user" ADD COLUMN role VARCHAR(20) DEFAULT 'USER'
+        """))
+
+        # Migrate existing admin users
+        conn.execute(text("""
+            UPDATE "user" SET role = 'ADMIN' WHERE is_admin = true
+        """))
+
+        # Set default role for non-admin users
+        conn.execute(text("""
+            UPDATE "user" SET role = 'USER' WHERE role IS NULL
+        """))
+
+        # Drop the old is_admin column
+        conn.execute(text("""
+            ALTER TABLE "user" DROP COLUMN is_admin
+        """))
+
+        conn.commit()  # Commit the changes
+
+        print("✅ Successfully migrated is_admin to role column")
+        print("✅ Existing admins have been assigned 'admin' role")
+        print("✅ Other users have been assigned 'user' role")
+
+
+if __name__ == "__main__":
+    migrate()
\ No newline at end of file
diff --git a/backend/scripts/set_ronny_superadmin.py b/backend/scripts/set_ronny_superadmin.py
new file mode 100644
index 0000000..6b610b6
--- /dev/null
+++ b/backend/scripts/set_ronny_superadmin.py
@@ -0,0 +1,27 @@
+#!/usr/bin/env python3
+"""
+Script to set Ronny's role to SUPERADMIN
+"""
+import sys
+import os
+
+# Add parent directory to path to import app modules
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from sqlalchemy import text
+from app.database import engine
+
+
+def set_ronny_superadmin():
+    """Set Ronny's role to SUPERADMIN"""
+    with engine.connect() as conn:
+        # Update Ronny's role
+        conn.execute(text("""
+            UPDATE "user" SET role = 'SUPERADMIN' WHERE username = 'Ronny'
+        """))
+        conn.commit()
+        print("✅ Ronny's role updated to SUPERADMIN")
+
+
+if __name__ == "__main__":
+    set_ronny_superadmin()
\ No newline at end of file
diff --git a/frontend/package.json b/frontend/package.json
index 89cd445..2d5fe6c 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -9,11 +9,15 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "@emotion/react": "^11.14.0",
+    "@emotion/styled": "^11.14.1",
+    "@mui/icons-material": "^7.3.6",
+    "@mui/material": "^7.3.6",
+    "axios": "^1.6.2",
+    "prism-react-renderer": "^1.3.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-router-dom": "^6.20.0",
-    "axios": "^1.6.2",
-    "prism-react-renderer": "^1.3.5"
+    "react-router-dom": "^6.20.0"
   },
   "devDependencies": {
     "@types/react": "^18.2.43",
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 74bffe8..b89af3b 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -1,6 +1,7 @@
 import React, { useEffect } from 'react';
 import { BrowserRouter, Routes, Route, Navigate, useLocation, useNavigate } from 'react-router-dom';
 import { useAuth } from './contexts/AuthContext';
+import { isAdmin } from './types';
 import Login from './components/Auth/Login';
 import Register from './components/Auth/Register';
 import ChatView from './components/Chat/ChatView';
@@ -22,7 +23,7 @@ const AdminRoute: React.FC<{ children: React.ReactNode }> = ({ children }) => {
     return <Navigate to="/login" />;
   }
   
-  if (!user?.is_admin) {
+  if (!isAdmin(user)) {
     return <Navigate to="/" />;
   }
   
@@ -38,7 +39,7 @@ const AppContent: React.FC = () => {
     // Speichere nur Pfade innerhalb der geschützten Bereiche (nicht login/register)
     if (isAuthenticated && !location.pathname.startsWith('/login') && !location.pathname.startsWith('/register')) {
       // Prüfe Admin-Berechtigung für Admin-Pfade
-      if (location.pathname.startsWith('/admin') && !user?.is_admin) {
+      if (location.pathname.startsWith('/admin') && !isAdmin(user)) {
         return; // Speichere keine ungültigen Admin-Pfade
       }
       localStorage.setItem('lastVisitedPath', location.pathname + location.search);
@@ -85,7 +86,7 @@ const RouteRestorer: React.FC = () => {
         if (lastVisitedPath && lastVisitedPath !== '/') {
           // Prüfe, ob der Pfad gültig ist
           const isAdminPath = lastVisitedPath.startsWith('/admin');
-          if (isAdminPath && !user.is_admin) {
+          if (isAdminPath && !isAdmin(user)) {
             // Benutzer hat keinen Admin-Zugriff, bleibe auf der Hauptseite
             localStorage.removeItem('lastVisitedPath');
             sessionStorage.setItem('routeRestored', 'true');
diff --git a/frontend/src/components/Admin/AdminPanel.old.tsx b/frontend/src/components/Admin/AdminPanel.old.tsx
deleted file mode 100644
index 731c8ad..0000000
--- a/frontend/src/components/Admin/AdminPanel.old.tsx
+++ /dev/null
@@ -1,1387 +0,0 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import api, { adminLanguagesAPI, adminTranslationsAPI, snippetsAPI } from '../../services/api';
-import type {
-  Channel,
-  Department,
-  Language,
-  Snippet,
-  TranslationGroup,
-  User,
-} from '../../types';
-
-type TabKey = 'users' | 'departments' | 'channels' | 'snippets' | 'languages';
-
-type DepartmentSnippetEntry = {
-  snippet_id: number;
-  snippet_title: string;
-  snippet_language: string;
-  snippet_owner: string;
-  enabled: boolean;
-};
-
-type SnippetAccessEntry = {
-  department_id: number;
-  department_name: string;
-  enabled: boolean;
-};
-
-const AdminPanel: React.FC = () => {
-  const [activeTab, setActiveTab] = useState<TabKey>('users');
-  const [error, setError] = useState<string | null>(null);
-
-  const [loading, setLoading] = useState(false);
-  const [languagesLoading, setLanguagesLoading] = useState(false);
-  const [translationsLoading, setTranslationsLoading] = useState(false);
-  const [loadingSnippets, setLoadingSnippets] = useState(false);
-  const [snippetAccessLoading, setSnippetAccessLoading] = useState(false);
-
-  const [users, setUsers] = useState<User[]>([]);
-  const [departments, setDepartments] = useState<Department[]>([]);
-  const [channels, setChannels] = useState<Channel[]>([]);
-  const [snippets, setSnippets] = useState<Snippet[]>([]);
-  const [uiLanguages, setUiLanguages] = useState<Language[]>([]);
-  const [translations, setTranslations] = useState<TranslationGroup[]>([]);
-  const [languageModalOpen, setLanguageModalOpen] = useState(false);
-
-  const [usersLoaded, setUsersLoaded] = useState(false);
-  const [departmentsLoaded, setDepartmentsLoaded] = useState(false);
-  const [channelsLoaded, setChannelsLoaded] = useState(false);
-  const [snippetsLoaded, setSnippetsLoaded] = useState(false);
-  const [languagesLoaded, setLanguagesLoaded] = useState(false);
-  const [translationsLoaded, setTranslationsLoaded] = useState(false);
-
-  const [selectedUserId, setSelectedUserId] = useState<number | null>(null);
-  const [assignDeptId, setAssignDeptId] = useState<number | null>(null);
-
-  const [newDeptName, setNewDeptName] = useState('');
-  const [newDeptDesc, setNewDeptDesc] = useState('');
-
-  const [editingDept, setEditingDept] = useState<Department | null>(null);
-  const [editDeptName, setEditDeptName] = useState('');
-  const [editDeptDesc, setEditDeptDesc] = useState('');
-  const [deptSnippets, setDeptSnippets] = useState<DepartmentSnippetEntry[]>([]);
-
-  const [newChannelName, setNewChannelName] = useState('');
-  const [newChannelDesc, setNewChannelDesc] = useState('');
-  const [channelDeptId, setChannelDeptId] = useState<number | null>(null);
-
-  const [selectedSnippetId, setSelectedSnippetId] = useState<number | null>(null);
-  const [snippetAccess, setSnippetAccess] = useState<SnippetAccessEntry[]>([]);
-
-  const [newLanguageCode, setNewLanguageCode] = useState('');
-  const [newLanguageName, setNewLanguageName] = useState('');
-
-  const [translationSaving, setTranslationSaving] = useState<number | null>(null);
-
-  const navItems = useMemo<Array<{ key: TabKey; label: string; description: string }>>(
-    () => [
-      { key: 'users', label: 'Benutzer', description: 'Verwalten Sie Benutzer und Admin-Rechte.' },
-      { key: 'departments', label: 'Abteilungen', description: 'Strukturieren Sie Teams und Rechte.' },
-      { key: 'channels', label: 'Channels', description: 'Organisieren Sie Kommunikationsräume.' },
-      { key: 'snippets', label: 'Snippets', description: 'Steuern Sie Code-Snippet Zugriff.' },
-      { key: 'languages', label: 'Sprachen', description: 'Verwalten Sie UI-Sprachen & Texte.' },
-    ],
-    []
-  );
-
-  const setGlobalError = useCallback((message: string) => {
-    console.error(message);
-    setError(message);
-  }, []);
-
-  const loadUsers = useCallback(async () => {
-    setLoading(true);
-    setError(null);
-    try {
-      const response = await api.get<User[]>('/admin/users');
-      setUsers(response.data);
-      setUsersLoaded(true);
-    } catch (err) {
-      setGlobalError('Benutzer konnten nicht geladen werden.');
-    } finally {
-      setLoading(false);
-    }
-  }, [setGlobalError]);
-
-  const loadDepartments = useCallback(async () => {
-    setLoading(true);
-    setError(null);
-    try {
-      const response = await api.get<Department[]>('/admin/departments');
-      setDepartments(response.data);
-      setDepartmentsLoaded(true);
-    } catch (err) {
-      setGlobalError('Abteilungen konnten nicht geladen werden.');
-    } finally {
-      setLoading(false);
-    }
-  }, [setGlobalError]);
-
-  const loadChannels = useCallback(async () => {
-    setLoading(true);
-    setError(null);
-    try {
-      const response = await api.get<Channel[]>('/admin/channels');
-      setChannels(response.data);
-      setChannelsLoaded(true);
-    } catch (err) {
-      setGlobalError('Channels konnten nicht geladen werden.');
-    } finally {
-      setLoading(false);
-    }
-  }, [setGlobalError]);
-
-  const loadSnippets = useCallback(async () => {
-    setLoading(true);
-    setError(null);
-    try {
-      const response = await snippetsAPI.getAll();
-      setSnippets(response);
-      setSnippetsLoaded(true);
-    } catch (err) {
-      setGlobalError('Snippets konnten nicht geladen werden.');
-    } finally {
-      setLoading(false);
-    }
-  }, [setGlobalError]);
-
-  const loadLanguages = useCallback(async () => {
-    setLanguagesLoading(true);
-    setError(null);
-    try {
-      const items = await adminLanguagesAPI.getAll();
-      setUiLanguages(items);
-      setLanguagesLoaded(true);
-    } catch (err) {
-      setGlobalError('Sprachen konnten nicht geladen werden.');
-    } finally {
-      setLanguagesLoading(false);
-    }
-  }, [setGlobalError]);
-
-  const loadTranslations = useCallback(async () => {
-    setTranslationsLoading(true);
-    setError(null);
-    try {
-      const items = await adminTranslationsAPI.getAll();
-      setTranslations(items);
-      setTranslationsLoaded(true);
-    } catch (err) {
-      setGlobalError('Übersetzungen konnten nicht geladen werden.');
-    } finally {
-      setTranslationsLoading(false);
-    }
-  }, [setGlobalError]);
-
-  const ensureDeptSnippetsLoaded = useCallback(
-    async (departmentId: number) => {
-      setLoadingSnippets(true);
-      setError(null);
-      try {
-        const departmentSnippets = await snippetsAPI.getAll({ visibility: 'department' });
-        const enriched = await Promise.all(
-          departmentSnippets.map(async (snippet: Snippet) => {
-            const accessResponse = await api.get<SnippetAccessEntry[]>(
-              `/admin/snippets/${snippet.id}/departments`
-            );
-            const entry = accessResponse.data.find((item) => item.department_id === departmentId);
-            return {
-              snippet_id: snippet.id,
-              snippet_title: snippet.title,
-              snippet_language: snippet.language,
-              snippet_owner: snippet.owner_username ?? 'Unbekannt',
-              enabled: entry?.enabled ?? false,
-            } as DepartmentSnippetEntry;
-          })
-        );
-        setDeptSnippets(enriched);
-      } catch (err) {
-        setGlobalError('Snippet-Berechtigungen konnten nicht geladen werden.');
-      } finally {
-        setLoadingSnippets(false);
-      }
-    },
-    [setGlobalError]
-  );
-
-  const fetchSnippetAccess = useCallback(async (snippetId: number) => {
-    setSnippetAccessLoading(true);
-    setError(null);
-    try {
-      const response = await api.get<SnippetAccessEntry[]>(`/admin/snippets/${snippetId}/departments`);
-      setSnippetAccess(response.data);
-    } catch (err) {
-      setGlobalError('Abteilungszugriffe konnten nicht geladen werden.');
-    } finally {
-      setSnippetAccessLoading(false);
-    }
-  }, [setGlobalError]);
-
-  useEffect(() => {
-    if (activeTab === 'users' && !usersLoaded) {
-      loadUsers();
-    }
-    if ((activeTab === 'departments' || activeTab === 'channels' || activeTab === 'snippets') && !departmentsLoaded) {
-      loadDepartments();
-    }
-    if (activeTab === 'channels' && !channelsLoaded) {
-      loadChannels();
-    }
-    if (activeTab === 'snippets' && !snippetsLoaded) {
-      loadSnippets();
-    }
-    if (activeTab === 'languages' && !languagesLoaded) {
-      loadLanguages();
-    }
-    if (activeTab === 'languages' && !translationsLoaded) {
-      loadTranslations();
-    }
-  }, [
-    activeTab,
-    channelsLoaded,
-    departmentsLoaded,
-    languagesLoaded,
-    loadChannels,
-    loadDepartments,
-    loadLanguages,
-    loadSnippets,
-    loadTranslations,
-    loadUsers,
-    snippetsLoaded,
-    translationsLoaded,
-    usersLoaded,
-  ]);
-
-  const toggleAdmin = useCallback(
-    async (userId: number, isAdmin: boolean) => {
-      setError(null);
-      try {
-        await api.patch(`/admin/users/${userId}/admin`, null, { params: { is_admin: !isAdmin } });
-        setUsers((prev) => prev.map((user) => (user.id === userId ? { ...user, is_admin: !isAdmin } : user)));
-      } catch (err) {
-        setGlobalError('Admin-Status konnte nicht geändert werden.');
-      }
-    },
-    [setGlobalError]
-  );
-
-  const assignUserToDepartment = useCallback(
-    async (event: React.FormEvent<HTMLFormElement>) => {
-      event.preventDefault();
-      if (!selectedUserId || !assignDeptId) {
-        setGlobalError('Bitte wählen Sie einen Benutzer und eine Abteilung aus.');
-        return;
-      }
-      setError(null);
-      try {
-        await api.post(`/admin/departments/${assignDeptId}/members`, null, {
-          params: { user_id: selectedUserId },
-        });
-        setSelectedUserId(null);
-        setAssignDeptId(null);
-      } catch (err) {
-        setGlobalError('Konnte Benutzer nicht zuweisen.');
-      }
-    },
-    [assignDeptId, selectedUserId, setGlobalError]
-  );
-
-  const createDepartment = useCallback(
-    async (event: React.FormEvent<HTMLFormElement>) => {
-      event.preventDefault();
-      if (!newDeptName.trim()) {
-        setGlobalError('Der Abteilungsname darf nicht leer sein.');
-        return;
-      }
-      setError(null);
-      try {
-        const response = await api.post<Department>('/admin/departments', {
-          name: newDeptName.trim(),
-          description: newDeptDesc.trim() || undefined,
-        });
-        setDepartments((prev) => [...prev, response.data]);
-        setNewDeptName('');
-        setNewDeptDesc('');
-      } catch (err) {
-        setGlobalError('Abteilung konnte nicht erstellt werden.');
-      }
-    },
-    [newDeptDesc, newDeptName, setGlobalError]
-  );
-
-  const startEditDepartment = useCallback(
-    (department: Department) => {
-      setEditingDept(department);
-      setEditDeptName(department.name);
-      setEditDeptDesc(department.description ?? '');
-      if (department.snippets_enabled) {
-        ensureDeptSnippetsLoaded(department.id);
-      } else {
-        setDeptSnippets([]);
-      }
-    },
-    [ensureDeptSnippetsLoaded]
-  );
-
-  const cancelEditDepartment = useCallback(() => {
-    setEditingDept(null);
-    setEditDeptName('');
-    setEditDeptDesc('');
-    setDeptSnippets([]);
-  }, []);
-
-  const updateDepartment = useCallback(
-    async (event: React.FormEvent<HTMLFormElement>) => {
-      event.preventDefault();
-      if (!editingDept) {
-        return;
-      }
-      if (!editDeptName.trim()) {
-        setGlobalError('Der Abteilungsname darf nicht leer sein.');
-        return;
-      }
-      setError(null);
-      try {
-        const response = await api.put<Department>(`/admin/departments/${editingDept.id}`, {
-          name: editDeptName.trim(),
-          description: editDeptDesc.trim() || undefined,
-        });
-        setDepartments((prev) => prev.map((dept) => (dept.id === editingDept.id ? response.data : dept)));
-        setEditingDept(response.data);
-      } catch (err) {
-        setGlobalError('Abteilung konnte nicht aktualisiert werden.');
-      }
-    },
-    [editDeptDesc, editDeptName, editingDept, setGlobalError]
-  );
-
-  const deleteDepartment = useCallback(
-    async (departmentId: number) => {
-      if (!window.confirm('Möchten Sie diese Abteilung wirklich löschen?')) {
-        return;
-      }
-      setError(null);
-      try {
-        await api.delete(`/admin/departments/${departmentId}`);
-        setDepartments((prev) => prev.filter((dept) => dept.id !== departmentId));
-        if (editingDept && editingDept.id === departmentId) {
-          cancelEditDepartment();
-        }
-      } catch (err) {
-        setGlobalError('Abteilung konnte nicht gelöscht werden.');
-      }
-    },
-    [cancelEditDepartment, editingDept, setGlobalError]
-  );
-
-  const toggleDepartmentSnippetAccess = useCallback(
-    async (departmentId: number, enabled: boolean) => {
-      setError(null);
-      try {
-        await api.patch(`/admin/departments/${departmentId}/snippets`, null, { params: { enabled: !enabled } });
-        setDepartments((prev) =>
-          prev.map((dept) =>
-            dept.id === departmentId ? { ...dept, snippets_enabled: !enabled } : dept
-          )
-        );
-        if (editingDept && editingDept.id === departmentId) {
-          const updated = { ...editingDept, snippets_enabled: !enabled };
-          setEditingDept(updated);
-          if (!enabled) {
-            ensureDeptSnippetsLoaded(departmentId);
-          } else {
-            setDeptSnippets([]);
-          }
-        }
-      } catch (err) {
-        setGlobalError('Snippet-Hauptschalter konnte nicht gesetzt werden.');
-      }
-    },
-    [editingDept, ensureDeptSnippetsLoaded, setGlobalError]
-  );
-
-  const toggleDepartmentSnippet = useCallback(
-    async (snippetId: number, enabled: boolean) => {
-      if (!editingDept) {
-        return;
-      }
-      setError(null);
-      try {
-        await api.post('/admin/snippets/departments/toggle', {
-          snippet_id: snippetId,
-          department_id: editingDept.id,
-          enabled,
-        });
-        setDeptSnippets((prev) =>
-          prev.map((item) => (item.snippet_id === snippetId ? { ...item, enabled } : item))
-        );
-      } catch (err) {
-        setGlobalError('Snippet-Zugriff konnte nicht angepasst werden.');
-      }
-    },
-    [editingDept, setGlobalError]
-  );
-
-  const createChannel = useCallback(
-    async (event: React.FormEvent<HTMLFormElement>) => {
-      event.preventDefault();
-      if (!newChannelName.trim() || !channelDeptId) {
-        setGlobalError('Bitte geben Sie einen Namen an und wählen Sie eine Abteilung.');
-        return;
-      }
-      setError(null);
-      try {
-        const response = await api.post<Channel>('/admin/channels', {
-          name: newChannelName.trim(),
-          description: newChannelDesc.trim() || undefined,
-          department_id: channelDeptId,
-        });
-        setChannels((prev) => [...prev, response.data]);
-        setNewChannelName('');
-        setNewChannelDesc('');
-        setChannelDeptId(null);
-      } catch (err) {
-        setGlobalError('Channel konnte nicht erstellt werden.');
-      }
-    },
-    [channelDeptId, newChannelDesc, newChannelName, setGlobalError]
-  );
-
-  const deleteChannel = useCallback(
-    async (channelId: number, channelName: string) => {
-      if (!window.confirm(`Channel "${channelName}" löschen?`)) {
-        return;
-      }
-      setError(null);
-      try {
-        await api.delete(`/admin/channels/${channelId}`);
-        setChannels((prev) => prev.filter((channel) => channel.id !== channelId));
-      } catch (err) {
-        setGlobalError('Channel konnte nicht gelöscht werden.');
-      }
-    },
-    [setGlobalError]
-  );
-
-  const toggleSnippetAccess = useCallback(
-    async (snippetId: number, departmentId: number, enabled: boolean) => {
-      setError(null);
-      try {
-        await api.post('/admin/snippets/departments/toggle', {
-          snippet_id: snippetId,
-          department_id: departmentId,
-          enabled,
-        });
-        setSnippetAccess((prev) =>
-          prev.map((entry) =>
-            entry.department_id === departmentId ? { ...entry, enabled } : entry
-          )
-        );
-      } catch (err) {
-        setGlobalError('Snippet-Berechtigung konnte nicht geändert werden.');
-      }
-    },
-    [setGlobalError]
-  );
-
-  const openLanguageModal = () => {
-    setError(null);
-    setNewLanguageCode('');
-    setNewLanguageName('');
-    setLanguageModalOpen(true);
-  };
-
-  const closeLanguageModal = useCallback(() => {
-    setLanguageModalOpen(false);
-    setNewLanguageCode('');
-    setNewLanguageName('');
-  }, []);
-
-  const createLanguage = useCallback(
-    async (event: React.FormEvent<HTMLFormElement>) => {
-      event.preventDefault();
-      const code = newLanguageCode.trim().toLowerCase();
-      const name = newLanguageName.trim();
-      if (!code || !name) {
-        setGlobalError('Bitte geben Sie Code und Anzeigename an.');
-        return;
-      }
-      setError(null);
-      try {
-        const language = await adminLanguagesAPI.create({ code, name });
-        setUiLanguages((prev) => [...prev, language].sort((a, b) => a.name.localeCompare(b.name)));
-        closeLanguageModal();
-        if (translationsLoaded) {
-          loadTranslations();
-        }
-      } catch (err) {
-        setGlobalError('Sprache konnte nicht erstellt werden.');
-      }
-    },
-    [
-      closeLanguageModal,
-      loadTranslations,
-      newLanguageCode,
-      newLanguageName,
-      setGlobalError,
-      translationsLoaded,
-    ]
-  );
-
-  const deleteLanguage = useCallback(
-    async (languageId: number, languageName: string) => {
-      if (!window.confirm(`Sprache "${languageName}" löschen?`)) {
-        return;
-      }
-      setError(null);
-      try {
-        await adminLanguagesAPI.delete(languageId);
-        setUiLanguages((prev) => prev.filter((language) => language.id !== languageId));
-        setTranslations((prev) =>
-          prev.map((group) => ({
-            ...group,
-            entries: group.entries.filter((entry) => entry.language_id !== languageId),
-          }))
-        );
-      } catch (err) {
-        setGlobalError('Sprache konnte nicht gelöscht werden.');
-      }
-    },
-    [setGlobalError]
-  );
-
-  const updateTranslationDraft = useCallback((translationId: number, value: string) => {
-    setTranslations((prev) =>
-      prev.map((group) => ({
-        ...group,
-        entries: group.entries.map((entry) =>
-          entry.translation_id === translationId ? { ...entry, value } : entry
-        ),
-      }))
-    );
-  }, []);
-
-  const saveTranslationValue = useCallback(
-    async (translationId: number, value: string) => {
-      setError(null);
-      setTranslationSaving(translationId);
-      try {
-        await adminTranslationsAPI.update({ translation_id: translationId, value });
-      } catch (err) {
-        setGlobalError('Übersetzung konnte nicht gespeichert werden.');
-      } finally {
-        setTranslationSaving(null);
-      }
-    },
-    [setGlobalError]
-  );
-
-  const handleSnippetToggle = useCallback(
-    (snippet: Snippet) => {
-      if (selectedSnippetId === snippet.id) {
-        setSelectedSnippetId(null);
-        setSnippetAccess([]);
-        return;
-      }
-      setSelectedSnippetId(snippet.id);
-      setSnippetAccess([]);
-      fetchSnippetAccess(snippet.id);
-    },
-    [fetchSnippetAccess, selectedSnippetId]
-  );
-
-  const stats = useMemo(() => {
-    const departmentSnippets = snippets.filter((snippet) => snippet.visibility === 'department');
-    const organizationSnippets = snippets.filter((snippet) => snippet.visibility === 'organization');
-    return {
-      total: snippets.length,
-      department: departmentSnippets.length,
-      organization: organizationSnippets.length,
-    };
-  }, [snippets]);
-
-  return (
-    <div className="min-h-screen bg-gray-100 dark:bg-gray-900 py-8">
-      <div className="max-w-6xl mx-auto px-4 md:px-6 lg:px-8">
-        <div className="flex flex-col lg:flex-row bg-white dark:bg-gray-800 shadow-lg rounded-xl overflow-hidden border border-gray-200 dark:border-gray-700">
-          <aside className="lg:w-64 bg-gray-50 dark:bg-gray-900 border-b lg:border-b-0 lg:border-r border-gray-200 dark:border-gray-700">
-            <nav className="flex lg:flex-col">
-              {navItems.map((item) => (
-                <button
-                  key={item.key}
-                  onClick={() => setActiveTab(item.key)}
-                  className={`flex-1 lg:flex-none px-4 py-4 text-left border-l-4 lg:border-l-0 lg:border-b border-gray-200 dark:border-gray-700 transition-colors ${
-                    activeTab === item.key
-                      ? 'bg-white dark:bg-gray-800 border-l-blue-500 text-blue-600 dark:text-blue-400'
-                      : 'text-gray-600 dark:text-gray-300 hover:bg-white/70 dark:hover:bg-gray-800/70'
-                  }`}
-                >
-                  <div className="text-sm font-semibold">{item.label}</div>
-                  <div className="text-xs text-gray-500 dark:text-gray-400 mt-1">{item.description}</div>
-                </button>
-              ))}
-            </nav>
-          </aside>
-
-          <div className="flex-1 p-6 lg:p-8 space-y-6">
-            <div className="flex items-center justify-between">
-              <div>
-                <h1 className="text-2xl font-bold text-gray-900 dark:text-white">Adminbereich</h1>
-                <p className="text-sm text-gray-500 dark:text-gray-400">
-                  Verwalten Sie Benutzer, Strukturen und Inhalte Ihrer Organisation.
-                </p>
-              </div>
-            </div>
-
-            {error && (
-              <div className="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded text-sm">
-                {error}
-              </div>
-            )}
-
-            {activeTab === 'users' && (
-              <div className="space-y-6">
-                <div className="bg-white dark:bg-gray-800 rounded-lg shadow p-4">
-                  <h2 className="text-lg font-semibold text-gray-900 dark:text-white mb-3">
-                    Benutzer-Verwaltung
-                  </h2>
-                  {loading ? (
-                    <p className="text-gray-500 dark:text-gray-400 text-sm">Lädt...</p>
-                  ) : (
-                    <div className="overflow-x-auto">
-                      <table className="min-w-full divide-y divide-gray-200 dark:divide-gray-700">
-                        <thead>
-                          <tr className="text-left text-xs font-semibold text-gray-500 dark:text-gray-400 uppercase tracking-wider">
-                            <th className="px-4 py-2">Username</th>
-                            <th className="px-4 py-2">Email</th>
-                            <th className="px-4 py-2">Name</th>
-                            <th className="px-4 py-2">Admin</th>
-                            <th className="px-4 py-2">Aktionen</th>
-                          </tr>
-                        </thead>
-                        <tbody className="divide-y divide-gray-200 dark:divide-gray-700">
-                          {users.map((user) => (
-                            <tr key={user.id}>
-                              <td className="px-4 py-3 whitespace-nowrap text-sm text-gray-900 dark:text-gray-100">
-                                {user.username}
-                              </td>
-                              <td className="px-4 py-3 whitespace-nowrap text-sm text-gray-900 dark:text-gray-100">
-                                {user.email}
-                              </td>
-                              <td className="px-4 py-3 whitespace-nowrap text-sm text-gray-900 dark:text-gray-100">
-                                {user.full_name || '-'}
-                              </td>
-                              <td className="px-4 py-3 whitespace-nowrap text-sm">
-                                {user.is_admin ? (
-                                  <span className="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-green-100 text-green-800">
-                                    Admin
-                                  </span>
-                                ) : (
-                                  <span className="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">
-                                    User
-                                  </span>
-                                )}
-                              </td>
-                              <td className="px-4 py-3 whitespace-nowrap text-xs">
-                                <button
-                                  onClick={() => toggleAdmin(user.id, user.is_admin)}
-                                  className="text-blue-600 hover:text-blue-800 dark:text-blue-400 dark:hover:text-blue-300"
-                                >
-                                  {user.is_admin ? 'Admin entfernen' : 'Admin machen'}
-                                </button>
-                              </td>
-                            </tr>
-                          ))}
-                        </tbody>
-                      </table>
-                    </div>
-                  )}
-                </div>
-
-                <div className="bg-white dark:bg-gray-800 rounded-lg shadow p-4">
-                  <h2 className="text-lg font-semibold text-gray-900 dark:text-white mb-3">
-                    User zu Abteilung zuweisen
-                  </h2>
-                  <form onSubmit={assignUserToDepartment} className="space-y-3">
-                    <div>
-                      <label className="block text-xs font-medium text-gray-700 dark:text-gray-300 mb-1">
-                        User auswählen
-                      </label>
-                      <select
-                        value={selectedUserId ?? ''}
-                        onChange={(event) => setSelectedUserId(event.target.value ? Number(event.target.value) : null)}
-                        className="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
-                      >
-                        <option value="">-- Benutzer wählen --</option>
-                        {users.map((user) => (
-                          <option key={user.id} value={user.id}>
-                            {user.username} ({user.email})
-                          </option>
-                        ))}
-                      </select>
-                    </div>
-                    <div>
-                      <label className="block text-xs font-medium text-gray-700 dark:text-gray-300 mb-1">
-                        Abteilung auswählen
-                      </label>
-                      <select
-                        value={assignDeptId ?? ''}
-                        onChange={(event) => setAssignDeptId(event.target.value ? Number(event.target.value) : null)}
-                        className="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
-                      >
-                        <option value="">-- Abteilung wählen --</option>
-                        {departments.map((dept) => (
-                          <option key={dept.id} value={dept.id}>
-                            {dept.name}
-                          </option>
-                        ))}
-                      </select>
-                    </div>
-                    <button
-                      type="submit"
-                      className="w-full bg-blue-600 text-white px-4 py-2 rounded-md hover:bg-blue-700 text-sm"
-                    >
-                      Zuweisen
-                    </button>
-                  </form>
-                </div>
-              </div>
-            )}
-
-            {activeTab === 'departments' && (
-              <div className="space-y-6">
-                {editingDept && (
-                  <div className="bg-yellow-50 dark:bg-yellow-900/20 border-2 border-yellow-400 dark:border-yellow-600 rounded-lg shadow p-4">
-                    <h2 className="text-lg font-semibold text-gray-900 dark:text-white mb-3">
-                      Abteilung bearbeiten: {editingDept.name}
-                    </h2>
-                    <form onSubmit={updateDepartment} className="space-y-3">
-                      <div>
-                        <label className="block text-xs font-medium text-gray-700 dark:text-gray-300 mb-1">
-                          Abteilungsname
-                        </label>
-                        <input
-                          type="text"
-                          value={editDeptName}
-                          onChange={(event) => setEditDeptName(event.target.value)}
-                          required
-                          className="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
-                        />
-                      </div>
-                      <div>
-                        <label className="block text-xs font-medium text-gray-700 dark:text-gray-300 mb-1">
-                          Beschreibung
-                        </label>
-                        <textarea
-                          value={editDeptDesc}
-                          onChange={(event) => setEditDeptDesc(event.target.value)}
-                          rows={2}
-                          className="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
-                        />
-                      </div>
-
-                      {editingDept.snippets_enabled && (
-                        <div className="border-t border-yellow-300 dark:border-yellow-700 pt-3 mt-3">
-                          <h3 className="text-sm font-medium text-gray-900 dark:text-white mb-2">
-                            Code-Snippets Freischaltungen
-                          </h3>
-                          <p className="text-xs text-gray-500 dark:text-gray-400 mb-3">
-                            Aktivieren Sie die gewünschten Snippets für diese Abteilung.
-                          </p>
-                          {loadingSnippets ? (
-                            <p className="text-xs text-gray-500 dark:text-gray-400 italic animate-pulse">
-                              Lade Snippets...
-                            </p>
-                          ) : deptSnippets.length === 0 ? (
-                            <div className="text-center py-4 bg-gray-50 dark:bg-gray-900 rounded border border-dashed border-gray-300 dark:border-gray-700">
-                              <p className="text-xs text-gray-500 dark:text-gray-400">
-                                Keine Department-Snippets vorhanden
-                              </p>
-                              <p className="text-xs text-gray-400 dark:text-gray-500 mt-1">
-                                Snippets können im Chat mit Visibility "Department" erstellt werden.
-                              </p>
-                            </div>
-                          ) : (
-                            <div className="space-y-2 max-h-64 overflow-y-auto border border-gray-200 dark:border-gray-700 rounded p-2">
-                              <div className="text-xs text-gray-600 dark:text-gray-400 mb-2 px-1">
-                                {deptSnippets.filter((item) => item.enabled).length} von {deptSnippets.length} aktiviert
-                              </div>
-                              {deptSnippets.map((item) => (
-                                <div
-                                  key={item.snippet_id}
-                                  className="flex items-center justify-between p-2 bg-white dark:bg-gray-800 rounded border border-gray-200 dark:border-gray-700 hover:border-gray-300 dark:hover:border-gray-600 transition-colors"
-                                >
-                                  <div className="flex-1 min-w-0 mr-2">
-                                    <div className="text-xs font-medium text-gray-900 dark:text-white truncate">
-                                      {item.snippet_title}
-                                    </div>
-                                    <div className="text-xs text-gray-500 dark:text-gray-400 mt-0.5">
-                                      <span className="inline-block bg-gray-200 dark:bg-gray-700 px-1.5 py-0.5 rounded mr-1">
-                                        {item.snippet_language}
-                                      </span>
-                                      <span className="mx-1 text-gray-400 dark:text-gray-500">-</span>
-                                      <span>von {item.snippet_owner}</span>
-                                    </div>
-                                  </div>
-                                  <button
-                                    type="button"
-                                    onClick={() => toggleDepartmentSnippet(item.snippet_id, !item.enabled)}
-                                    className={`text-xs px-3 py-1.5 rounded font-medium transition-all whitespace-nowrap ${
-                                      item.enabled
-                                        ? 'bg-green-600 text-white hover:bg-green-700 shadow-sm'
-                                        : 'bg-gray-500 text-white hover:bg-gray-600'
-                                    }`}
-                                  >
-                                    {item.enabled ? 'Aktiv' : 'Inaktiv'}
-                                  </button>
-                                </div>
-                              ))}
-                            </div>
-                          )}
-                        </div>
-                      )}
-
-                      <div className="flex gap-2 pt-2">
-                        <button
-                          type="submit"
-                          className="flex-1 bg-green-600 text-white px-3 py-2 rounded-md hover:bg-green-700 text-sm"
-                        >
-                          Speichern
-                        </button>
-                        <button
-                          type="button"
-                          onClick={cancelEditDepartment}
-                          className="flex-1 bg-gray-500 text-white px-3 py-2 rounded-md hover:bg-gray-600 text-sm"
-                        >
-                          Abbrechen
-                        </button>
-                      </div>
-                    </form>
-                  </div>
-                )}
-
-                <div className="bg-white dark:bg-gray-800 rounded-lg shadow p-4">
-                  <h2 className="text-lg font-semibold text-gray-900 dark:text-white mb-3">
-                    Neue Abteilung erstellen
-                  </h2>
-                  <form onSubmit={createDepartment} className="space-y-3">
-                    <div>
-                      <label className="block text-xs font-medium text-gray-700 dark:text-gray-300 mb-1">
-                        Abteilungsname
-                      </label>
-                      <input
-                        type="text"
-                        value={newDeptName}
-                        onChange={(event) => setNewDeptName(event.target.value)}
-                        required
-                        className="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
-                        placeholder="z.B. Entwicklung"
-                      />
-                    </div>
-                    <div>
-                      <label className="block text-xs font-medium text-gray-700 dark:text-gray-300 mb-1">
-                        Beschreibung
-                      </label>
-                      <textarea
-                        value={newDeptDesc}
-                        onChange={(event) => setNewDeptDesc(event.target.value)}
-                        rows={2}
-                        className="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
-                        placeholder="Beschreibung der Abteilung"
-                      />
-                    </div>
-                    <button
-                      type="submit"
-                      className="w-full bg-blue-600 text-white px-3 py-2 rounded-md hover:bg-blue-700 text-sm"
-                    >
-                      Abteilung erstellen
-                    </button>
-                  </form>
-                </div>
-
-                <div className="bg-white dark:bg-gray-800 rounded-lg shadow p-4">
-                  <h2 className="text-lg font-semibold text-gray-900 dark:text-white mb-3">
-                    Bestehende Abteilungen
-                  </h2>
-                  {loading ? (
-                    <p className="text-gray-500 dark:text-gray-400 text-sm">Lädt...</p>
-                  ) : (
-                    <div className="space-y-2">
-                      {departments.map((dept) => (
-                        <div
-                          key={dept.id}
-                          className="flex flex-col md:flex-row md:items-center md:justify-between gap-3 p-3 border border-gray-200 dark:border-gray-700 rounded-md"
-                        >
-                          <div className="flex-1">
-                            <h3 className="font-semibold text-sm text-gray-900 dark:text-white">
-                              {dept.name}
-                            </h3>
-                            <p className="text-xs text-gray-500 dark:text-gray-400">
-                              {dept.description || 'Keine Beschreibung'}
-                            </p>
-                            <div className="mt-2 flex items-center gap-2">
-                              <span className="text-xs text-gray-600 dark:text-gray-400">Snippet-Zugriff:</span>
-                              <button
-                                onClick={() => toggleDepartmentSnippetAccess(dept.id, dept.snippets_enabled ?? true)}
-                                className={`text-xs px-2 py-1 rounded font-medium transition-colors ${
-                                  dept.snippets_enabled ?? true
-                                    ? 'bg-green-600 text-white hover:bg-green-700'
-                                    : 'bg-red-600 text-white hover:bg-red-700'
-                                }`}
-                              >
-                                {dept.snippets_enabled ?? true ? 'Aktiv' : 'Inaktiv'}
-                              </button>
-                            </div>
-                          </div>
-                          <div className="flex gap-2">
-                            <button
-                              onClick={() => startEditDepartment(dept)}
-                              className="text-blue-600 hover:text-blue-800 dark:text-blue-400 dark:hover:text-blue-300 px-3 py-1 text-xs border border-blue-600 dark:border-blue-400 rounded-md"
-                            >
-                              Bearbeiten
-                            </button>
-                            <button
-                              onClick={() => deleteDepartment(dept.id)}
-                              className="text-red-600 hover:text-red-800 dark:text-red-400 dark:hover:text-red-300 px-3 py-1 text-xs border border-red-600 dark:border-red-400 rounded-md"
-                            >
-                              Löschen
-                            </button>
-                          </div>
-                        </div>
-                      ))}
-                    </div>
-                  )}
-                </div>
-              </div>
-            )}
-
-            {activeTab === 'channels' && (
-              <div className="space-y-6">
-                <div className="bg-white dark:bg-gray-800 rounded-lg shadow p-4">
-                  <h2 className="text-lg font-semibold text-gray-900 dark:text-white mb-3">
-                    Neuen Channel erstellen
-                  </h2>
-                  <form onSubmit={createChannel} className="space-y-3">
-                    <div>
-                      <label className="block text-xs font-medium text-gray-700 dark:text-gray-300 mb-1">
-                        Channel-Name
-                      </label>
-                      <input
-                        type="text"
-                        value={newChannelName}
-                        onChange={(event) => setNewChannelName(event.target.value)}
-                        required
-                        className="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
-                        placeholder="z.B. general"
-                      />
-                    </div>
-                    <div>
-                      <label className="block text-xs font-medium text-gray-700 dark:text-gray-300 mb-1">
-                        Beschreibung
-                      </label>
-                      <textarea
-                        value={newChannelDesc}
-                        onChange={(event) => setNewChannelDesc(event.target.value)}
-                        rows={2}
-                        className="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
-                        placeholder="Beschreibung des Channels"
-                      />
-                    </div>
-                    <div>
-                      <label className="block text-xs font-medium text-gray-700 dark:text-gray-300 mb-1">
-                        Abteilung
-                      </label>
-                      <select
-                        value={channelDeptId ?? ''}
-                        onChange={(event) => setChannelDeptId(event.target.value ? Number(event.target.value) : null)}
-                        required
-                        className="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
-                      >
-                        <option value="">-- Abteilung wählen --</option>
-                        {departments.map((dept) => (
-                          <option key={dept.id} value={dept.id}>
-                            {dept.name}
-                          </option>
-                        ))}
-                      </select>
-                    </div>
-                    <button
-                      type="submit"
-                      className="w-full bg-blue-600 text-white px-3 py-2 rounded-md hover:bg-blue-700 text-sm"
-                    >
-                      Channel erstellen
-                    </button>
-                  </form>
-                </div>
-
-                <div className="bg-white dark:bg-gray-800 rounded-lg shadow p-4">
-                  <h2 className="text-lg font-semibold text-gray-900 dark:text-white mb-3">
-                    Bestehende Channels
-                  </h2>
-                  {loading ? (
-                    <p className="text-gray-500 dark:text-gray-400 text-sm">Lädt...</p>
-                  ) : channels.length === 0 ? (
-                    <p className="text-gray-500 dark:text-gray-400 text-sm">Noch keine Channels vorhanden.</p>
-                  ) : (
-                    <div className="space-y-2">
-                      {channels.map((channel) => {
-                        const dept = departments.find((item) => item.id === channel.department_id);
-                        return (
-                          <div
-                            key={channel.id}
-                            className="flex flex-col md:flex-row md:items-center md:justify-between gap-3 p-3 border border-gray-200 dark:border-gray-700 rounded-md"
-                          >
-                            <div>
-                              <h3 className="font-semibold text-sm text-gray-900 dark:text-white">
-                                #{channel.name}
-                              </h3>
-                              <p className="text-xs text-gray-500 dark:text-gray-400">
-                                {channel.description || 'Keine Beschreibung'}
-                              </p>
-                              <p className="text-xs text-blue-600 dark:text-blue-400 mt-1">
-                                Abteilung: {dept?.name || `ID ${channel.department_id}`}
-                              </p>
-                            </div>
-                            <button
-                              onClick={() => deleteChannel(channel.id, channel.name)}
-                              className="text-red-600 hover:text-red-800 dark:text-red-400 dark:hover:text-red-300 px-3 py-1 text-xs border border-red-600 dark:border-red-400 rounded-md"
-                            >
-                              Löschen
-                            </button>
-                          </div>
-                        );
-                      })}
-                    </div>
-                  )}
-                </div>
-              </div>
-            )}
-
-            {activeTab === 'snippets' && (
-              <div className="space-y-6">
-                <div className="bg-white dark:bg-gray-800 rounded-lg shadow p-4">
-                  <h2 className="text-lg font-semibold text-gray-900 dark:text-white mb-3">
-                    Code-Snippet Freischaltungen
-                  </h2>
-                  <p className="text-sm text-gray-600 dark:text-gray-400 mb-4">
-                    Verwalten Sie, welche Abteilungen Zugriff auf Department-Snippets haben.
-                  </p>
-
-                  {loading ? (
-                    <p className="text-gray-500 dark:text-gray-400 text-sm">Snippets werden geladen...</p>
-                  ) : snippets.length === 0 ? (
-                    <p className="text-gray-500 dark:text-gray-400 text-sm">Noch keine Snippets vorhanden.</p>
-                  ) : (
-                    <>
-                      <div className="grid grid-cols-1 md:grid-cols-3 gap-3 mb-4">
-                        <div className="bg-blue-50 dark:bg-blue-900/20 p-3 rounded">
-                          <div className="text-2xl font-bold text-blue-600 dark:text-blue-400">{stats.total}</div>
-                          <div className="text-xs text-gray-600 dark:text-gray-400">Gesamt Snippets</div>
-                        </div>
-                        <div className="bg-green-50 dark:bg-green-900/20 p-3 rounded">
-                          <div className="text-2xl font-bold text-green-600 dark:text-green-400">{stats.department}</div>
-                          <div className="text-xs text-gray-600 dark:text-gray-400">Department-Snippets</div>
-                        </div>
-                        <div className="bg-purple-50 dark:bg-purple-900/20 p-3 rounded">
-                          <div className="text-2xl font-bold text-purple-600 dark:text-purple-400">{stats.organization}</div>
-                          <div className="text-xs text-gray-600 dark:text-gray-400">Organisation-Snippets</div>
-                        </div>
-                      </div>
-
-                      {stats.department === 0 ? (
-                        <div className="text-center py-8 text-gray-500 dark:text-gray-400">
-                          <p className="text-sm">Keine Department-Snippets vorhanden.</p>
-                        </div>
-                      ) : (
-                        <div className="space-y-4">
-                          {snippets
-                            .filter((snippet) => snippet.visibility === 'department')
-                            .map((snippet) => (
-                              <div
-                                key={snippet.id}
-                                className="border border-gray-200 dark:border-gray-700 rounded-lg p-4"
-                              >
-                                <div className="flex flex-col lg:flex-row lg:items-start lg:justify-between gap-3">
-                                  <div className="flex-1">
-                                    <h3 className="font-semibold text-sm text-gray-900 dark:text-white">
-                                      {snippet.title}
-                                    </h3>
-                                    <p className="text-xs text-gray-500 dark:text-gray-400 mt-1">
-                                      <span className="inline-block bg-gray-200 dark:bg-gray-700 px-2 py-0.5 rounded">
-                                        {snippet.language}
-                                      </span>
-                                      <span className="mx-2">-</span>
-                                      von {snippet.owner_username || 'Unbekannt'}
-                                    </p>
-                                  </div>
-                                  <button
-                                    onClick={() => handleSnippetToggle(snippet)}
-                                    className="text-xs px-3 py-1.5 bg-blue-600 text-white rounded hover:bg-blue-700 whitespace-nowrap"
-                                  >
-                                    {selectedSnippetId === snippet.id ? 'Ausblenden' : 'Abteilungen verwalten'}
-                                  </button>
-                                </div>
-
-                                {selectedSnippetId === snippet.id && (
-                                  <div className="mt-3 pt-3 border-t border-gray-200 dark:border-gray-700">
-                                    {snippetAccessLoading ? (
-                                      <p className="text-xs text-gray-500 dark:text-gray-400 animate-pulse">
-                                        Abteilungen werden geladen...
-                                      </p>
-                                    ) : (
-                                      <>
-                                        <h4 className="text-xs font-medium text-gray-700 dark:text-gray-300 mb-3">
-                                          Abteilungs-Zugriff ({
-                                            snippetAccess.filter((entry) => entry.enabled).length
-                                          } von {snippetAccess.length} aktiviert)
-                                        </h4>
-                                        <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-2">
-                                          {snippetAccess.map((entry) => (
-                                            <label
-                                              key={entry.department_id}
-                                              className="flex items-center p-2 bg-gray-50 dark:bg-gray-900 rounded border border-gray-200 dark:border-gray-700 hover:border-gray-300 dark:hover:border-gray-600 cursor-pointer transition-colors"
-                                            >
-                                              <input
-                                                type="checkbox"
-                                                checked={entry.enabled}
-                                                onChange={(event) =>
-                                                  toggleSnippetAccess(snippet.id, entry.department_id, event.target.checked)
-                                                }
-                                                className="w-4 h-4 text-green-600 bg-gray-100 border-gray-300 rounded focus:ring-green-500 dark:focus:ring-green-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600 cursor-pointer"
-                                              />
-                                              <span className="ml-2 text-xs text-gray-700 dark:text-gray-300 font-medium">
-                                                {entry.department_name}
-                                              </span>
-                                            </label>
-                                          ))}
-                                        </div>
-                                      </>
-                                    )}
-                                  </div>
-                                )}
-                              </div>
-                            ))}
-                        </div>
-                      )}
-                    </>
-                  )}
-                </div>
-              </div>
-            )}
-
-            {activeTab === 'languages' && (
-              <div className="space-y-6">
-                <div className="bg-white dark:bg-gray-800 rounded-lg shadow p-4">
-                  <div className="flex flex-col md:flex-row md:items-start md:justify-between gap-3 mb-4">
-                    <div>
-                      <h2 className="text-lg font-semibold text-gray-900 dark:text-white">
-                        UI-Sprachen verwalten
-                      </h2>
-                      <p className="text-sm text-gray-600 dark:text-gray-400">
-                        Pflegen Sie die verfügbaren Sprachen für die Benutzeroberfläche.
-                      </p>
-                    </div>
-                    <button
-                      type="button"
-                      onClick={openLanguageModal}
-                      className="self-start bg-green-600 text-white px-3 py-2 rounded-md hover:bg-green-700 text-sm"
-                    >
-                      Neue Sprache
-                    </button>
-                  </div>
-
-                  <div>
-                    {languagesLoading ? (
-                      <p className="text-gray-500 dark:text-gray-400 text-sm">Sprachen werden geladen...</p>
-                    ) : uiLanguages.length === 0 ? (
-                      <p className="text-gray-500 dark:text-gray-400 text-sm">Noch keine UI-Sprachen vorhanden.</p>
-                    ) : (
-                      <div className="space-y-2">
-                        {uiLanguages.map((language) => (
-                          <div
-                            key={language.id}
-                            className="flex justify-between items-center p-3 border border-gray-200 dark:border-gray-700 rounded-md"
-                          >
-                            <div>
-                              <div className="font-semibold text-sm text-gray-900 dark:text-white flex items-center gap-2">
-                                {language.name}
-                                {language.is_default && (
-                                  <span className="text-xs px-2 py-0.5 rounded bg-blue-100 text-blue-700 dark:bg-blue-900/40 dark:text-blue-300">
-                                    Standard
-                                  </span>
-                                )}
-                              </div>
-                              <div className="text-xs text-gray-600 dark:text-gray-400">Code: {language.code}</div>
-                            </div>
-                            <button
-                              type="button"
-                              onClick={() => deleteLanguage(language.id, language.name)}
-                              disabled={language.is_default}
-                              className={`px-3 py-1 text-xs rounded-md border ${
-                                language.is_default
-                                  ? 'border-gray-300 text-gray-400 dark:border-gray-600 dark:text-gray-500 cursor-not-allowed'
-                                  : 'border-red-600 text-red-600 hover:text-red-800 dark:border-red-400 dark:text-red-400 dark:hover:text-red-300'
-                              }`}
-                            >
-                              {language.is_default ? 'Nicht entfernbar' : 'Entfernen'}
-                            </button>
-                          </div>
-                        ))}
-                      </div>
-                    )}
-                  </div>
-                </div>
-
-                <div className="bg-white dark:bg-gray-800 rounded-lg shadow p-4">
-                  <h2 className="text-lg font-semibold text-gray-900 dark:text-white mb-3">
-                    Übersetzungen bearbeiten
-                  </h2>
-                  <p className="text-sm text-gray-600 dark:text-gray-400 mb-4">
-                    Änderungen werden automatisch gespeichert, sobald ein Feld den Fokus verliert.
-                  </p>
-
-                  {translationsLoading ? (
-                    <p className="text-gray-500 dark:text-gray-400 text-sm">Übersetzungen werden geladen...</p>
-                  ) : uiLanguages.length === 0 ? (
-                    <p className="text-gray-500 dark:text-gray-400 text-sm">Bitte fügen Sie zunächst mindestens eine Sprache hinzu.</p>
-                  ) : translations.length === 0 ? (
-                    <p className="text-gray-500 dark:text-gray-400 text-sm">Keine Übersetzungseinträge vorhanden.</p>
-                  ) : (
-                    <div className="space-y-4">
-                      {translations.map((group) => (
-                        <div
-                          key={group.key}
-                          className="border border-gray-200 dark:border-gray-700 rounded-md p-4"
-                        >
-                          <div className="flex flex-col md:flex-row md:items-center md:justify-between gap-2">
-                            <div>
-                              <h3 className="text-sm font-semibold text-gray-900 dark:text-white">
-                                {group.label}
-                              </h3>
-                              {group.description && (
-                                <p className="text-xs text-gray-500 dark:text-gray-400 mt-0.5">
-                                  {group.description}
-                                </p>
-                              )}
-                            </div>
-                            <span className="text-xs text-gray-400 dark:text-gray-500 font-mono">
-                              {group.key}
-                            </span>
-                          </div>
-
-                          <div className="mt-3 grid grid-cols-1 md:grid-cols-2 gap-3">
-                            {uiLanguages.map((language) => {
-                              const entry = group.entries.find((item) => item.language_id === language.id);
-                              if (!entry) {
-                                return (
-                                  <div key={`${group.key}-${language.id}`} className="text-xs text-red-500">
-                                    Fehlender Eintrag für {language.name}
-                                  </div>
-                                );
-                              }
-                              return (
-                                <div key={entry.translation_id}>
-                                  <label className="block text-xs font-medium text-gray-700 dark:text-gray-300 mb-1">
-                                    {language.name} <span className="text-gray-400">({language.code})</span>
-                                  </label>
-                                  <input
-                                    type="text"
-                                    value={entry.value}
-                                    onChange={(event) => updateTranslationDraft(entry.translation_id, event.target.value)}
-                                    onBlur={(event) => saveTranslationValue(entry.translation_id, event.target.value)}
-                                    disabled={translationSaving === entry.translation_id}
-                                    className="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
-                                    placeholder="Übersetzung eingeben"
-                                  />
-                                  {translationSaving === entry.translation_id && (
-                                    <p className="text-xs text-gray-500 dark:text-gray-400 mt-1">Wird gespeichert...</p>
-                                  )}
-                                </div>
-                              );
-                            })}
-                          </div>
-                        </div>
-                      ))}
-                    </div>
-                  )}
-                </div>
-
-                {languageModalOpen && (
-                  <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 px-4">
-                    <div
-                      className="absolute inset-0"
-                      onClick={closeLanguageModal}
-                      aria-hidden="true"
-                    />
-                    <div className="relative z-10 w-full max-w-md bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-lg shadow-xl">
-                      <div className="flex items-center justify-between px-4 py-3 border-b border-gray-200 dark:border-gray-700">
-                        <h3 className="text-base font-semibold text-gray-900 dark:text-white">Sprache hinzufügen</h3>
-                        <button
-                          type="button"
-                          onClick={closeLanguageModal}
-                          className="text-gray-600 dark:text-gray-300 hover:text-gray-900 dark:hover:text-white"
-                          aria-label="Modal schließen"
-                        >
-                          ✕
-                        </button>
-                      </div>
-                      <form onSubmit={createLanguage} className="px-4 py-4 space-y-4">
-                        <div>
-                          <label className="block text-xs font-medium text-gray-700 dark:text-gray-300 mb-1">
-                            Sprachcode
-                          </label>
-                          <input
-                            type="text"
-                            value={newLanguageCode}
-                            onChange={(event) => setNewLanguageCode(event.target.value)}
-                            className="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
-                            placeholder="z. B. de"
-                            autoFocus
-                            required
-                          />
-                          <p className="text-xs text-gray-500 dark:text-gray-400 mt-1">
-                            Kleingeschriebener ISO-639-1 Code ohne Leerzeichen.
-                          </p>
-                        </div>
-                        <div>
-                          <label className="block text-xs font-medium text-gray-700 dark:text-gray-300 mb-1">
-                            Anzeigename
-                          </label>
-                          <input
-                            type="text"
-                            value={newLanguageName}
-                            onChange={(event) => setNewLanguageName(event.target.value)}
-                            className="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
-                            placeholder="z. B. Deutsch"
-                            required
-                          />
-                        </div>
-                        <div className="flex justify-end gap-2 pt-2">
-                          <button
-                            type="button"
-                            onClick={closeLanguageModal}
-                            className="px-3 py-2 text-sm rounded-md border border-gray-300 dark:border-gray-600 text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700"
-                          >
-                            Abbrechen
-                          </button>
-                          <button
-                            type="submit"
-                            className="px-3 py-2 text-sm bg-green-600 hover:bg-green-700 text-white rounded-md"
-                          >
-                            Speichern
-                          </button>
-                        </div>
-                      </form>
-                    </div>
-                  </div>
-                )}
-              </div>
-            )}
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default AdminPanel;
diff --git a/frontend/src/components/Admin/AdminPanel.tsx b/frontend/src/components/Admin/AdminPanel.tsx
index 731c8ad..d4f42ad 100644
--- a/frontend/src/components/Admin/AdminPanel.tsx
+++ b/frontend/src/components/Admin/AdminPanel.tsx
@@ -1,4 +1,5 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { useAuth } from '../../contexts/AuthContext';
 import api, { adminLanguagesAPI, adminTranslationsAPI, snippetsAPI } from '../../services/api';
 import type {
   Channel,
@@ -8,6 +9,7 @@ import type {
   TranslationGroup,
   User,
 } from '../../types';
+import { UserRole, isSuperAdmin } from '../../types';
 
 type TabKey = 'users' | 'departments' | 'channels' | 'snippets' | 'languages';
 
@@ -26,6 +28,7 @@ type SnippetAccessEntry = {
 };
 
 const AdminPanel: React.FC = () => {
+  const { user: currentUser } = useAuth();
   const [activeTab, setActiveTab] = useState<TabKey>('users');
   const [error, setError] = useState<string | null>(null);
 
@@ -252,14 +255,18 @@ const AdminPanel: React.FC = () => {
     usersLoaded,
   ]);
 
-  const toggleAdmin = useCallback(
-    async (userId: number, isAdmin: boolean) => {
+  const updateUserRole = useCallback(
+    async (userId: number, newRole: UserRole) => {
       setError(null);
       try {
-        await api.patch(`/admin/users/${userId}/admin`, null, { params: { is_admin: !isAdmin } });
-        setUsers((prev) => prev.map((user) => (user.id === userId ? { ...user, is_admin: !isAdmin } : user)));
+        await api.patch(`/admin/users/${userId}/role`, { role: newRole });
+        setUsers((prev) => {
+          const user = prev.find(u => u.id === userId);
+          setGlobalError(`Rolle von ${user?.username} wurde zu ${newRole} geändert.`);
+          return prev.map((user) => (user.id === userId ? { ...user, role: newRole } : user));
+        });
       } catch (err) {
-        setGlobalError('Admin-Status konnte nicht geändert werden.');
+        setGlobalError('Rolle konnte nicht geändert werden.');
       }
     },
     [setGlobalError]
@@ -672,7 +679,11 @@ const AdminPanel: React.FC = () => {
                                 {user.full_name || '-'}
                               </td>
                               <td className="px-4 py-3 whitespace-nowrap text-sm">
-                                {user.is_admin ? (
+                                {user.role === 'superadmin' ? (
+                                  <span className="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-red-100 text-red-800">
+                                    SuperAdmin
+                                  </span>
+                                ) : user.role === 'admin' ? (
                                   <span className="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-green-100 text-green-800">
                                     Admin
                                   </span>
@@ -683,12 +694,19 @@ const AdminPanel: React.FC = () => {
                                 )}
                               </td>
                               <td className="px-4 py-3 whitespace-nowrap text-xs">
-                                <button
-                                  onClick={() => toggleAdmin(user.id, user.is_admin)}
-                                  className="text-blue-600 hover:text-blue-800 dark:text-blue-400 dark:hover:text-blue-300"
-                                >
-                                  {user.is_admin ? 'Admin entfernen' : 'Admin machen'}
-                                </button>
+                                {isSuperAdmin(currentUser) && user.id !== currentUser?.id ? (
+                                  <select
+                                    value={user.role}
+                                    onChange={(e) => updateUserRole(user.id, e.target.value as UserRole)}
+                                    className="text-xs border border-gray-300 rounded px-2 py-1 bg-white dark:bg-gray-700 dark:border-gray-600"
+                                  >
+                                    <option value={UserRole.USER}>User</option>
+                                    <option value={UserRole.ADMIN}>Admin</option>
+                                    <option value={UserRole.SUPERADMIN}>SuperAdmin</option>
+                                  </select>
+                                ) : (
+                                  <span className="text-gray-500">-</span>
+                                )}
                               </td>
                             </tr>
                           ))}
diff --git a/frontend/src/components/Auth/Login.tsx b/frontend/src/components/Auth/Login.tsx
index 2dacf8e..4cbe192 100644
--- a/frontend/src/components/Auth/Login.tsx
+++ b/frontend/src/components/Auth/Login.tsx
@@ -71,7 +71,7 @@ const Login: React.FC = () => {
         
         <p className="mt-4 text-center text-gray-600 dark:text-gray-400">
           Don't have an account?{' '}
-          <Link to="/register" className="text-indigo-600 dark:text-indigo-400 hover:underline">
+          <Link to="/register" className="text-blue-600 dark:text-blue-400 hover:underline">
             Register
           </Link>
         </p>
diff --git a/frontend/src/components/Auth/Register.tsx b/frontend/src/components/Auth/Register.tsx
index a603abf..f35ee41 100644
--- a/frontend/src/components/Auth/Register.tsx
+++ b/frontend/src/components/Auth/Register.tsx
@@ -98,7 +98,7 @@ const Register: React.FC = () => {
         
         <p className="mt-4 text-center text-gray-600 dark:text-gray-400">
           Already have an account?{' '}
-          <Link to="/login" className="text-indigo-600 dark:text-indigo-400 hover:underline">
+          <Link to="/login" className="text-blue-600 dark:text-blue-400 hover:underline">
             Login
           </Link>
         </p>
diff --git a/frontend/src/components/Chat/ChatView.tsx b/frontend/src/components/Chat/ChatView.tsx
index 2a01c77..adc3419 100644
--- a/frontend/src/components/Chat/ChatView.tsx
+++ b/frontend/src/components/Chat/ChatView.tsx
@@ -6,13 +6,15 @@ import MessageInput from './MessageInput';
 import Sidebar from './Sidebar';
 import DirectMessagesSidebar from './DirectMessagesSidebar';
 import DirectMessageView from './DirectMessageView';
+import { useUnreadMessages } from '../../contexts/UnreadMessagesContext';
 
 const ChatView: React.FC = () => {
   const [channels, setChannels] = useState<Channel[]>([]);
   const [departments, setDepartments] = useState<Department[]>([]);
   const [selectedChannel, setSelectedChannel] = useState<Channel | null>(null);
   const [selectedUser, setSelectedUser] = useState<User | null>(null);
-  const [replyTo, setReplyTo] = useState<{ id: number; content: string; sender_username: string } | null>(null);
+  const [replyTo, setReplyTo] = useState<{ id: number; content: string; sender_username: string; sender_full_name?: string } | null>(null);
+  const { markChannelAsRead, markDirectMessageAsRead, setActiveChannel, setActiveDirectMessage } = useUnreadMessages();
   const [loading, setLoading] = useState(true);
 
   useEffect(() => {
@@ -55,6 +57,9 @@ const ChatView: React.FC = () => {
         onSelectChannel={(channel) => {
           setSelectedChannel(channel);
           setSelectedUser(null);
+          setActiveChannel(channel.id);
+          setActiveDirectMessage(null);
+          markChannelAsRead(channel.id);
         }}
       />
       
@@ -110,6 +115,9 @@ const ChatView: React.FC = () => {
         onSelectUser={(user) => {
           setSelectedUser(user);
           setSelectedChannel(null);
+          setActiveDirectMessage(user.id);
+          setActiveChannel(null);
+          markDirectMessageAsRead(user.id);
         }}
       />
     </div>
diff --git a/frontend/src/components/Chat/DirectMessageView.tsx b/frontend/src/components/Chat/DirectMessageView.tsx
index 25cd813..8ec3fc8 100644
--- a/frontend/src/components/Chat/DirectMessageView.tsx
+++ b/frontend/src/components/Chat/DirectMessageView.tsx
@@ -1,8 +1,10 @@
 import React, { useState, useEffect, useRef } from 'react';
-import { directMessagesAPI } from '../../services/api';
+import { directMessagesAPI, getApiUrl } from '../../services/api';
 import { useAuth } from '../../contexts/AuthContext';
 import type { User } from '../../types';
 import { useToast } from '../../contexts/ToastContext';
+import { useUserStatus } from '../../contexts/UserStatusContext';
+import UserStatusIndicator from '../common/UserStatusIndicator';
 
 interface DirectMessage {
   id: number;
@@ -24,6 +26,7 @@ interface DirectMessageViewProps {
 
 const DirectMessageView: React.FC<DirectMessageViewProps> = ({ user }) => {
   const { addToast } = useToast();
+  const { getUserStatus } = useUserStatus();
   const [messages, setMessages] = useState<DirectMessage[]>([]);
   const [content, setContent] = useState('');
   const [loading, setLoading] = useState(true);
@@ -37,24 +40,44 @@ const DirectMessageView: React.FC<DirectMessageViewProps> = ({ user }) => {
     // Set up WebSocket for real-time updates
     const token = localStorage.getItem('token');
     if (token && currentUser) {
-      const wsProtocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
-      const wsHost = import.meta.env.VITE_WS_URL || `${wsProtocol}//localhost:8000`;
-      const ws = new WebSocket(`${wsHost}/ws/${-currentUser.id}?token=${token}`);
+      // Use API URL to determine WebSocket host
+      const apiUrl = import.meta.env.VITE_API_URL || 'http://localhost:8000';
+      const url = new URL(apiUrl);
+      const wsProtocol = url.protocol === 'https:' ? 'wss:' : 'ws:';
+      const wsUrl = `${wsProtocol}//${url.host}/api/ws/${-currentUser.id}?token=${token}`;
+      const ws = new WebSocket(wsUrl);
+      
+      ws.onopen = () => {
+        console.log('DirectMessage WebSocket connected for user:', currentUser.id);
+      };
       
       ws.onmessage = (event) => {
-        const data = JSON.parse(event.data);
-        if (data.type === 'direct_message') {
-          // Only add if message is from/to the selected user
-          const msg = data.message;
-          if (
-            (msg.sender_id === user.id && msg.receiver_id === currentUser.id) ||
-            (msg.sender_id === currentUser.id && msg.receiver_id === user.id)
-          ) {
-            setMessages((prevMessages) => [...prevMessages, msg]);
+        try {
+          const data = JSON.parse(event.data);
+          if (data.type === 'direct_message') {
+            // Only add if message is from/to the selected user
+            const msg = data.message;
+            if (
+              (msg.sender_id === user.id && msg.receiver_id === currentUser.id) ||
+              (msg.sender_id === currentUser.id && msg.receiver_id === user.id)
+            ) {
+              // Message marking is now handled globally in UnreadMessagesContext
+              setMessages((prevMessages) => [...prevMessages, msg]);
+            }
           }
+        } catch (error) {
+          console.error('Error parsing DirectMessage WebSocket message:', error);
         }
       };
       
+      ws.onerror = (error) => {
+        console.error('DirectMessage WebSocket error for user', currentUser.id, ':', error);
+      };
+      
+      ws.onclose = (event) => {
+        console.log('DirectMessage WebSocket closed for user', currentUser.id, 'Code:', event.code, 'Reason:', event.reason);
+      };
+      
       return () => {
         ws.close();
       };
@@ -138,7 +161,7 @@ const DirectMessageView: React.FC<DirectMessageViewProps> = ({ user }) => {
                 {/* Profile Picture / Initials */}
                 {message.sender_profile_picture ? (
                   <img
-                    src={`http://localhost:8000/${message.sender_profile_picture}`}
+                    src={getApiUrl(message.sender_profile_picture)}
                     alt={message.sender_username}
                     className="w-8 h-8 rounded-full object-cover flex-shrink-0"
                   />
@@ -151,9 +174,12 @@ const DirectMessageView: React.FC<DirectMessageViewProps> = ({ user }) => {
                 {/* Message Bubble */}
                 <div className={`flex flex-col ${isOwnMessage ? 'items-end' : 'items-start'}`}>
                   <div className="flex items-baseline space-x-2 mb-1">
-                    <span className="font-semibold text-xs text-gray-900 dark:text-white">
-                      {message.sender_username}
-                    </span>
+                    <div className="flex items-center space-x-1">
+                      <span className="font-semibold text-xs text-gray-900 dark:text-white">
+                        {message.sender_full_name || message.sender_username}
+                      </span>
+                      <UserStatusIndicator status={getUserStatus(message.sender_id)} size="sm" />
+                    </div>
                     <span className="text-xs text-gray-500 dark:text-gray-400">
                       {new Date(message.created_at).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}
                     </span>
@@ -161,8 +187,8 @@ const DirectMessageView: React.FC<DirectMessageViewProps> = ({ user }) => {
                   
                   <div className={`px-3 py-1 rounded-lg ${
                     isOwnMessage
-                      ? 'bg-blue-500 text-white rounded-br-none'
-                      : 'bg-white dark:bg-gray-700 text-gray-800 dark:text-gray-200 border border-gray-200 dark:border-gray-600 rounded-bl-none'
+                      ? 'bg-blue-500 bg-opacity-80 text-white rounded-br-none'
+                      : 'bg-white bg-opacity-80 dark:bg-gray-700 dark:bg-opacity-20 text-gray-800 dark:text-gray-200 border border-gray-200 dark:border-gray-600 rounded-bl-none'
                   }`}>
                     <div className="text-sm whitespace-pre-wrap break-words">
                       {message.content}
diff --git a/frontend/src/components/Chat/DirectMessagesSidebar.tsx b/frontend/src/components/Chat/DirectMessagesSidebar.tsx
index b9ce0fc..dd378c3 100644
--- a/frontend/src/components/Chat/DirectMessagesSidebar.tsx
+++ b/frontend/src/components/Chat/DirectMessagesSidebar.tsx
@@ -1,7 +1,12 @@
 import React, { useState, useEffect } from 'react';
 import { useAuth } from '../../contexts/AuthContext';
+import { useUserStatus } from '../../contexts/UserStatusContext';
+import { useUnreadMessages } from '../../contexts/UnreadMessagesContext';
 import axios from 'axios';
+import { getApiUrl } from '../../services/api';
 import type { User } from '../../types';
+import UserStatusIndicator from '../common/UserStatusIndicator';
+import BlinkingEnvelope from '../common/BlinkingEnvelope';
 
 interface DirectMessagesSidebarProps {
   onSelectUser: (user: User) => void;
@@ -18,6 +23,8 @@ const DirectMessagesSidebar: React.FC<DirectMessagesSidebarProps> = ({
   const [showUserPicker, setShowUserPicker] = useState(false);
   const [loading, setLoading] = useState(false);
   const { user: currentUser } = useAuth();
+  const { getUserStatus } = useUserStatus();
+  const { hasUnreadDirectMessage, markDirectMessageAsUnread } = useUnreadMessages();
 
   useEffect(() => {
     // Load conversations on mount
@@ -27,7 +34,7 @@ const DirectMessagesSidebar: React.FC<DirectMessagesSidebarProps> = ({
   const loadConversations = async () => {
     try {
       const token = localStorage.getItem('token');
-      const response = await axios.get('http://localhost:8000/direct-messages/conversations', {
+      const response = await axios.get(getApiUrl('/direct-messages/conversations'), {
         headers: {
           Authorization: `Bearer ${token}`
         }
@@ -49,7 +56,7 @@ const DirectMessagesSidebar: React.FC<DirectMessagesSidebarProps> = ({
     setLoading(true);
     try {
       const token = localStorage.getItem('token');
-      const response = await axios.get('http://localhost:8000/admin/users', {
+      const response = await axios.get(getApiUrl('/admin/users'), {
         headers: {
           Authorization: `Bearer ${token}`
         }
@@ -112,6 +119,7 @@ const DirectMessagesSidebar: React.FC<DirectMessagesSidebarProps> = ({
               <button
                 key={user.id}
                 onClick={() => onSelectUser(user)}
+                onDoubleClick={() => markDirectMessageAsUnread(user.id)}
                 className={`w-full text-left px-3 py-1.5 text-sm hover:bg-gray-100 dark:hover:bg-gray-700 ${
                   selectedUserId === user.id
                     ? 'bg-blue-100 dark:bg-blue-900 text-blue-900 dark:text-blue-100'
@@ -119,8 +127,9 @@ const DirectMessagesSidebar: React.FC<DirectMessagesSidebarProps> = ({
                 }`}
               >
                 <div className="flex items-center space-x-2">
-                  <span className="w-2 h-2 rounded-full bg-green-500"></span>
+                  <UserStatusIndicator status={getUserStatus(user.id)} size="sm" />
                   <span>{user.username}</span>
+                  <BlinkingEnvelope hasNewMessages={hasUnreadDirectMessage(user.id)} />
                 </div>
                 {user.full_name && (
                   <div className="text-xs text-gray-500 dark:text-gray-400 ml-4">
@@ -183,19 +192,28 @@ const DirectMessagesSidebar: React.FC<DirectMessagesSidebarProps> = ({
                       onClick={() => handleAddUser(user)}
                       className="w-full text-left p-2.5 border border-gray-200 dark:border-gray-700 rounded hover:bg-gray-50 dark:hover:bg-gray-700"
                     >
-                      <div className="font-medium text-sm text-gray-900 dark:text-white">
-                        {user.username}
+                      <div className="flex items-center space-x-2">
+                        <UserStatusIndicator status={getUserStatus(user.id)} size="sm" />
+                        <div className="flex items-center space-x-2">
+                          <UserStatusIndicator status={getUserStatus(user.id)} size="sm" />
+                          <div className="flex-1">
+                            <div className="font-medium text-sm text-gray-900 dark:text-white">
+                              {user.username}
+                            </div>
+                            {user.full_name && (
+                              <div className="text-xs text-gray-600 dark:text-gray-400 mt-0.5">
+                                {user.full_name}
+                              </div>
+                            )}
+                            {user.email && (
+                              <div className="text-xs text-gray-500 dark:text-gray-500 mt-0.5">
+                                {user.email}
+                              </div>
+                            )}
+                          </div>
+                          <BlinkingEnvelope hasNewMessages={hasUnreadDirectMessage(user.id)} />
+                        </div>
                       </div>
-                      {user.full_name && (
-                        <div className="text-xs text-gray-600 dark:text-gray-400 mt-0.5">
-                          {user.full_name}
-                        </div>
-                      )}
-                      {user.email && (
-                        <div className="text-xs text-gray-500 dark:text-gray-500 mt-0.5">
-                          {user.email}
-                        </div>
-                      )}
                     </button>
                   ))}
                 </div>
diff --git a/frontend/src/components/Chat/MessageInput.tsx b/frontend/src/components/Chat/MessageInput.tsx
index ba1a768..1314781 100644
--- a/frontend/src/components/Chat/MessageInput.tsx
+++ b/frontend/src/components/Chat/MessageInput.tsx
@@ -7,7 +7,7 @@ import { useToast } from '../../contexts/ToastContext';
 
 interface MessageInputProps {
   channelId: number;
-  replyTo?: { id: number; content: string; sender_username: string } | null;
+  replyTo?: { id: number; content: string; sender_username: string; sender_full_name?: string } | null;
   onCancelReply?: () => void;
 }
 
@@ -85,18 +85,18 @@ const MessageInput: React.FC<MessageInputProps> = ({ channelId, replyTo, onCance
   return (
     <div className="bg-white dark:bg-gray-800 border-t border-gray-200 dark:border-gray-700 p-3">
       {replyTo && (
-        <div className="mb-2 p-2 bg-indigo-50 dark:bg-indigo-900 rounded flex items-start justify-between">
+        <div className="mb-2 p-2 bg-blue-50 dark:bg-blue-900 rounded flex items-start justify-between">
           <div className="flex-1">
-            <div className="text-xs font-medium text-indigo-900 dark:text-indigo-100">
-              Replying to {replyTo.sender_username}
+            <div className="text-xs font-medium text-blue-900 dark:text-blue-100">
+              Replying to {replyTo.sender_full_name || replyTo.sender_username}
             </div>
-            <div className="text-xs text-indigo-700 dark:text-indigo-200 mt-0.5 truncate">
+            <div className="text-xs text-blue-700 dark:text-blue-200 mt-0.5 truncate">
               {replyTo.content}
             </div>
           </div>
           <button
             onClick={onCancelReply}
-            className="text-indigo-900 dark:text-indigo-100 hover:text-red-600 text-sm ml-2"
+            className="text-blue-900 dark:text-blue-100 hover:text-red-600 text-sm ml-2"
           >
             ✕
           </button>
@@ -104,13 +104,13 @@ const MessageInput: React.FC<MessageInputProps> = ({ channelId, replyTo, onCance
       )}
       
       {selectedSnippet && (
-        <div className="mb-2 p-2 bg-indigo-100 dark:bg-indigo-900 rounded flex items-center justify-between">
-          <span className="text-xs text-indigo-900 dark:text-indigo-100">
-            📋 {selectedSnippet.title} ({selectedSnippet.language})
+        <div className="mb-2 p-2 bg-blue-100 dark:bg-blue-900 rounded flex items-center justify-between">
+          <span className="text-xs text-blue-900 dark:text-blue-100">
+            {selectedSnippet.title} ({selectedSnippet.language})
           </span>
           <button
             onClick={() => setSelectedSnippet(null)}
-            className="text-indigo-900 dark:text-indigo-100 hover:text-red-600 text-sm"
+            className="text-blue-900 dark:text-blue-100 hover:text-red-600 text-sm"
           >
             ✕
           </button>
diff --git a/frontend/src/components/Chat/MessageList.tsx b/frontend/src/components/Chat/MessageList.tsx
index d469859..c58f288 100644
--- a/frontend/src/components/Chat/MessageList.tsx
+++ b/frontend/src/components/Chat/MessageList.tsx
@@ -1,18 +1,21 @@
 import React, { useEffect, useRef, useState } from 'react';
-import { messagesAPI, filesAPI } from '../../services/api';
+import { messagesAPI, filesAPI, getApiUrl } from '../../services/api';
 import type { Message } from '../../types';
 import CodeBlock from '../common/CodeBlock';
 import { useAuth } from '../../contexts/AuthContext';
 import { useToast } from '../../contexts/ToastContext';
+import { useUserStatus } from '../../contexts/UserStatusContext';
+import UserStatusIndicator from '../common/UserStatusIndicator';
 
 interface MessageListProps {
   channelId: number;
-  onReply?: (message: { id: number; content: string; sender_username: string }) => void;
+  onReply?: (message: { id: number; content: string; sender_username: string; sender_full_name?: string }) => void;
 }
 
 const MessageList: React.FC<MessageListProps> = ({ channelId, onReply }) => {
   const { user } = useAuth();
   const { addToast } = useToast();
+  const { getUserStatus } = useUserStatus();
   const [messages, setMessages] = useState<Message[]>([]);
   const [loading, setLoading] = useState(true);
   const [hasMore, setHasMore] = useState(true);
@@ -40,10 +43,11 @@ const MessageList: React.FC<MessageListProps> = ({ channelId, onReply }) => {
     // Set up WebSocket for real-time updates
     const token = localStorage.getItem('token');
     if (token && channelId > 0) {
-      const wsProtocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
-      const wsHost = import.meta.env.VITE_WS_URL || `${wsProtocol}//localhost:8000`;
-      const wsUrl = `${wsHost}/ws/${channelId}?token=${token}`;
-      console.log('Connecting to WebSocket:', wsUrl);
+      // Use API URL to determine WebSocket host and add /ws path
+      const apiUrl = import.meta.env.VITE_API_URL || 'http://localhost:8000';
+      const url = new URL(apiUrl);
+      const wsProtocol = url.protocol === 'https:' ? 'wss:' : 'ws:';
+      const wsUrl = `${wsProtocol}//${url.host}/api/ws/${channelId}?token=${token}`;
       
       const ws = new WebSocket(wsUrl);
       wsRef.current = ws;
@@ -53,36 +57,41 @@ const MessageList: React.FC<MessageListProps> = ({ channelId, onReply }) => {
       };
       
       ws.onmessage = (event) => {
-        const data = JSON.parse(event.data);
-        if (data.type === 'message') {
-          // Add new message immediately to the list, but avoid duplicates
-          setMessages((prevMessages) => {
-            // Check if message already exists
-            if (prevMessages.some(msg => msg.id === data.message.id)) {
-              return prevMessages;
-            }
-            const updated = [...prevMessages, data.message];
-            // Keep only the most recent messages when limit is exceeded
-            if (updated.length > MESSAGES_LIMIT * 3) {
-              return updated.slice(-MESSAGES_LIMIT * 2);
-            }
-            return updated;
-          });
-        } else if (data.type === 'message_deleted') {
-          // Replace deleted message with placeholder
-          setMessages((prevMessages) => 
-            prevMessages.map(msg => 
-              msg.id === data.message_id 
-                ? { ...msg, deleted: true }
-                : msg
-            )
-          );
+        try {
+          const data = JSON.parse(event.data);
+          if (data.type === 'message') {
+            // Message marking is now handled globally in UnreadMessagesContext
+            
+            // Add new message immediately to the list, but avoid duplicates
+            setMessages((prevMessages) => {
+              // Check if message already exists
+              if (prevMessages.some(msg => msg.id === data.message.id)) {
+                return prevMessages;
+              }
+              const updated = [...prevMessages, data.message];
+              // Keep only the most recent messages when limit is exceeded
+              if (updated.length > MESSAGES_LIMIT * 3) {
+                return updated.slice(-MESSAGES_LIMIT * 2);
+              }
+              return updated;
+            });
+          } else if (data.type === 'message_deleted') {
+            // Replace deleted message with placeholder
+            setMessages((prevMessages) => 
+              prevMessages.map(msg => 
+                msg.id === data.message_id 
+                  ? { ...msg, deleted: true }
+                  : msg
+              )
+            );
+          }
+        } catch (error) {
+          console.error('Error parsing WebSocket message:', error);
         }
       };
 
       ws.onerror = (error) => {
         console.error('WebSocket error for channel', channelId, ':', error);
-        console.error('WebSocket URL was:', wsUrl);
       };
 
       ws.onclose = (event) => {
@@ -277,7 +286,7 @@ const MessageList: React.FC<MessageListProps> = ({ channelId, onReply }) => {
               <div className={`flex items-start space-x-2 max-w-[16rem] ${isOwnMessage ? 'flex-row-reverse space-x-reverse' : ''}`}>
                 {message.sender_profile_picture ? (
                   <img
-                    src={`http://localhost:8000/${message.sender_profile_picture}`}
+                    src={getApiUrl(message.sender_profile_picture)}
                     alt={message.sender_username}
                     className="w-8 h-8 rounded-full object-cover flex-shrink-0"
                   />
@@ -288,9 +297,12 @@ const MessageList: React.FC<MessageListProps> = ({ channelId, onReply }) => {
                 )}
                 <div className={`flex flex-col ${isOwnMessage ? 'items-end' : 'items-start'}`}>
                   <div className="flex items-baseline space-x-2 mb-1">
-                    <span className="font-semibold text-xs text-gray-900 dark:text-white">
-                      {message.sender_username || 'Unknown'}
-                    </span>
+                    <div className="flex items-center space-x-1">
+                      <span className="font-semibold text-xs text-gray-900 dark:text-white">
+                        {message.sender_full_name || message.sender_username || 'Unknown'}
+                      </span>
+                      <UserStatusIndicator status={getUserStatus(message.sender_id)} size="sm" />
+                    </div>
                     <span className="text-xs text-gray-500 dark:text-gray-400">
                       {new Date(message.created_at).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}
                     </span>
@@ -313,7 +325,7 @@ const MessageList: React.FC<MessageListProps> = ({ channelId, onReply }) => {
             <div className={`flex items-start space-x-2 max-w-[16rem] ${isOwnMessage ? 'flex-row-reverse space-x-reverse' : ''}`}>
               {message.sender_profile_picture ? (
                 <img
-                  src={`http://localhost:8000/${message.sender_profile_picture}`}
+                    src={getApiUrl(message.sender_profile_picture)}
                   alt={message.sender_username}
                   className="w-8 h-8 rounded-full object-cover flex-shrink-0"
                 />
@@ -325,9 +337,12 @@ const MessageList: React.FC<MessageListProps> = ({ channelId, onReply }) => {
               
               <div className={`flex flex-col ${isOwnMessage ? 'items-end' : 'items-start'} relative`}>
                 <div className="flex items-baseline space-x-2 mb-1">
-                  <span className="font-semibold text-xs text-gray-900 dark:text-white">
-                    {message.sender_username || 'Unknown'}
-                  </span>
+                  <div className="flex items-center space-x-1">
+                    <span className="font-semibold text-xs text-gray-900 dark:text-white">
+                      {message.sender_full_name || message.sender_username || 'Unknown'}
+                    </span>
+                    <UserStatusIndicator status={getUserStatus(message.sender_id)} size="sm" />
+                  </div>
                   <span className="text-xs text-gray-500 dark:text-gray-400">
                     {new Date(message.created_at).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}
                   </span>
@@ -335,8 +350,8 @@ const MessageList: React.FC<MessageListProps> = ({ channelId, onReply }) => {
                 
                 <div className={`px-1 py-1 rounded-lg relative ${
                   isOwnMessage
-                    ? 'bg-blue-500 text-white rounded-br-none'
-                    : 'bg-white dark:bg-gray-700 text-gray-800 dark:text-gray-200 border border-gray-200 dark:border-gray-600 rounded-bl-none'
+                    ? 'bg-blue-500 bg-opacity-80 text-white rounded-br-none'
+                    : 'bg-white bg-opacity-80 dark:bg-gray-700 dark:bg-opacity-20 text-gray-800 dark:text-gray-200 border border-gray-200 dark:border-gray-600 rounded-bl-none'
                 }`}>
               {/* Hover Action Buttons */}
               <div className={`absolute ${isOwnMessage ? 'left-0 -translate-x-full' : 'right-0 translate-x-full'} top-0 opacity-0 group-hover:opacity-100 transition-opacity flex gap-1 px-2`}>
@@ -346,7 +361,8 @@ const MessageList: React.FC<MessageListProps> = ({ channelId, onReply }) => {
                       onReply({ 
                         id: message.id, 
                         content: message.content, 
-                        sender_username: message.sender_username || 'Unknown' 
+                        sender_username: message.sender_username || 'Unknown',
+                        sender_full_name: message.sender_full_name
                       });
                     }}
                     className="p-1.5 bg-white dark:bg-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 rounded-full shadow-lg border border-gray-200 dark:border-gray-600"
@@ -415,7 +431,7 @@ const MessageList: React.FC<MessageListProps> = ({ channelId, onReply }) => {
                   onClick={() => message.reply_to && scrollToMessage(message.reply_to.id)}
                 >
                   <div className="text-xs font-medium text-gray-700 dark:text-gray-300">
-                    {message.reply_to.sender_username}
+                    {message.reply_to.sender_full_name || message.reply_to.sender_username}
                   </div>
                   <div className="text-xs text-gray-600 dark:text-gray-400 truncate">
                     {message.reply_to.content}
diff --git a/frontend/src/components/Chat/Sidebar.tsx b/frontend/src/components/Chat/Sidebar.tsx
index 810a783..fd355ca 100644
--- a/frontend/src/components/Chat/Sidebar.tsx
+++ b/frontend/src/components/Chat/Sidebar.tsx
@@ -1,11 +1,14 @@
 import React from 'react';
 import type { Channel, Department } from '../../types';
+import { useUnreadMessages } from '../../contexts/UnreadMessagesContext';
+import BlinkingEnvelope from '../common/BlinkingEnvelope';
 
 interface SidebarProps {
   channels: Channel[];
   departments: Department[];
   selectedChannel: Channel | null;
   onSelectChannel: (channel: Channel) => void;
+  onDeleteChannel?: (channel: Channel) => void;
 }
 
 const Sidebar: React.FC<SidebarProps> = ({
@@ -13,7 +16,10 @@ const Sidebar: React.FC<SidebarProps> = ({
   departments,
   selectedChannel,
   onSelectChannel,
+  onDeleteChannel,
 }) => {
+  const { hasUnreadChannel, markChannelAsUnread } = useUnreadMessages();
+
   // Group channels by department
   const channelsByDept = channels.reduce((acc, channel) => {
     if (!acc[channel.department_id]) {
@@ -23,8 +29,26 @@ const Sidebar: React.FC<SidebarProps> = ({
     return acc;
   }, {} as Record<number, Channel[]>);
 
+  const handleChannelClick = (channel: Channel) => {
+    onSelectChannel(channel);
+  };
+
+  const handleChannelDoubleClick = (channel: Channel) => {
+    // Test function: mark as unread on double click
+    markChannelAsUnread(channel.id);
+  };
+
+  const handleDeleteClick = (channel: Channel, e: React.MouseEvent) => {
+    e.stopPropagation();
+    if (onDeleteChannel) {
+      if (window.confirm(`Channel "${channel.name}" und alle seine Inhalte (Nachrichten, Kanban-Board) wirklich löschen? Diese Aktion kann nicht rückgängig gemacht werden.`)) {
+        onDeleteChannel(channel);
+      }
+    }
+  };
+
   return (
-    <div className="w-52 bg-white dark:bg-gray-800 border-r border-gray-200 dark:border-gray-700 flex flex-col">
+    <div className="w-64 bg-white dark:bg-gray-800 border-r border-gray-200 dark:border-gray-700 flex flex-col">
       <div className="px-3 py-2 border-b border-gray-200 dark:border-gray-700">
         <h3 className="font-semibold text-base text-gray-900 dark:text-white">Channels</h3>
       </div>
@@ -37,17 +61,34 @@ const Sidebar: React.FC<SidebarProps> = ({
             </div>
             
             {channelsByDept[dept.id]?.map((channel) => (
-              <button
-                key={channel.id}
-                onClick={() => onSelectChannel(channel)}
-                className={`w-full text-left px-3 py-1.5 text-sm hover:bg-gray-100 dark:hover:bg-gray-700 ${
-                  selectedChannel?.id === channel.id
-                    ? 'bg-blue-100 dark:bg-blue-900 text-blue-900 dark:text-blue-100'
-                    : 'text-gray-700 dark:text-gray-300'
-                }`}
-              >
-                # {channel.name}
-              </button>
+              <div key={channel.id} className="relative group">
+                <button
+                  onClick={() => handleChannelClick(channel)}
+                  onDoubleClick={() => handleChannelDoubleClick(channel)}
+                  className={`w-full text-left px-3 py-1.5 text-sm hover:bg-gray-100 dark:hover:bg-gray-700 ${
+                    selectedChannel?.id === channel.id
+                      ? 'bg-blue-100 dark:bg-blue-900 text-blue-900 dark:text-blue-100'
+                      : 'text-gray-700 dark:text-gray-300'
+                  }`}
+                >
+                  <div className="flex items-center justify-between">
+                    <span># {channel.name}</span>
+                    <BlinkingEnvelope hasNewMessages={hasUnreadChannel(channel.id)} />
+                  </div>
+                </button>
+                
+                {onDeleteChannel && (
+                  <button
+                    onClick={(e) => handleDeleteClick(channel, e)}
+                    className="absolute right-1 top-1 opacity-0 group-hover:opacity-100 p-1 text-red-500 hover:text-red-700 hover:bg-red-50 dark:hover:bg-red-900/20 rounded transition-opacity"
+                    title="Channel löschen"
+                  >
+                    <svg className="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                      <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" />
+                    </svg>
+                  </button>
+                )}
+              </div>
             ))}
           </div>
         ))}
diff --git a/frontend/src/components/Kanban/KanbanArchiveModal.tsx b/frontend/src/components/Kanban/KanbanArchiveModal.tsx
new file mode 100644
index 0000000..3d48e8e
--- /dev/null
+++ b/frontend/src/components/Kanban/KanbanArchiveModal.tsx
@@ -0,0 +1,96 @@
+import React from 'react';
+import type { KanbanCard } from '../../types';
+
+interface KanbanArchiveModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+  archivedCards: KanbanCard[];
+}
+
+const KanbanArchiveModal: React.FC<KanbanArchiveModalProps> = ({ isOpen, onClose, archivedCards }) => {
+
+  const formatDate = (dateString: string) => {
+    return new Date(dateString).toLocaleDateString('de-DE', {
+      year: 'numeric',
+      month: '2-digit',
+      day: '2-digit',
+      hour: '2-digit',
+      minute: '2-digit'
+    });
+  };
+
+  if (!isOpen) return null;
+
+  return (
+    <div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50">
+      <div className="bg-white dark:bg-gray-800 rounded-lg shadow-xl max-w-6xl w-full mx-4 max-h-[90vh] overflow-hidden">
+        {/* Header */}
+        <div className="px-6 py-4 border-b border-gray-200 dark:border-gray-700">
+          <div className="flex items-center justify-between">
+            <h2 className="text-xl font-semibold text-gray-900 dark:text-white">
+              Archivierte Tasks
+            </h2>
+            <button
+              onClick={onClose}
+              className="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300"
+            >
+              <svg className="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M6 18L18 6M6 6l12 12" />
+              </svg>
+            </button>
+          </div>
+        </div>
+
+        {/* Content */}
+        <div className="p-6 overflow-y-auto max-h-[calc(90vh-120px)]">
+          {archivedCards.length === 0 ? (
+            <div className="text-center py-8">
+              <div className="text-gray-500 dark:text-gray-400">Keine archivierten Tasks gefunden</div>
+            </div>
+          ) : (
+            <div className="overflow-x-auto">
+              <table className="min-w-full divide-y divide-gray-200 dark:divide-gray-700">
+                <thead className="bg-gray-50 dark:bg-gray-700">
+                  <tr>
+                    <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-300 uppercase tracking-wider">
+                      Titel
+                    </th>
+                    <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-300 uppercase tracking-wider">
+                      Beschreibung
+                    </th>
+                    <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-300 uppercase tracking-wider">
+                      Erstellt am
+                    </th>
+                    <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-300 uppercase tracking-wider">
+                      Abgeschlossen am
+                    </th>
+                  </tr>
+                </thead>
+                <tbody className="bg-white dark:bg-gray-800 divide-y divide-gray-200 dark:divide-gray-700">
+                  {archivedCards.map((card) => (
+                    <tr key={card.id} className="hover:bg-gray-50 dark:hover:bg-gray-700">
+                      <td className="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-900 dark:text-white">
+                        {card.title}
+                      </td>
+                      <td className="px-6 py-4 text-sm text-gray-500 dark:text-gray-300">
+                        {card.description || '-'}
+                      </td>
+                      <td className="px-6 py-4 whitespace-nowrap text-sm text-gray-500 dark:text-gray-300">
+                        {formatDate(card.created_at)}
+                      </td>
+                      <td className="px-6 py-4 whitespace-nowrap text-sm text-gray-500 dark:text-gray-300">
+                        {card.updated_at ? formatDate(card.updated_at) : formatDate(card.created_at)}
+                      </td>
+                    </tr>
+                  ))}
+                </tbody>
+              </table>
+            </div>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default KanbanArchiveModal;
\ No newline at end of file
diff --git a/frontend/src/components/Kanban/KanbanBoard.tsx b/frontend/src/components/Kanban/KanbanBoard.tsx
index f673dd7..bf6697f 100644
--- a/frontend/src/components/Kanban/KanbanBoard.tsx
+++ b/frontend/src/components/Kanban/KanbanBoard.tsx
@@ -5,6 +5,7 @@ import { kanbanAPI, channelsAPI, departmentsAPI } from '../../services/api';
 import type { KanbanBoardWithColumns, KanbanColumn, KanbanCard, Channel, Department } from '../../types';
 import KanbanColumnComponent from './KanbanColumn';
 import KanbanCardModal from './KanbanCardModal';
+import KanbanArchiveModal from './KanbanArchiveModal';
 import KanbanSidebar from './KanbanSidebar';
 
 const KanbanBoard: React.FC = () => {
@@ -20,6 +21,7 @@ const KanbanBoard: React.FC = () => {
   const [sidebarLoading, setSidebarLoading] = useState(true);
   const [selectedCard, setSelectedCard] = useState<KanbanCard | null>(null);
   const [showCardModal, setShowCardModal] = useState(false);
+  const [showArchiveModal, setShowArchiveModal] = useState(false);
 
   useEffect(() => {
     loadSidebarData();
@@ -256,6 +258,12 @@ const KanbanBoard: React.FC = () => {
     setShowCardModal(true);
   };
 
+  const getArchivedCards = () => {
+    if (!board) return [];
+    const doneColumn = board.columns.find(col => col.name.toLowerCase() === 'done');
+    return doneColumn ? doneColumn.cards : [];
+  };
+
   if (sidebarLoading) {
     return (
       <div className="h-full flex items-center justify-center text-gray-500 dark:text-gray-400">
@@ -285,43 +293,70 @@ const KanbanBoard: React.FC = () => {
             Kanban-Board nicht gefunden
           </div>
         ) : (
-          <div className="flex-1 p-4 overflow-y-auto">
-            <div className="flex items-center justify-between mb-4">
-              <div>
-                <h1 className="text-2xl font-bold text-gray-900 dark:text-white">
-                  {board.name}
-                </h1>
-                {selectedChannel && (
-                  <p className="text-sm text-gray-600 dark:text-gray-400 mt-1">
-                    #{selectedChannel.name}
-                  </p>
-                )}
+          <div className="flex-1 flex flex-col">
+            {/* Header */}
+            <div className="bg-white dark:bg-gray-800 border-b border-gray-200 dark:border-gray-700 px-3 py-2">
+              <div className="flex items-center justify-between">
+                <div>
+                  <h2 className="text-base font-semibold text-gray-900 dark:text-white">
+                    Kanban Board
+                  </h2>
+                  {selectedChannel && (
+                    <p className="text-sm text-gray-600 dark:text-gray-400 mt-1">
+                      #{selectedChannel.name}
+                    </p>
+                  )}
+                  {selectedChannel?.description && (
+                    <p className="text-xs text-gray-600 dark:text-gray-400">
+                      {selectedChannel.description}
+                    </p>
+                  )}
+                </div>
+                <button
+                  onClick={() => setShowArchiveModal(true)}
+                  className="px-3 py-1.5 text-sm bg-gray-100 dark:bg-gray-700 text-gray-700 dark:text-gray-300 rounded hover:bg-gray-200 dark:hover:bg-gray-600 transition-colors"
+                  title="Archiv anzeigen"
+                >
+                  Archiv
+                </button>
               </div>
             </div>
 
-            <div className="flex gap-4 overflow-x-auto pb-4">
-              {board.columns.map((column) => (
-                <KanbanColumnComponent
-                  key={column.id}
-                  column={column}
-                  onUpdateColumn={handleUpdateColumn}
-                  onDeleteColumn={handleDeleteColumn}
-                  onCreateCard={handleCreateCard}
-                  onDeleteCard={handleDeleteCard}
-                  onMoveCard={handleMoveCard}
-                  onCardClick={handleCardClick}
+            {/* Board Content */}
+            <div className="flex-1 p-4 overflow-y-auto">
+              <div className="flex gap-4">
+                {board.columns.map((column) => (
+                  <KanbanColumnComponent
+                    key={column.id}
+                    column={column}
+                    onUpdateColumn={handleUpdateColumn}
+                    onDeleteColumn={handleDeleteColumn}
+                    onCreateCard={handleCreateCard}
+                    onDeleteCard={handleDeleteCard}
+                    onMoveCard={handleMoveCard}
+                    onCardClick={handleCardClick}
+                  />
+                ))}
+              </div>
+
+              {showCardModal && selectedCard && (
+                <KanbanCardModal
+                  card={selectedCard}
+                  onClose={() => {
+                    setShowCardModal(false);
+                    setSelectedCard(null);
+                  }}
+                  onUpdate={handleUpdateCard}
                 />
-              ))}
+              )}
             </div>
 
-            {showCardModal && selectedCard && (
-              <KanbanCardModal
-                card={selectedCard}
-                onClose={() => {
-                  setShowCardModal(false);
-                  setSelectedCard(null);
-                }}
-                onUpdate={handleUpdateCard}
+            {/* Archive Modal */}
+            {board && (
+              <KanbanArchiveModal
+                isOpen={showArchiveModal}
+                onClose={() => setShowArchiveModal(false)}
+                archivedCards={getArchivedCards()}
               />
             )}
           </div>
diff --git a/frontend/src/components/Kanban/KanbanCard.tsx b/frontend/src/components/Kanban/KanbanCard.tsx
index e19a155..d4aeef3 100644
--- a/frontend/src/components/Kanban/KanbanCard.tsx
+++ b/frontend/src/components/Kanban/KanbanCard.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { getApiUrl } from '../../services/api';
 import type { KanbanCard } from '../../types';
 
 interface KanbanCardProps {
@@ -91,7 +92,7 @@ const KanbanCard: React.FC<KanbanCardProps> = ({
           <div className="flex items-center">
             {card.assignee.profile_picture ? (
               <img
-                src={`http://localhost:8000/${card.assignee.profile_picture}`}
+                src={getApiUrl(card.assignee.profile_picture)}
                 alt={card.assignee.username}
                 className="w-5 h-5 rounded-full object-cover"
                 title={card.assignee.username}
diff --git a/frontend/src/components/Kanban/KanbanColumn.tsx b/frontend/src/components/Kanban/KanbanColumn.tsx
index 803c77c..6709baa 100644
--- a/frontend/src/components/Kanban/KanbanColumn.tsx
+++ b/frontend/src/components/Kanban/KanbanColumn.tsx
@@ -87,7 +87,7 @@ const KanbanColumn: React.FC<KanbanColumnProps> = ({
 
   return (
     <div
-      className={`flex-shrink-0 w-72 bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-md p-3 ${
+      className={`flex-1 min-w-72 bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-md p-3 ${
         draggedOver ? 'ring-1 ring-blue-500 bg-blue-50 dark:bg-blue-900/10' : ''
       }`}
       onDragOver={handleDragOver}
@@ -133,20 +133,31 @@ const KanbanColumn: React.FC<KanbanColumnProps> = ({
             {column.cards.length}
           </span>
         </div>
-        {(() => {
-          const defaultColumns = ['ToDo', 'In Progress', 'Waiting', 'Done'];
-          return !defaultColumns.includes(column.name) && (
-            <button
-              onClick={() => onDeleteColumn(column.id)}
-              className="text-gray-400 hover:text-red-500 p-1"
-              title="Spalte löschen"
-            >
-              <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" />
-              </svg>
-            </button>
-          );
-        })()}
+        <div className="flex items-center gap-1">
+          <button
+            onClick={() => onCreateCard(column.id)}
+            className="text-gray-400 hover:text-green-500 p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-700"
+            title="Neue Karte hinzufügen"
+          >
+            <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M12 4v16m8-8H4" />
+            </svg>
+          </button>
+          {(() => {
+            const defaultColumns = ['ToDo', 'In Progress', 'Waiting', 'Done'];
+            return !defaultColumns.includes(column.name) && (
+              <button
+                onClick={() => onDeleteColumn(column.id)}
+                className="text-gray-400 hover:text-red-500 p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-700"
+                title="Spalte löschen"
+              >
+                <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                  <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" />
+                </svg>
+              </button>
+            );
+          })()}
+        </div>
       </div>
 
       {/* Cards */}
diff --git a/frontend/src/components/Kanban/KanbanSidebar.tsx b/frontend/src/components/Kanban/KanbanSidebar.tsx
index 3f5cce3..8d1a85f 100644
--- a/frontend/src/components/Kanban/KanbanSidebar.tsx
+++ b/frontend/src/components/Kanban/KanbanSidebar.tsx
@@ -6,6 +6,7 @@ interface KanbanSidebarProps {
   departments: Department[];
   selectedChannel: Channel | null;
   onSelectChannel: (channel: Channel) => void;
+  onDeleteChannel?: (channel: Channel) => void;
 }
 
 const KanbanSidebar: React.FC<KanbanSidebarProps> = ({
@@ -13,7 +14,9 @@ const KanbanSidebar: React.FC<KanbanSidebarProps> = ({
   departments,
   selectedChannel,
   onSelectChannel,
+  onDeleteChannel,
 }) => {
+
   // Group channels by department
   const channelsByDept = channels.reduce((acc, channel) => {
     if (!acc[channel.department_id]) {
@@ -23,8 +26,17 @@ const KanbanSidebar: React.FC<KanbanSidebarProps> = ({
     return acc;
   }, {} as Record<number, Channel[]>);
 
+  const handleDeleteClick = (channel: Channel, e: React.MouseEvent) => {
+    e.stopPropagation();
+    if (onDeleteChannel) {
+      if (window.confirm(`Channel "${channel.name}" und alle seine Inhalte (Nachrichten, Kanban-Board) wirklich löschen? Diese Aktion kann nicht rückgängig gemacht werden.`)) {
+        onDeleteChannel(channel);
+      }
+    }
+  };
+
   return (
-    <div className="w-52 bg-white dark:bg-gray-800 border-r border-gray-200 dark:border-gray-700 flex flex-col">
+    <div className="w-64 bg-white dark:bg-gray-800 border-r border-gray-200 dark:border-gray-700 flex flex-col">
       <div className="px-3 py-2 border-b border-gray-200 dark:border-gray-700">
         <h3 className="font-semibold text-base text-gray-900 dark:text-white">Kanban Boards</h3>
       </div>
@@ -37,25 +49,38 @@ const KanbanSidebar: React.FC<KanbanSidebarProps> = ({
             </div>
 
             {channelsByDept[dept.id]?.map((channel) => (
-              <button
-                key={channel.id}
-                onClick={() => onSelectChannel(channel)}
-                className={`w-full text-left px-3 py-1.5 text-sm hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors ${
-                  selectedChannel?.id === channel.id
-                    ? 'bg-blue-100 dark:bg-blue-900 text-blue-900 dark:text-blue-100 border-r-2 border-blue-500'
-                    : 'text-gray-700 dark:text-gray-300'
-                }`}
-              >
-                <div className="flex items-center">
-                  <span className="text-gray-500 dark:text-gray-400 mr-2">#</span>
-                  <span className="truncate">{channel.name}</span>
-                </div>
-                {channel.description && (
-                  <div className="text-xs text-gray-500 dark:text-gray-400 mt-0.5 truncate">
-                    {channel.description}
+              <div key={channel.id} className="relative group">
+                <button
+                  onClick={() => onSelectChannel(channel)}
+                  className={`w-full text-left px-3 py-1.5 text-sm hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors ${
+                    selectedChannel?.id === channel.id
+                      ? 'bg-blue-100 dark:bg-blue-900 text-blue-900 dark:text-blue-100 border-r-2 border-blue-500'
+                      : 'text-gray-700 dark:text-gray-300'
+                  }`}
+                >
+                  <div className="flex items-center">
+                    <span className="text-gray-500 dark:text-gray-400 mr-2">#</span>
+                    <span className="truncate">{channel.name}</span>
                   </div>
+                  {channel.description && (
+                    <div className="text-xs text-gray-500 dark:text-gray-400 mt-0.5 truncate">
+                      {channel.description}
+                    </div>
+                  )}
+                </button>
+                
+                {onDeleteChannel && (
+                  <button
+                    onClick={(e) => handleDeleteClick(channel, e)}
+                    className="absolute right-1 top-1 opacity-0 group-hover:opacity-100 p-1 text-red-500 hover:text-red-700 hover:bg-red-50 dark:hover:bg-red-900/20 rounded transition-opacity"
+                    title="Channel löschen"
+                  >
+                    <svg className="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                      <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" />
+                    </svg>
+                  </button>
                 )}
-              </button>
+              </div>
             ))}
           </div>
         ))}
diff --git a/frontend/src/components/Layout/Layout.tsx b/frontend/src/components/Layout/Layout.tsx
index e7847ea..c46ec4e 100644
--- a/frontend/src/components/Layout/Layout.tsx
+++ b/frontend/src/components/Layout/Layout.tsx
@@ -1,9 +1,10 @@
 import React, { useEffect, useState } from 'react';
 import { Outlet, Link, useLocation } from 'react-router-dom';
-import { useAuth } from '../../contexts/AuthContext';
 import { useTheme } from '../../contexts/ThemeContext';
-import { departmentsAPI } from '../../services/api';
+import { useAuth } from '../../contexts/AuthContext';
+import { departmentsAPI, getApiUrl } from '../../services/api';
 import type { Department } from '../../types';
+import { isAdmin } from '../../types';
 import ToastContainer from '../ToastContainer';
 
 const Layout: React.FC = () => {
@@ -49,7 +50,7 @@ const Layout: React.FC = () => {
         return;
       }
 
-      if (user.is_admin) {
+      if (isAdmin(user)) {
         if (isMounted) {
           setHasSnippetAccess(true);
         }
@@ -76,17 +77,22 @@ const Layout: React.FC = () => {
     return () => {
       isMounted = false;
     };
-  }, [user?.id, user?.is_admin]);
+  }, [user?.id, isAdmin(user)]);
 
   return (
     <div className="h-screen flex flex-col bg-gray-50 dark:bg-gray-900">
       {/* Header */}
-      <header className="bg-white dark:bg-gray-800 border-b border-gray-200 dark:border-gray-700 px-3 py-2">
-        <div className="flex items-center justify-between">
-          <div className="flex items-center space-x-3">
-            <h1 className="text-base font-bold text-gray-900 dark:text-white">
-              Collabrix
-            </h1>
+      <header className="bg-white dark:bg-gray-800 border-b border-gray-200 dark:border-gray-700 px-3 py-3 relative">
+        <div className="flex items-center">
+          <div className="flex items-center space-x-16">
+            <div className="flex items-center space-x-2">
+              <h1 className="text-base font-bold text-gray-900 dark:text-white">
+                Collabrix
+              </h1>
+              <span className="text-xs text-gray-500 dark:text-gray-400 mt-1 font-inter">
+                – Struktur für Teams
+              </span>
+            </div>
             <nav className="flex space-x-1.5">
               <Link
                 to="/"
@@ -98,7 +104,7 @@ const Layout: React.FC = () => {
               >
                 Chat
               </Link>
-              {(user?.is_admin || hasSnippetAccess) && (
+              {(isAdmin(user) || hasSnippetAccess) && (
                 <Link
                   to="/snippets"
                   className={`px-3 py-1.5 text-sm rounded ${
@@ -120,22 +126,10 @@ const Layout: React.FC = () => {
               >
                 Kanban
               </Link>
-              {user?.is_admin && (
-                <Link
-                  to="/admin"
-                  className={`px-3 py-1.5 text-sm rounded ${
-                    location.pathname === '/admin'
-                      ? 'bg-blue-500 text-white'
-                      : 'text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700'
-                  }`}
-                >
-                  Admin
-                </Link>
-              )}
             </nav>
           </div>
           
-          <div className="flex items-center space-x-3">
+          <div className="absolute right-3 top-2 flex items-center space-x-3">
             <ToastContainer />
             <div className="flex items-center space-x-2.5 relative user-menu-container">
             <button
@@ -144,7 +138,7 @@ const Layout: React.FC = () => {
             >
               {user?.profile_picture ? (
                 <img
-                  src={`http://localhost:8000/${user.profile_picture}`}
+                src={getApiUrl(user.profile_picture)}
                   alt={user.username}
                   className="w-8 h-8 rounded-full object-cover"
                 />
@@ -154,7 +148,7 @@ const Layout: React.FC = () => {
                 </div>
               )}
               <span className="text-sm font-medium text-gray-900 dark:text-white">
-                {user?.username}
+                {user?.full_name || user?.username}
               </span>
               <svg className="w-4 h-4 text-gray-500" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                 <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 9l-7 7-7-7" />
@@ -170,6 +164,15 @@ const Layout: React.FC = () => {
                 >
                   Profil
                 </Link>
+                {isAdmin(user) && (
+                  <Link
+                    to="/admin"
+                    onClick={() => setUserMenuOpen(false)}
+                    className="block px-4 py-2 text-sm text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700"
+                  >
+                    Administration
+                  </Link>
+                )}
                 <button
                   onClick={() => {
                     toggleTheme();
diff --git a/frontend/src/components/Profile/ProfilePage.tsx b/frontend/src/components/Profile/ProfilePage.tsx
index 205a46a..92e5a70 100644
--- a/frontend/src/components/Profile/ProfilePage.tsx
+++ b/frontend/src/components/Profile/ProfilePage.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { useAuth } from '../../contexts/AuthContext';
-import { authAPI, departmentsAPI } from '../../services/api';
+import { authAPI, departmentsAPI, getApiUrl } from '../../services/api';
 import type { Department } from '../../types';
 
 const ProfilePage: React.FC = () => {
@@ -147,14 +147,14 @@ const ProfilePage: React.FC = () => {
             <div className="flex flex-col items-center">
               {profilePicture ? (
                 <img
-                  src={`http://localhost:8000/${profilePicture}`}
+                  src={getApiUrl(profilePicture)}
                   alt="Profile"
                   className="w-32 h-32 rounded-full object-cover mb-4"
                   onError={(e) => {
-                    console.error('Failed to load image:', `http://localhost:8000/${profilePicture}`);
+                    console.error('Failed to load image:', getApiUrl(profilePicture));
                     e.currentTarget.style.display = 'none';
                   }}
-                  onLoad={() => console.log('Image loaded successfully:', `http://localhost:8000/${profilePicture}`)}
+                  onLoad={() => console.log('Image loaded successfully:', getApiUrl(profilePicture))}
                 />
               ) : (
                 <div className="w-32 h-32 bg-blue-500 rounded-full flex items-center justify-center text-white text-4xl font-bold mb-4">
@@ -177,7 +177,7 @@ const ProfilePage: React.FC = () => {
                 {user.username}
               </h2>
               <p className="text-sm text-gray-500 dark:text-gray-400">
-                {user.is_admin ? 'Administrator' : 'Benutzer'}
+                {user.role === 'superadmin' ? 'SuperAdministrator' : user.role === 'admin' ? 'Administrator' : 'Benutzer'}
               </p>
             </div>
 
diff --git a/frontend/src/components/Snippets/SnippetEditor.tsx b/frontend/src/components/Snippets/SnippetEditor.tsx
index ef408b5..758d63e 100644
--- a/frontend/src/components/Snippets/SnippetEditor.tsx
+++ b/frontend/src/components/Snippets/SnippetEditor.tsx
@@ -38,7 +38,7 @@ const LANGUAGES = [
 
 interface SnippetEditorProps {
   snippet: Snippet | null;
-  onSave: () => void;
+  onSave: (createdSnippet?: Snippet) => void;
   onCancel: () => void;
 }
 
@@ -98,13 +98,14 @@ const SnippetEditor: React.FC<SnippetEditorProps> = ({ snippet, onSave, onCancel
         department_id: visibility === 'department' ? departmentId : undefined,
       };
 
+      let result;
       if (snippet) {
-        await snippetsAPI.update(snippet.id, data);
+        result = await snippetsAPI.update(snippet.id, data);
       } else {
-        await snippetsAPI.create(data);
+        result = await snippetsAPI.create(data);
       }
 
-      onSave();
+      onSave(result);
     } catch (error: any) {
       console.error('Failed to save snippet:', error);
       addToast(error.response?.data?.detail || 'Failed to save snippet', 'error');
diff --git a/frontend/src/components/Snippets/SnippetLibrary.tsx b/frontend/src/components/Snippets/SnippetLibrary.tsx
index 350124f..8911959 100644
--- a/frontend/src/components/Snippets/SnippetLibrary.tsx
+++ b/frontend/src/components/Snippets/SnippetLibrary.tsx
@@ -69,10 +69,17 @@ const SnippetLibrary: React.FC = () => {
     setShowEditor(true);
   };
 
-  const handleSave = async () => {
+  const handleSave = async (createdSnippet?: Snippet) => {
     setShowEditor(false);
     setEditingSnippet(null);
-    await loadSnippets();
+    
+    if (createdSnippet) {
+      // Add the new snippet to the existing list
+      setSnippets(prev => [createdSnippet, ...prev]);
+    } else {
+      // For updates, reload all snippets
+      await loadSnippets();
+    }
   };
 
   const handleDelete = async (id: number) => {
diff --git a/frontend/src/components/common/BlinkingEnvelope.tsx b/frontend/src/components/common/BlinkingEnvelope.tsx
new file mode 100644
index 0000000..75f7256
--- /dev/null
+++ b/frontend/src/components/common/BlinkingEnvelope.tsx
@@ -0,0 +1,20 @@
+import React from 'react';
+import { MarkChatUnread } from '@mui/icons-material';
+
+interface BlinkingEnvelopeProps {
+  hasNewMessages: boolean;
+  className?: string;
+}
+
+const BlinkingEnvelope: React.FC<BlinkingEnvelopeProps> = ({ hasNewMessages, className = '' }) => {
+  if (!hasNewMessages) return null;
+
+  return (
+    <MarkChatUnread
+      className={`text-gray-900 dark:text-white animate-pulse ${className}`}
+      style={{ fontSize: '18px' }}
+    />
+  );
+};
+
+export default BlinkingEnvelope;
\ No newline at end of file
diff --git a/frontend/src/components/common/HeaderStatusIndicator.tsx b/frontend/src/components/common/HeaderStatusIndicator.tsx
new file mode 100644
index 0000000..229c014
--- /dev/null
+++ b/frontend/src/components/common/HeaderStatusIndicator.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import { useUserStatus } from '../../contexts/UserStatusContext';
+import UserStatusIndicator from './UserStatusIndicator';
+
+const HeaderStatusIndicator: React.FC = () => {
+  const { userStatuses } = useUserStatus();
+
+  const onlineCount = userStatuses.filter(user => user.status === 'online').length;
+  const totalCount = userStatuses.length;
+
+  return (
+    <div className="flex items-center space-x-2 px-3 py-1 bg-gray-50 dark:bg-gray-700 rounded-lg border border-gray-200 dark:border-gray-600">
+      <UserStatusIndicator status="online" size="sm" />
+      <span className="text-sm text-gray-700 dark:text-gray-300">
+        {onlineCount}/{totalCount} online
+      </span>
+    </div>
+  );
+};
+
+export default HeaderStatusIndicator;
\ No newline at end of file
diff --git a/frontend/src/components/common/UserStatusIndicator.tsx b/frontend/src/components/common/UserStatusIndicator.tsx
new file mode 100644
index 0000000..75430a4
--- /dev/null
+++ b/frontend/src/components/common/UserStatusIndicator.tsx
@@ -0,0 +1,35 @@
+import React from 'react';
+import { UserStatus } from '../../contexts/UserStatusContext';
+
+interface UserStatusIndicatorProps {
+  status: UserStatus;
+  size?: 'sm' | 'md' | 'lg';
+  className?: string;
+}
+
+const UserStatusIndicator: React.FC<UserStatusIndicatorProps> = ({
+  status,
+  size = 'sm',
+  className = ''
+}) => {
+  const sizeClasses = {
+    sm: 'w-2 h-2',
+    md: 'w-3 h-3',
+    lg: 'w-4 h-4'
+  };
+
+  const statusClasses: Record<UserStatus, string> = {
+    online: 'bg-green-500',
+    away: 'bg-yellow-500',
+    offline: 'bg-red-500'
+  };
+
+  return (
+    <div
+      className={`${sizeClasses[size]} ${statusClasses[status]} rounded-full border border-white dark:border-gray-800 ${className}`}
+      title={`Status: ${status}`}
+    />
+  );
+};
+
+export default UserStatusIndicator;
\ No newline at end of file
diff --git a/frontend/src/contexts/AuthContext.tsx b/frontend/src/contexts/AuthContext.tsx
index ef35a1f..2907283 100644
--- a/frontend/src/contexts/AuthContext.tsx
+++ b/frontend/src/contexts/AuthContext.tsx
@@ -10,6 +10,7 @@ interface AuthContextType {
   logout: () => void;
   refreshUser: () => Promise<void>;
   isAuthenticated: boolean;
+  presenceWs: WebSocket | null;
 }
 
 const AuthContext = createContext<AuthContextType | undefined>(undefined);
@@ -17,10 +18,14 @@ const AuthContext = createContext<AuthContextType | undefined>(undefined);
 export const AuthProvider: React.FC<{ children: ReactNode }> = ({ children }) => {
   const [user, setUser] = useState<User | null>(null);
   const [token, setToken] = useState<string | null>(localStorage.getItem('token'));
+  const [presenceWs, setPresenceWs] = useState<WebSocket | null>(null);
 
   useEffect(() => {
-    if (token) {
+    if (token && window.location.pathname !== '/login' && window.location.pathname !== '/register') {
       loadUser();
+    } else if (!token && window.location.pathname !== '/login' && window.location.pathname !== '/register') {
+      // Redirect to login if no token and not on auth pages
+      window.location.href = '/login';
     }
   }, [token]);
 
@@ -35,9 +40,57 @@ export const AuthProvider: React.FC<{ children: ReactNode }> = ({ children }) =>
         root.classList.remove('light', 'dark');
         root.classList.add(userData.theme);
       }
+      // Open presence connection when user is loaded
+      openPresenceConnection();
     } catch (error) {
+      // If loading user fails, clear token and user
       console.error('Failed to load user:', error);
-      logout();
+      localStorage.removeItem('token');
+      setToken(null);
+      setUser(null);
+      // Close presence WebSocket if open
+      closePresenceConnection();
+    }
+  };
+
+  const openPresenceConnection = () => {
+    if (token && !presenceWs) {
+      // Use API URL to determine WebSocket host
+      const apiUrl = import.meta.env.VITE_API_URL || 'http://localhost:8000';
+      const url = new URL(apiUrl);
+      const wsProtocol = url.protocol === 'https:' ? 'wss:' : 'ws:';
+      const wsUrl = `${wsProtocol}//${url.host}/api/ws/0?token=${token}`;
+      const ws = new WebSocket(wsUrl);
+      
+      ws.onopen = () => {
+        console.log('Presence WebSocket connected');
+      };
+      
+      ws.onclose = () => {
+        console.log('Presence WebSocket disconnected');
+        setPresenceWs(null);
+      };
+      
+      ws.onmessage = (event) => {
+        try {
+          const data = JSON.parse(event.data);
+          if (data.type === 'message' || data.type === 'direct_message') {
+            // Dispatch custom event for unread messages
+            window.dispatchEvent(new CustomEvent('unreadMessage', { detail: data }));
+          }
+        } catch (error) {
+          console.error('Error parsing presence WebSocket message:', error);
+        }
+      };
+      
+      setPresenceWs(ws);
+    }
+  };
+
+  const closePresenceConnection = () => {
+    if (presenceWs) {
+      presenceWs.close();
+      setPresenceWs(null);
     }
   };
 
@@ -45,6 +98,8 @@ export const AuthProvider: React.FC<{ children: ReactNode }> = ({ children }) =>
     const response = await authAPI.login(data);
     localStorage.setItem('token', response.access_token);
     setToken(response.access_token);
+    // Load user immediately after login
+    await loadUser();
   };
 
   const register = async (data: RegisterRequest) => {
@@ -54,6 +109,8 @@ export const AuthProvider: React.FC<{ children: ReactNode }> = ({ children }) =>
   };
 
   const logout = () => {
+    // Close presence connection before logging out
+    closePresenceConnection();
     localStorage.removeItem('token');
     localStorage.removeItem('lastVisitedPath');
     sessionStorage.removeItem('routeRestored');
@@ -80,6 +137,7 @@ export const AuthProvider: React.FC<{ children: ReactNode }> = ({ children }) =>
         logout,
         refreshUser,
         isAuthenticated: !!token && !!user,
+        presenceWs,
       }}
     >
       {children}
diff --git a/frontend/src/contexts/UnreadMessagesContext.tsx b/frontend/src/contexts/UnreadMessagesContext.tsx
new file mode 100644
index 0000000..55bbf34
--- /dev/null
+++ b/frontend/src/contexts/UnreadMessagesContext.tsx
@@ -0,0 +1,124 @@
+import React, { createContext, useContext, useState, ReactNode, useEffect } from 'react';
+import { useAuth } from './AuthContext';
+
+interface UnreadMessagesContextType {
+  unreadChannels: Set<number>;
+  unreadDirectMessages: Set<number>;
+  activeChannelId: number | null;
+  activeDirectMessageUserId: number | null;
+  markChannelAsRead: (channelId: number) => void;
+  markChannelAsUnread: (channelId: number) => void;
+  markDirectMessageAsRead: (userId: number) => void;
+  markDirectMessageAsUnread: (userId: number) => void;
+  hasUnreadChannel: (channelId: number) => boolean;
+  hasUnreadDirectMessage: (userId: number) => boolean;
+  setActiveChannel: (channelId: number | null) => void;
+  setActiveDirectMessage: (userId: number | null) => void;
+}
+
+const UnreadMessagesContext = createContext<UnreadMessagesContextType | undefined>(undefined);
+
+export const useUnreadMessages = () => {
+  const context = useContext(UnreadMessagesContext);
+  if (context === undefined) {
+    throw new Error('useUnreadMessages must be used within a UnreadMessagesProvider');
+  }
+  return context;
+};
+
+interface UnreadMessagesProviderProps {
+  children: ReactNode;
+}
+
+export const UnreadMessagesProvider: React.FC<UnreadMessagesProviderProps> = ({ children }) => {
+  const [unreadChannels, setUnreadChannels] = useState<Set<number>>(new Set());
+  const [unreadDirectMessages, setUnreadDirectMessages] = useState<Set<number>>(new Set());
+  const [activeChannelId, setActiveChannelId] = useState<number | null>(null);
+  const [activeDirectMessageUserId, setActiveDirectMessageUserId] = useState<number | null>(null);
+  const { user } = useAuth();
+
+  // Listen for unread message events from the presence WebSocket
+  useEffect(() => {
+    const handleUnreadMessage = (event: CustomEvent) => {
+      const data = event.detail;
+      if (data.type === 'message' && data.message) {
+        // Mark channel as unread if message is from another user and channel is not active
+        if (user && data.message.sender_id !== user.id && activeChannelId !== data.message.channel_id) {
+          markChannelAsUnread(data.message.channel_id);
+        }
+      } else if (data.type === 'direct_message' && data.message) {
+        // Mark DM as unread if message is from another user and DM is not active
+        if (user && data.message.sender_id !== user.id && activeDirectMessageUserId !== data.message.sender_id) {
+          markDirectMessageAsUnread(data.message.sender_id);
+        }
+      }
+    };
+
+    window.addEventListener('unreadMessage', handleUnreadMessage as EventListener);
+    
+    return () => {
+      window.removeEventListener('unreadMessage', handleUnreadMessage as EventListener);
+    };
+  }, [user, activeChannelId, activeDirectMessageUserId]);
+
+  const markChannelAsRead = (channelId: number) => {
+    setUnreadChannels(prev => {
+      const newSet = new Set(prev);
+      newSet.delete(channelId);
+      return newSet;
+    });
+  };
+
+  const markChannelAsUnread = (channelId: number) => {
+    setUnreadChannels(prev => new Set(prev).add(channelId));
+  };
+
+  const markDirectMessageAsRead = (userId: number) => {
+    setUnreadDirectMessages(prev => {
+      const newSet = new Set(prev);
+      newSet.delete(userId);
+      return newSet;
+    });
+  };
+
+  const markDirectMessageAsUnread = (userId: number) => {
+    setUnreadDirectMessages(prev => new Set(prev).add(userId));
+  };
+
+  const setActiveChannel = (channelId: number | null) => {
+    setActiveChannelId(channelId);
+  };
+
+  const setActiveDirectMessage = (userId: number | null) => {
+    setActiveDirectMessageUserId(userId);
+  };
+
+  const hasUnreadChannel = (channelId: number) => {
+    return unreadChannels.has(channelId);
+  };
+
+  const hasUnreadDirectMessage = (userId: number) => {
+    return unreadDirectMessages.has(userId);
+  };
+
+  return (
+    <UnreadMessagesContext.Provider
+      value={{
+        unreadChannels,
+        unreadDirectMessages,
+        activeChannelId,
+        activeDirectMessageUserId,
+        markChannelAsRead,
+        markChannelAsUnread,
+        markDirectMessageAsRead,
+        markDirectMessageAsUnread,
+        hasUnreadChannel,
+        hasUnreadDirectMessage,
+        setActiveChannel,
+        setActiveDirectMessage,
+      }}
+    >
+      {children}
+    </UnreadMessagesContext.Provider>
+  );
+};
\ No newline at end of file
diff --git a/frontend/src/contexts/UserStatusContext.tsx b/frontend/src/contexts/UserStatusContext.tsx
new file mode 100644
index 0000000..8cd79dd
--- /dev/null
+++ b/frontend/src/contexts/UserStatusContext.tsx
@@ -0,0 +1,111 @@
+import React, { createContext, useContext, useState, useEffect, ReactNode } from 'react';
+import { userStatusAPI } from '../services/api';
+import { useAuth } from './AuthContext';
+
+export type UserStatus = 'online' | 'away' | 'offline';
+
+interface UserStatusInfo {
+  user_id: number;
+  username: string;
+  full_name: string;
+  status: UserStatus;
+}
+
+interface UserStatusContextType {
+  userStatuses: UserStatusInfo[];
+  getUserStatus: (userId: number) => UserStatus;
+  refreshStatuses: () => Promise<void>;
+}
+
+const UserStatusContext = createContext<UserStatusContextType | undefined>(undefined);
+
+export const useUserStatus = () => {
+  const context = useContext(UserStatusContext);
+  if (context === undefined) {
+    throw new Error('useUserStatus must be used within a UserStatusProvider');
+  }
+  return context;
+};
+
+interface UserStatusProviderProps {
+  children: ReactNode;
+}
+
+export const UserStatusProvider: React.FC<UserStatusProviderProps> = ({ children }) => {
+  const [userStatuses, setUserStatuses] = useState<UserStatusInfo[]>([]);
+  const { token, presenceWs } = useAuth();
+
+  const refreshStatuses = async () => {
+    try {
+      const statuses = await userStatusAPI.getUserStatuses();
+      setUserStatuses(statuses.map(s => ({ ...s, status: s.status as UserStatus })));
+    } catch (error) {
+      console.error('Failed to load user statuses:', error);
+    }
+  };
+
+  const getUserStatus = (userId: number): UserStatus => {
+    const userStatus = userStatuses.find(u => u.user_id === userId);
+    return userStatus?.status || 'offline';
+  };
+
+  // Handle real-time status updates via WebSocket
+  useEffect(() => {
+    if (!presenceWs) return;
+
+    const handleMessage = (event: MessageEvent) => {
+      try {
+        const data = JSON.parse(event.data);
+        if (data.type === 'user_status_update') {
+          setUserStatuses(prevStatuses => {
+            const updatedStatuses = prevStatuses.map(status =>
+              status.user_id === data.user_id
+                ? { ...status, status: data.status as UserStatus }
+                : status
+            );
+            
+            // If user not in list, add them (shouldn't happen but safety check)
+            const existingUser = updatedStatuses.find(s => s.user_id === data.user_id);
+            if (!existingUser) {
+              // We need to fetch user info for new users
+              refreshStatuses();
+              return prevStatuses;
+            }
+            
+            return updatedStatuses;
+          });
+        }
+      } catch (error) {
+        console.error('Error parsing WebSocket message:', error);
+      }
+    };
+
+    presenceWs.addEventListener('message', handleMessage);
+
+    return () => {
+      presenceWs.removeEventListener('message', handleMessage);
+    };
+  }, [presenceWs]);
+
+  useEffect(() => {
+    // Initial load
+    if (token) {
+      refreshStatuses();
+    }
+
+    // Refresh every 30 seconds as fallback
+    const interval = setInterval(() => {
+      if (token) {
+        refreshStatuses();
+      }
+    }, 30000);
+
+    return () => clearInterval(interval);
+  }, [token]);
+
+  return (
+    <UserStatusContext.Provider value={{ userStatuses, getUserStatus, refreshStatuses }}>
+      {children}
+    </UserStatusContext.Provider>
+  );
+};
\ No newline at end of file
diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index 19458b6..0c7925e 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -5,13 +5,19 @@ import './index.css';
 import { AuthProvider } from './contexts/AuthContext';
 import { ThemeProvider } from './contexts/ThemeContext';
 import { ToastProvider } from './contexts/ToastContext';
+import { UserStatusProvider } from './contexts/UserStatusContext';
+import { UnreadMessagesProvider } from './contexts/UnreadMessagesContext';
 
 createRoot(document.getElementById('root')!).render(
   <StrictMode>
     <ThemeProvider>
       <AuthProvider>
         <ToastProvider>
-          <App />
+          <UserStatusProvider>
+            <UnreadMessagesProvider>
+              <App />
+            </UnreadMessagesProvider>
+          </UserStatusProvider>
         </ToastProvider>
       </AuthProvider>
     </ThemeProvider>
diff --git a/frontend/src/services/api.ts b/frontend/src/services/api.ts
index 7e31238..3f7d951 100644
--- a/frontend/src/services/api.ts
+++ b/frontend/src/services/api.ts
@@ -24,6 +24,22 @@ api.interceptors.request.use((config) => {
   return config;
 });
 
+// Handle 401 responses (token expired/invalid)
+api.interceptors.response.use(
+  (response) => response,
+  (error) => {
+    if (error.response?.status === 401) {
+      // Token is invalid or expired, logout user
+      localStorage.removeItem('token');
+      localStorage.removeItem('lastVisitedPath');
+      sessionStorage.removeItem('routeRestored');
+      // Don't redirect, just clear auth state
+      // The app will handle the redirect appropriately
+    }
+    return Promise.reject(error);
+  }
+);
+
 export const authAPI = {
   login: async (data: LoginRequest): Promise<AuthResponse> => {
     const response = await api.post('/auth/login', data);
@@ -89,6 +105,11 @@ export const channelsAPI = {
     const response = await api.post('/channels/', data);
     return response.data;
   },
+
+  delete: async (channelId: number) => {
+    const response = await api.delete(`/channels/${channelId}`);
+    return response.data;
+  },
 };
 
 export const messagesAPI = {
@@ -359,4 +380,11 @@ export const kanbanAPI = {
   },
 };
 
+export const userStatusAPI = {
+  getUserStatuses: async (): Promise<Array<{user_id: number, username: string, full_name: string, status: string}>> => {
+    const response = await api.get('/user-status');
+    return response.data;
+  },
+};
+
 export default api;
diff --git a/frontend/src/types/index.ts b/frontend/src/types/index.ts
index 5550f72..9b4ef66 100644
--- a/frontend/src/types/index.ts
+++ b/frontend/src/types/index.ts
@@ -1,3 +1,17 @@
+export enum UserRole {
+  USER = 'user',
+  ADMIN = 'admin',
+  SUPERADMIN = 'superadmin'
+}
+
+export const isAdmin = (user: User | null | undefined): boolean => {
+  return user?.role === UserRole.ADMIN || user?.role === UserRole.SUPERADMIN;
+};
+
+export const isSuperAdmin = (user: User | null | undefined): boolean => {
+  return user?.role === UserRole.SUPERADMIN;
+};
+
 export interface User {
   id: number;
   username: string;
@@ -6,7 +20,7 @@ export interface User {
   profile_picture?: string;
   theme?: string;
   is_active: boolean;
-  is_admin: boolean;
+  role: UserRole;
   created_at: string;
 }
 
@@ -43,6 +57,7 @@ export interface Message {
     id: number;
     content: string;
     sender_username: string;
+    sender_full_name?: string;
   };
   is_deleted?: boolean;
   deleted?: boolean;
diff --git a/start-backend.sh b/start-backend.sh
index 59b95ab..72f009e 100755
--- a/start-backend.sh
+++ b/start-backend.sh
@@ -7,4 +7,4 @@ echo "📍 API: http://localhost:8000"
 echo "📚 Docs: http://localhost:8000/docs"
 echo ""
 
-/bin/python -m uvicorn app.main:app --host 0.0.0.0 --port 8000 --reload
+/bin/python -m uvicorn app.main:app --host 127.0.0.1 --port 8000 --reload