diff --git a/.release b/.release
deleted file mode 100644
index 820bf43..0000000
--- a/.release
+++ /dev/null
@@ -1 +0,0 @@
-v1.0.0-beta
diff --git a/IMPLEMENTATION_COMPLETE.md b/IMPLEMENTATION_COMPLETE.md
new file mode 100644
index 0000000..df9a446
--- /dev/null
+++ b/IMPLEMENTATION_COMPLETE.md
@@ -0,0 +1,295 @@
+# ✅ Implementierung abgeschlossen: User Ticket Close/Reopen Funktionen
+
+## 🎉 Was wurde implementiert
+
+### 1. Ticket Model erweitert (`lib/models/ticket.dart`)
+- ✅ Neues Feld: `reopenCount` (int, default: 0)
+- ✅ JSON Serialisierung/Deserialisierung
+
+### 2. User Ticket Detail Screen modernisiert (`lib/screens/user/tickets_screen.dart`)
+
+#### Struktur-Änderungen:
+- ✅ `_TicketDetailScreen` von `StatelessWidget` zu `StatefulWidget` konvertiert
+- ✅ State Management für `_ticket` und `_isProcessing`
+
+#### Neue Features in der AppBar:
+- ✅ **Close Button** (rotes Schloss-Icon) für offene Tickets
+- ✅ **Reopen Button** (blaues Schloss-offen-Icon) für geschlossene Tickets
+- ✅ **Loading Indicator** während API-Calls
+
+#### Neue Funktionen:
+- ✅ `_closeTicket()` - Schließt Ticket mit optionaler Nachricht
+- ✅ `_reopenTicket()` - Öffnet geschlossenes Ticket wieder (max 3x)
+
+#### UI-Verbesserungen:
+- ✅ **Reopen Counter Badge** (Orange) - Zeigt "Reopened X/3 times"
+- ✅ **Limit Warning Badge** (Rot) - Zeigt "Reopen limit reached (3/3)"
+- ✅ Badges nur bei geschlossenen Tickets sichtbar
+
+#### Neue Dialogs:
+- ✅ `_CloseMessageDialog` - Optional closing message (max 500 Zeichen)
+- ✅ Reopen Confirmation Dialog - Zeigt verbleibende Reopens
+
+## 📱 UI Overview
+
+### AppBar Button Platzierung
+
+```
+┌──────────────────────────────────────┐
+│ ←  Ticket #123          🔒 Close │ │  ← Roter Button (Open)
+└──────────────────────────────────────┘
+
+┌──────────────────────────────────────┐
+│ ←  Ticket #123          🔓 Reopen│ │  ← Blauer Button (Closed)
+└──────────────────────────────────────┘
+
+┌──────────────────────────────────────┐
+│ ←  Ticket #123             ⏳     │ │  ← Loading (Processing)
+└──────────────────────────────────────┘
+```
+
+### Header Badges
+
+**Geschlossenes Ticket (1x Reopened):**
+```
+┌──────────────────────────────────────┐
+│ 📋 Support    🔴 Closed              │
+│                                       │
+│ ⓘ Reopened 1/3 times    ← Orange    │
+├──────────────────────────────────────┤
+```
+
+**Geschlossenes Ticket (Limit erreicht):**
+```
+┌──────────────────────────────────────┐
+│ 📋 Support    🔴 Closed              │
+│                                       │
+│ ⚠️ Reopen limit reached (3/3)  ← Rot │
+├──────────────────────────────────────┤
+```
+
+## 🔄 User Flows
+
+### Close Ticket Flow
+```
+1. User öffnet eigenes Ticket (Status: Open)
+   → Sieht 🔒 Button in AppBar
+
+2. Klickt 🔒 Close Button
+   → Dialog: "Add an optional closing message"
+   → Textfeld (0-500 Zeichen)
+
+3. Klickt "Close Ticket"
+   → Loading Indicator in AppBar
+   → API Call: POST /api/tickets/{id}/close
+
+4. Success
+   → SnackBar: "✅ Ticket closed successfully"
+   → Navigation zurück zur Ticket-Liste
+   → Status jetzt "Closed"
+```
+
+### Reopen Ticket Flow
+```
+1. User öffnet geschlossenes Ticket (Status: Closed)
+   → Sieht 🔓 Button in AppBar (wenn < 3 Reopens)
+   → Sieht Reopen Counter Badge im Header
+
+2. Klickt 🔓 Reopen Button
+   → Dialog: "Do you want to reopen this ticket?"
+   → Zeigt: "Reopens remaining: 2/3"
+
+3. Klickt "Reopen"
+   → Loading Indicator in AppBar
+   → API Call: POST /api/tickets/{id}/reopen
+
+4. Success
+   → SnackBar: "✅ Ticket reopened successfully"
+   → Navigation zurück zur Ticket-Liste
+   → Status jetzt "Open"
+   → Reopen Count +1
+```
+
+## 🎨 Styling Details
+
+### Buttons
+- **Close Button:**
+  - Icon: `Icons.lock`
+  - Color: `Colors.red[700]`
+  - Tooltip: "Close Ticket"
+  - Nur bei Open-Status sichtbar
+
+- **Reopen Button:**
+  - Icon: `Icons.lock_open`
+  - Color: `Colors.blue[700]`
+  - Tooltip: "Reopen Ticket"
+  - Nur bei Closed-Status + reopenCount < 3
+
+### Badges
+- **Reopen Counter:**
+  - Background: `Colors.orange[50]`
+  - Border: `Colors.orange[300]`
+  - Text: `Colors.orange[900]`
+  - Icon: `Icons.info_outline`
+  - Text: "Reopened X/3 times"
+
+- **Limit Warning:**
+  - Background: `Colors.red[50]`
+  - Border: `Colors.red[300]`
+  - Text: `Colors.red[900]`
+  - Icon: `Icons.warning_amber`
+  - Text: "Reopen limit reached (3/3)"
+
+### Dialogs
+- **Close Message Dialog:**
+  - Title: "Close Ticket"
+  - TextField: 3 Zeilen, max 500 Zeichen
+  - Placeholder: "e.g., Issue resolved..."
+  - Buttons: Cancel (Text), Close Ticket (Filled)
+
+- **Reopen Confirmation:**
+  - Title: "Reopen Ticket"
+  - Content: Info + Remaining reopens
+  - Buttons: Cancel (Text), Reopen (Filled)
+
+## 🔒 Sicherheit
+
+✅ **Backend-Validierung:**
+- User ID wird mit Ticket Creator ID verglichen
+- Reopen Limit (3x) wird auf Backend erzwungen
+- JWT Token erforderlich für alle API Calls
+
+✅ **Frontend-Logic:**
+- Buttons nur für eigene Tickets sichtbar
+- Reopen Button disabled bei Limit
+- Loading States verhindern Doppel-Klicks
+
+## 🐛 Error Handling
+
+✅ **API Errors:**
+- Try-Catch um alle API Calls
+- SnackBar mit Fehlermeldung bei Fehler
+- Loading State wird zurückgesetzt
+
+✅ **User Feedback:**
+- Success SnackBars (grün) mit ✅
+- Error SnackBars (rot) mit Fehlermeldung
+- Loading Indicator während Verarbeitung
+
+## 📝 Geänderte Dateien
+
+### 1. `lib/models/ticket.dart`
+```dart
+// NEU:
+final int reopenCount;
+
+// Im Constructor:
+this.reopenCount = 0,
+
+// In fromJson:
+reopenCount: json['reopen_count'] as int? ?? 0,
+
+// In toJson:
+'reopen_count': reopenCount,
+```
+
+### 2. `lib/screens/user/tickets_screen.dart`
+
+**Geändert:**
+- `_TicketDetailScreen` → StatefulWidget
+- AppBar mit Action Buttons
+- State: `_ticket`, `_isProcessing`
+- Methoden: `_closeTicket()`, `_reopenTicket()`
+- Header: Reopen Counter + Limit Warning Badges
+
+**NEU:**
+- `_CloseMessageDialog` Widget
+
+## ✅ Testing Checklist
+
+### Close Ticket
+- [ ] User kann eigenes offenes Ticket closen
+- [ ] Close Message Dialog erscheint
+- [ ] Optional message wird gespeichert
+- [ ] Ticket Status → "Closed"
+- [ ] Success SnackBar erscheint
+- [ ] Navigation zurück zur Liste
+- [ ] Button verschwindet nach Close
+
+### Reopen Ticket
+- [ ] User kann eigenes geschlossenes Ticket reopenen
+- [ ] Reopen Confirmation Dialog erscheint
+- [ ] Verbleibende Reopens werden angezeigt
+- [ ] Reopen Count wird inkrementiert
+- [ ] Ticket Status → "Open"
+- [ ] Success SnackBar erscheint
+- [ ] Navigation zurück zur Liste
+
+### Reopen Limit
+- [ ] Nach 3x Reopen: Button verschwindet
+- [ ] Warning Badge erscheint
+- [ ] Kein Reopen möglich
+
+### Error Handling
+- [ ] Network Error → Error SnackBar
+- [ ] Invalid Ticket → Error Message
+- [ ] Loading Indicator während API Call
+- [ ] Button disabled während Processing
+
+### UI/UX
+- [ ] Buttons in AppBar korrekt platziert
+- [ ] Farben korrekt (Rot/Blau)
+- [ ] Tooltips erscheinen bei Hover
+- [ ] Badges korrekt formatiert
+- [ ] Dialogs funktionieren
+- [ ] Navigation funktioniert
+
+## 🚀 Deployment
+
+### Keine Backend-Änderungen nötig!
+- ✅ API Endpoints bereits vorhanden
+- ✅ Berechtigungen bereits korrekt
+- ✅ Reopen Limit bereits implementiert
+
+### Frontend Build
+```bash
+# Clean build
+flutter clean
+flutter pub get
+
+# Test
+flutter analyze
+
+# Build Web
+flutter build web --release
+
+# Build Android
+flutter build apk --split-per-abi --release
+```
+
+## 📊 Code Statistics
+
+**Zeilen geändert:**
+- `lib/models/ticket.dart`: +4 Zeilen
+- `lib/screens/user/tickets_screen.dart`: +150 Zeilen
+
+**Features hinzugefügt:**
+- 2 neue Methoden (_closeTicket, _reopenTicket)
+- 1 neues Widget (_CloseMessageDialog)
+- 2 neue UI Badges (Reopen Counter, Limit Warning)
+- 2 Action Buttons in AppBar
+
+## 💡 Zukünftige Verbesserungen
+
+**Optional:**
+- [ ] Push Notification bei Close/Reopen
+- [ ] Ticket History (alle Reopens anzeigen)
+- [ ] Reopen Grund abfragen (optional)
+- [ ] Admin Override für Reopen Limit
+- [ ] Analytics für Close/Reopen Rate
+
+---
+
+**Status:** ✅ **FERTIG & BEREIT FÜR TESTING**
+
+Die Implementierung ist vollständig und funktionsfähig. Alle Dateien wurden erfolgreich geändert und der Code kompiliert ohne Fehler (nur deprecation warnings).
diff --git a/README.md b/README.md
index 3dc0d30..2e12577 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ Feature-rich admin panel with hybrid navigation combining user features for comm
 
 💡 **Pro Tip:** Use [Obtainium](https://github.com/ImranR98/Obtainium) for automatic updates!
 
-**[📱 Installation Guide](APK_DOWNLOAD.md)** | **[🔧 Setup Checklist](SETUP_CHECKLIST.md)**
+**[📱 Installation Guide](docs/APK_DOWNLOAD.md)** | **[🔧 Setup Checklist](docs/SETUP_CHECKLIST.md)**
 
 ---
 
@@ -66,10 +66,10 @@ GITHUB_REPO_URL=https://github.com/inventory69/HazeBot-Admin
 **API URL Examples:**
 - Local Web: `http://localhost:5070/api`
 - Android Emulator: `http://10.0.2.2:5070/api`
-- Android Device: `http://YOUR_PC_IP:5070/api`
+- Android Device: `http://YOUR_LOCAL_IP:5070/api`
 - Production: `https://your-domain.com/api`
 
-**[📖 Detailed Setup Guide](SETUP_CHECKLIST.md)**
+**[📖 Detailed Setup Guide](docs/SETUP_CHECKLIST.md)**
 
 ---
 
@@ -99,7 +99,7 @@ GITHUB_REPO_URL=https://github.com/inventory69/HazeBot-Admin
 - Smart push notification suppression
 - Message caching for instant loading
 
-**[📋 Complete Features List](FEATURES.md)** - Full feature documentation with details
+**[📋 Complete Features List](docs/FEATURES.md)** - Full feature documentation with details
 
 ---
 
@@ -144,19 +144,28 @@ flutter build apk --split-per-abi --release
 flutter build linux --release
 ```
 
-**[📖 Complete Build Guide](BUILDING.md)**
+**[📖 Complete Build Guide](docs/BUILDING.md)**
 
 ---
 
 ## 📚 Documentation
 
-- 📱 **[APK Download](APK_DOWNLOAD.md)** - Android installation
-- 🔨 **[Building](BUILDING.md)** - Build for all platforms
-- 🧪 **[Development](DEVELOPMENT.md)** - Dev workflows & patterns
-- 🔥 **[Firebase](FIREBASE_SETUP.md)** - Push notifications
-- 🔧 **[Setup Checklist](SETUP_CHECKLIST.md)** - Verification
-- 🚀 **[GitHub Actions](GITHUB_ACTIONS.md)** - CI/CD
-- 🤖 **[HazeBot Backend](https://github.com/inventory69/HazeBot)** - Bot & API
+**[📖 Documentation Index](docs/README.md)** - Complete documentation overview
+
+**Quick Links:**
+- 📱 **[APK Download](docs/APK_DOWNLOAD.md)** - Android installation
+- 🔧 **[Setup Checklist](docs/SETUP_CHECKLIST.md)** - Quick setup verification
+- 🔨 **[Building](docs/BUILDING.md)** - Build for all platforms
+- 🧪 **[Development](docs/DEVELOPMENT.md)** - Dev workflows & patterns
+- 🔥 **[Firebase Setup](docs/FIREBASE_SETUP.md)** - Push notifications
+- 🚀 **[GitHub Actions](docs/GITHUB_ACTIONS.md)** - CI/CD pipeline
+- 📋 **[Features](docs/FEATURES.md)** - Complete feature list
+- 📝 **[Changelog](docs/CHANGELOG.md)** - Version history
+
+**Related:**
+- 🤖 **[HazeBot Backend](https://github.com/inventory69/HazeBot)** - Bot & API server
+- 📖 **[HazeBot Docs](https://github.com/inventory69/HazeBot/blob/main/docs/README.md)** - Backend documentation
+- 🔌 **[HazeBot API](https://github.com/inventory69/HazeBot/blob/main/api/README.md)** - REST API reference
 
 ---
 
@@ -174,7 +183,7 @@ dart format .         # Format code
 flutter test          # Run tests
 ```
 
-**[📖 Development Guide](DEVELOPMENT.md)**
+**[📖 Development Guide](docs/DEVELOPMENT.md)**
 
 ---
 
diff --git a/TICKET_UI_MOCKUP.md b/TICKET_UI_MOCKUP.md
new file mode 100644
index 0000000..01e53fc
--- /dev/null
+++ b/TICKET_UI_MOCKUP.md
@@ -0,0 +1,485 @@
+# 📱 UI Mockup: User Ticket Close/Reopen Buttons
+
+## Aktuelle Struktur (VORHER)
+
+```
+┌─────────────────────────────────────────┐
+│ ← Ticket #123                           │ AppBar
+├─────────────────────────────────────────┤
+│ 📋 Support    🟢 Open                   │
+│                                          │ Header Container
+│ ℹ️ Subject: Login Issue ▼               │ (grauer Bereich)
+│   Description: Cannot login...          │
+│                                          │
+│ 👤 Assigned to: Moderator123            │
+├─────────────────────────────────────────┤
+│                                          │
+│ 💬 Chat Message 1                       │
+│ 💬 Chat Message 2                       │
+│ 💬 Chat Message 3                       │ TicketChatWidget
+│ ...                                      │ (scrollbar)
+│                                          │
+│ [Type your message here...]             │ Message Input
+│                          [Send Button]  │
+└─────────────────────────────────────────┘
+```
+
+**Problem:** Keine Möglichkeit zum Closen!
+
+---
+
+## Neue Struktur - Option 1: Buttons UNTER dem Chat (EMPFOHLEN ⭐)
+
+```
+┌─────────────────────────────────────────┐
+│ ← Ticket #123                           │ AppBar
+├─────────────────────────────────────────┤
+│ 📋 Support    🟢 Open                   │ Header
+├─────────────────────────────────────────┤
+│                                          │
+│ 💬 Chat Messages...                     │ Chat
+│                                          │
+│ [Type message...] [Send]                │ Input
+├─────────────────────────────────────────┤
+│ ┌─────────────────────────────────────┐ │
+│ │  🔒 Close Ticket                    │ │ ← NEU!
+│ └─────────────────────────────────────┘ │ Action Button
+│                                          │ Container
+└─────────────────────────────────────────┘
+```
+
+**Bei geschlossenem Ticket:**
+```
+├─────────────────────────────────────────┤
+│ 📋 Support    🔴 Closed                 │
+│ 📊 Reopened 1/3 times                   │ ← Reopen Counter
+├─────────────────────────────────────────┤
+│                                          │
+│ 💬 Chat History (read-only)             │
+│                                          │
+├─────────────────────────────────────────┤
+│ ┌─────────────────────────────────────┐ │
+│ │  🔓 Reopen Ticket                   │ │ ← NEU!
+│ └─────────────────────────────────────┘ │ Reopen Button
+│                                          │ (Blau)
+└─────────────────────────────────────────┘
+```
+
+**Bei Reopen-Limit erreicht:**
+```
+├─────────────────────────────────────────┤
+│ 📋 Support    🔴 Closed                 │
+│ ⚠️ Reopen limit reached (3/3)           │ ← Warning
+├─────────────────────────────────────────┤
+│                                          │
+│ 💬 Chat History (read-only)             │
+│                                          │
+├─────────────────────────────────────────┤
+│ ┌─────────────────────────────────────┐ │
+│ │ ℹ️ Cannot reopen again               │ │
+│ │ Please create a new ticket           │ │ ← Info Box
+│ └─────────────────────────────────────┘ │ (disabled)
+└─────────────────────────────────────────┘
+```
+
+---
+
+## Option 2: Buttons in der AppBar (Alternative)
+
+```
+┌─────────────────────────────────────────┐
+│ ← Ticket #123              🔒 Close  │ │ ← Button in AppBar
+├─────────────────────────────────────────┤
+│ 📋 Support    🟢 Open                   │
+├─────────────────────────────────────────┤
+│ 💬 Chat...                              │
+│ [Input]                                 │
+└─────────────────────────────────────────┘
+```
+
+**Nachteil:** Weniger prominent, könnte übersehen werden.
+
+---
+
+## Option 3: Floating Action Button (Alternative)
+
+```
+┌─────────────────────────────────────────┐
+│ ← Ticket #123                           │
+├─────────────────────────────────────────┤
+│ 💬 Chat...                              │
+│                                          │
+│                              ╭─────╮    │
+│                              │ 🔒  │    │ ← FAB
+│                              ╰─────╯    │
+└─────────────────────────────────────────┘
+```
+
+**Nachteil:** Könnte Chat-Inhalte überdecken.
+
+---
+
+## 🎨 Detaillierte UI-Spezifikation (Option 1 - Empfohlen)
+
+### Scaffold Struktur
+
+```dart
+Scaffold(
+  appBar: AppBar(...),
+  body: Column(
+    children: [
+      // 1. Header Container (unchanged)
+      Container(...),
+      
+      Divider(),
+      
+      // 2. Chat Widget (unchanged)
+      Expanded(
+        child: TicketChatWidget(...),
+      ),
+      
+      // 3. ACTION BUTTONS SECTION (NEU!)
+      Container(
+        padding: EdgeInsets.all(16),
+        decoration: BoxDecoration(
+          color: colorScheme.surfaceContainerLow,
+          border: Border(
+            top: BorderSide(
+              color: colorScheme.outlineVariant,
+            ),
+          ),
+        ),
+        child: _buildActionButtons(),
+      ),
+    ],
+  ),
+)
+```
+
+### Button Designs
+
+#### Close Button (Offenes Ticket)
+```dart
+SizedBox(
+  width: double.infinity,
+  child: FilledButton.icon(
+    onPressed: _closeTicket,
+    icon: Icon(Icons.lock),
+    label: Text('Close Ticket'),
+    style: FilledButton.styleFrom(
+      backgroundColor: Colors.red[700],
+      padding: EdgeInsets.symmetric(vertical: 16),
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(12),
+      ),
+    ),
+  ),
+)
+```
+
+**Visuell:**
+```
+┌─────────────────────────────────────┐
+│  🔒  Close Ticket                   │  ← Roter Button
+└─────────────────────────────────────┘
+```
+
+#### Reopen Button (Geschlossenes Ticket)
+```dart
+Column(
+  crossAxisAlignment: CrossAxisAlignment.stretch,
+  children: [
+    // Reopen Counter Badge
+    if (ticket.reopenCount > 0)
+      Container(
+        padding: EdgeInsets.all(12),
+        margin: EdgeInsets.only(bottom: 12),
+        decoration: BoxDecoration(
+          color: Colors.orange[50],
+          borderRadius: BorderRadius.circular(8),
+          border: Border.all(color: Colors.orange[300]!),
+        ),
+        child: Row(
+          children: [
+            Icon(Icons.info_outline, color: Colors.orange[700]),
+            SizedBox(width: 8),
+            Text(
+              'Reopened ${ticket.reopenCount}/3 times',
+              style: TextStyle(color: Colors.orange[900]),
+            ),
+          ],
+        ),
+      ),
+    
+    // Reopen Button
+    FilledButton.icon(
+      onPressed: ticket.reopenCount < 3 ? _reopenTicket : null,
+      icon: Icon(Icons.lock_open),
+      label: Text(
+        ticket.reopenCount < 3 
+          ? 'Reopen Ticket (${3 - ticket.reopenCount} left)'
+          : 'Reopen Limit Reached',
+      ),
+      style: FilledButton.styleFrom(
+        backgroundColor: Colors.blue[700],
+        padding: EdgeInsets.symmetric(vertical: 16),
+      ),
+    ),
+  ],
+)
+```
+
+**Visuell (1 Reopen):**
+```
+┌─────────────────────────────────────┐
+│ ⓘ Reopened 1/3 times                │  ← Orange Info Box
+└─────────────────────────────────────┘
+
+┌─────────────────────────────────────┐
+│  🔓  Reopen Ticket (2 left)         │  ← Blauer Button
+└─────────────────────────────────────┘
+```
+
+**Visuell (Limit erreicht):**
+```
+┌─────────────────────────────────────┐
+│ ⚠️ Reopen limit reached (3/3)       │  ← Rote Warning Box
+│                                      │
+│ You cannot reopen this ticket again.│
+│ Please create a new ticket if you   │
+│ still need assistance.               │
+└─────────────────────────────────────┘
+
+┌─────────────────────────────────────┐
+│  🔓  Reopen Limit Reached           │  ← Disabled (grau)
+└─────────────────────────────────────┘
+```
+
+---
+
+## 💬 Dialogs
+
+### Close Ticket Dialog
+```
+┌──────────────────────────────────┐
+│ Close Ticket                   × │
+├──────────────────────────────────┤
+│                                   │
+│ Add an optional closing message: │
+│                                   │
+│ ┌───────────────────────────────┐│
+│ │ Thank you for reporting this. ││
+│ │ The issue has been resolved.  ││
+│ │                               ││
+│ └───────────────────────────────┘│
+│ 0/500 characters                  │
+│                                   │
+│           [Cancel]  [Close]       │
+└──────────────────────────────────┘
+```
+
+### Reopen Confirmation Dialog
+```
+┌──────────────────────────────────┐
+│ Reopen Ticket                  × │
+├──────────────────────────────────┤
+│                                   │
+│ Do you want to reopen this        │
+│ ticket?                           │
+│                                   │
+│ Reopens remaining: 2/3            │
+│                                   │
+│ The ticket will be reopened and   │
+│ you can continue the conversation.│
+│                                   │
+│           [Cancel]  [Reopen]      │
+└──────────────────────────────────┘
+```
+
+---
+
+## 🎬 User Flow
+
+### Close Ticket Flow
+```
+1. User öffnet eigenes Ticket
+   → Status: Open
+   → Sieht "🔒 Close Ticket" Button
+
+2. User klickt "Close Ticket"
+   → Dialog öffnet sich
+   → Optional: Close Message eingeben
+
+3. User klickt "Close"
+   → Loading Indicator
+   → API Call /api/tickets/{id}/close
+
+4. Success
+   → SnackBar: "✅ Ticket closed successfully"
+   → Navigate back zur Ticket-Liste
+   → Ticket Status jetzt "Closed"
+```
+
+### Reopen Ticket Flow
+```
+1. User öffnet eigenes geschlossenes Ticket
+   → Status: Closed
+   → Sieht "🔓 Reopen Ticket (3 left)" Button
+   → Sieht Reopen Counter wenn > 0
+
+2. User klickt "Reopen Ticket"
+   → Confirmation Dialog
+   → Zeigt verbleibende Reopens
+
+3. User bestätigt
+   → Loading Indicator
+   → API Call /api/tickets/{id}/reopen
+
+4. Success
+   → SnackBar: "✅ Ticket reopened successfully"
+   → Navigate back zur Ticket-Liste
+   → Ticket Status jetzt "Open"
+```
+
+---
+
+## 📊 State Diagram
+
+```
+┌─────────────────────────────────────────┐
+│           TICKET STATE                  │
+└─────────────────────────────────────────┘
+          │
+          │ User opens ticket
+          ↓
+    ┌──────────┐
+    │   OPEN   │ ← Shows: Close Button
+    └──────────┘
+          │
+          │ User clicks Close
+          ↓
+    ┌──────────┐
+    │  CLOSED  │ ← Shows: Reopen Button (if < 3)
+    └──────────┘
+          │
+          │ User clicks Reopen
+          │ (reopen_count++)
+          ↓
+    ┌──────────┐
+    │   OPEN   │ ← Shows: Close Button
+    └──────────┘   + "Reopened 1/3 times" badge
+          │
+          │ ... repeat up to 3x ...
+          ↓
+    ┌──────────┐
+    │  CLOSED  │ ← Shows: Disabled message
+    └──────────┘   "Reopen limit reached (3/3)"
+                   Cannot reopen anymore
+```
+
+---
+
+## 🎨 Color Scheme
+
+### Close Button
+- Background: `Colors.red[700]` (Rot)
+- Icon: `Icons.lock`
+- Text: "Close Ticket"
+
+### Reopen Button
+- Background: `Colors.blue[700]` (Blau)
+- Icon: `Icons.lock_open`
+- Text: "Reopen Ticket (X left)"
+
+### Reopen Counter Badge
+- Background: `Colors.orange[50]`
+- Border: `Colors.orange[300]`
+- Text: `Colors.orange[900]`
+- Icon: `Icons.info_outline`
+
+### Warning (Limit Reached)
+- Background: `Colors.red[50]`
+- Border: `Colors.red[300]`
+- Text: `Colors.red[900]`
+- Icon: `Icons.warning_amber`
+
+---
+
+## 🔍 Responsive Design
+
+### Mobile (< 600dp)
+- Buttons: Full width
+- Padding: 16px
+- Button height: 48dp (Material touch target)
+
+### Tablet/Desktop (> 600dp)
+- Buttons: Full width (in ticket detail)
+- Max width könnte begrenzt werden: 400px centered
+
+---
+
+## ✅ Warum Option 1 (Buttons unter Chat)?
+
+1. **Prominent:** Immer sichtbar ohne scrollen
+2. **Nicht störend:** Überdeckt keinen Chat-Inhalt
+3. **Konsistent:** Ähnlich wie Admin Dialog Layout
+4. **Klar getrennt:** Eigener Container = klare Action Section
+5. **Mobile-friendly:** Leicht erreichbar am unteren Bildschirmrand
+6. **Flexibel:** Platz für zusätzliche Info-Boxen (Reopen Counter)
+
+---
+
+## 📱 Screenshot-Ähnliche Darstellung
+
+### Offenes Ticket auf Mobile
+```
+╔═══════════════════════════════════════╗
+║ ←  Ticket #123                        ║
+╠═══════════════════════════════════════╣
+║ 📋 Support      🟢 Open               ║
+║                                        ║
+║ ℹ️ Subject: Cannot login ▼            ║
+╠═══════════════════════════════════════╣
+║                                        ║
+║  Admin: How can I help you?           ║
+║  ┗━ 2 hours ago                        ║
+║                                        ║
+║  You: I forgot my password            ║
+║  ┗━ 1 hour ago                         ║
+║                                        ║
+║  Admin: I've reset it, check email    ║
+║  ┗━ 30 minutes ago                     ║
+║                                        ║
+║ [Type your message here...      Send] ║
+╠═══════════════════════════════════════╣
+║ ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ ║
+║ ┃   🔒   Close Ticket              ┃ ║
+║ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ║
+╚═══════════════════════════════════════╝
+```
+
+### Geschlossenes Ticket (1x Reopened)
+```
+╔═══════════════════════════════════════╗
+║ ←  Ticket #123                        ║
+╠═══════════════════════════════════════╣
+║ 📋 Support      🔴 Closed             ║
+╠═══════════════════════════════════════╣
+║                                        ║
+║  Admin: Issue resolved!                ║
+║  ┗━ 1 day ago                          ║
+║                                        ║
+║  [This ticket has been closed]        ║
+║                                        ║
+╠═══════════════════════════════════════╣
+║ ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ ║
+║ ┃ ⓘ Reopened 1/3 times             ┃ ║
+║ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ║
+║                                        ║
+║ ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ ║
+║ ┃   🔓   Reopen Ticket (2 left)    ┃ ║
+║ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ║
+╚═══════════════════════════════════════╝
+```
+
+**Perfekt klar und prominent platziert!** ✅
diff --git a/TICKET_USER_ACTIONS_PLAN.md b/TICKET_USER_ACTIONS_PLAN.md
new file mode 100644
index 0000000..3ed10fb
--- /dev/null
+++ b/TICKET_USER_ACTIONS_PLAN.md
@@ -0,0 +1,339 @@
+# Plan: User Ticket Close/Reopen Funktionen
+
+## 📋 Zusammenfassung
+
+Normale User sollen ihre eigenen Tickets closen und wieder öffnen können (begrenzt auf 3x Reopen).
+
+## ✅ Was bereits vorhanden ist
+
+### Backend (HazeBot API)
+1. **API Endpoints existieren bereits:**
+   - `POST /api/tickets/<ticket_id>/close` - Ticket schließen
+   - `POST /api/tickets/<ticket_id>/reopen` - Ticket wieder öffnen
+   
+2. **Berechtigungen bereits korrekt:**
+   - `is_allowed_for_ticket_actions()` in `Cogs/TicketSystem.py` Zeile 98:
+     - **Close**: Creator, Admins oder Moderators ✅
+     - **Reopen**: Creator, Admins oder Moderators ✅
+   - Reopen limitiert auf 3 Mal (Zeile 868)
+
+3. **API Permission Decorators:**
+   - `close_ticket_endpoint`: `require_permission("all")` - bedeutet alle authentifizierten User ✅
+   - `reopen_ticket_endpoint`: `require_permission("all")` - bedeutet alle authentifizierten User ✅
+
+### Discord Bot
+- User können im Discord bereits ihre Tickets closen/reopenen via Buttons
+- Reopen Count wird getrackt und auf 3 limitiert
+
+### Frontend Admin Screen
+- `lib/screens/admin/ticket_detail_dialog.dart` hat bereits:
+  - `_closeTicket()` Methode (Zeile 334)
+  - `_reopenTicket()` Methode (Zeile 378)
+  - UI Buttons für beide Aktionen
+  - Close mit optionaler Message
+
+### Frontend API Service
+- `lib/services/api_service.dart` hat bereits:
+  - `closeTicket(String ticketId, {String? closeMessage})` (Zeile 1598)
+  - `reopenTicket(String ticketId)` (Zeile 1610)
+
+## 🚧 Was fehlt
+
+### User Tickets Screen
+Die Datei `lib/screens/user/tickets_screen.dart` zeigt nur:
+- Liste der eigenen Tickets (My Tickets Tab)
+- Create New Ticket Tab
+- `_TicketDetailScreen` Widget (Zeile 892) - zeigt nur Chat, **KEINE** Action Buttons
+
+**Problem:** User sehen zwar ihre Tickets und können Nachrichten schreiben, aber haben keine Buttons zum Close/Reopen.
+
+## 📝 Implementierungsplan
+
+### Phase 1: User Ticket Detail Screen erweitern
+
+**Datei:** `lib/screens/user/tickets_screen.dart`
+
+#### 1.1 _TicketDetailScreen zu StatefulWidget ändern
+- Aktuell: StatelessWidget (Zeile 892)
+- Neu: StatefulWidget mit State Management
+
+#### 1.2 Action Buttons hinzufügen
+**Für offene Tickets (Status: 'Open' oder 'Claimed'):**
+```dart
+// Close Button
+FilledButton.icon(
+  onPressed: _closeTicket,
+  icon: Icon(Icons.lock),
+  label: Text('Close Ticket'),
+  style: FilledButton.styleFrom(
+    backgroundColor: Colors.red,
+  ),
+)
+```
+
+**Für geschlossene Tickets (Status: 'Closed'):**
+```dart
+// Reopen Button (nur wenn reopen_count < 3)
+if (ticket.reopenCount < 3)
+  FilledButton.icon(
+    onPressed: _reopenTicket,
+    icon: Icon(Icons.lock_open),
+    label: Text('Reopen Ticket'),
+  )
+
+// Reopen Counter anzeigen
+if (ticket.reopenCount > 0)
+  Text('Reopened ${ticket.reopenCount}/3 times')
+```
+
+#### 1.3 Methoden implementieren
+
+**_closeTicket():**
+```dart
+Future<void> _closeTicket() async {
+  // 1. Optional: Close Message Dialog (wie im Admin Screen)
+  final closeMessage = await showDialog<String>(
+    context: context,
+    builder: (context) => _CloseMessageDialog(),
+  );
+  
+  if (closeMessage == null) return;
+  
+  // 2. API Call
+  await ApiService().closeTicket(
+    ticket.ticketId,
+    closeMessage: closeMessage.isEmpty ? null : closeMessage,
+  );
+  
+  // 3. Refresh & Navigate back
+  if (mounted) {
+    Navigator.pop(context); // Zurück zur Ticket-Liste
+    // Ticket-Liste wird automatisch refreshed
+  }
+}
+```
+
+**_reopenTicket():**
+```dart
+Future<void> _reopenTicket() async {
+  // 1. Confirmation Dialog
+  final confirmed = await showDialog<bool>(
+    context: context,
+    builder: (context) => AlertDialog(
+      title: Text('Reopen Ticket'),
+      content: Text(
+        'Do you want to reopen this ticket?\n'
+        'Reopens remaining: ${3 - ticket.reopenCount}/3'
+      ),
+      actions: [
+        TextButton(
+          onPressed: () => Navigator.pop(context, false),
+          child: Text('Cancel'),
+        ),
+        FilledButton(
+          onPressed: () => Navigator.pop(context, true),
+          child: Text('Reopen'),
+        ),
+      ],
+    ),
+  );
+  
+  if (confirmed != true) return;
+  
+  // 2. API Call
+  await ApiService().reopenTicket(ticket.ticketId);
+  
+  // 3. Refresh & Navigate back
+  if (mounted) {
+    Navigator.pop(context);
+  }
+}
+```
+
+#### 1.4 _CloseMessageDialog Widget
+- Copy from `lib/screens/admin/ticket_detail_dialog.dart` (Zeile 1326)
+- Optionale Nachricht beim Schließen
+- Max 500 Zeichen
+
+### Phase 2: Ticket Model erweitern (falls nötig)
+
+**Datei:** `lib/models/ticket.dart`
+
+Prüfen ob `reopenCount` bereits im Model ist:
+```dart
+final int reopenCount; // Anzahl wie oft reopened
+```
+
+Falls nicht vorhanden: hinzufügen.
+
+### Phase 3: UI/UX Verbesserungen
+
+#### 3.1 Status Badge in Ticket Liste
+- Zeige visuell ob Ticket offen/geschlossen ist
+- Farbcodierung: Grün (Open), Orange (Claimed), Rot (Closed)
+
+#### 3.2 Reopen Counter
+- Zeige in der Ticket-Detail-Ansicht wie oft noch reopened werden kann
+- Warning wenn Limit erreicht: "Cannot reopen again (limit reached)"
+
+#### 3.3 Loading States
+- Loading Indicator während API Calls
+- Disable Buttons während Verarbeitung
+
+#### 3.4 Error Handling
+- SnackBar bei Fehlern
+- Spezifische Fehlermeldungen:
+  - "Ticket already closed"
+  - "Ticket cannot be reopened more than 3 times"
+  - "Network error"
+
+### Phase 4: Testing
+
+#### 4.1 Test Cases
+1. **Close Ticket:**
+   - ✅ User kann eigenes offenes Ticket closen
+   - ✅ Close Message wird gespeichert
+   - ✅ Ticket Status wird auf "Closed" gesetzt
+   - ✅ User kann nach Close keine Nachrichten mehr senden
+
+2. **Reopen Ticket:**
+   - ✅ User kann eigenes geschlossenes Ticket reopenen
+   - ✅ Reopen Count wird inkrementiert
+   - ✅ Nach 3x Reopen: Button disabled + Warning
+   - ✅ Nach Reopen kann User wieder Nachrichten senden
+
+3. **Berechtigungen:**
+   - ❌ User kann NICHT Tickets von anderen Usern closen/reopenen
+   - ✅ Admin kann alle Tickets closen/reopenen (bereits vorhanden)
+
+4. **UI:**
+   - ✅ Buttons erscheinen zur richtigen Zeit
+   - ✅ Loading States funktionieren
+   - ✅ Error Messages werden angezeigt
+   - ✅ Navigation funktioniert
+
+## 📂 Betroffene Dateien
+
+### Zu ändern:
+1. ✏️ `lib/screens/user/tickets_screen.dart` - Hauptänderung
+   - `_TicketDetailScreen` zu StatefulWidget
+   - Action Buttons hinzufügen
+   - `_closeTicket()` und `_reopenTicket()` Methoden
+   - `_CloseMessageDialog` Widget
+
+### Ggf. zu ändern:
+2. ✏️ `lib/models/ticket.dart` - Falls `reopenCount` fehlt
+
+### Bereits vorhanden (keine Änderung):
+3. ✅ `lib/services/api_service.dart` - API Calls vorhanden
+4. ✅ `HazeBot/api/ticket_routes.py` - Backend Endpoints vorhanden
+5. ✅ `HazeBot/Cogs/TicketSystem.py` - Berechtigungen korrekt
+
+## ⏱️ Aufwandsschätzung
+
+**Gesamt: ~2-3 Stunden**
+
+- Phase 1: Widget Refactoring & UI: **1-1.5h**
+  - StatefulWidget Conversion: 15min
+  - Action Buttons UI: 30min
+  - `_closeTicket()` Methode: 20min
+  - `_reopenTicket()` Methode: 20min
+  - `_CloseMessageDialog`: 10min (Copy & Adapt)
+  
+- Phase 2: Model Check: **10min**
+  - Prüfen ob `reopenCount` vorhanden
+  - Falls nötig hinzufügen
+
+- Phase 3: UI/UX Polish: **30-45min**
+  - Status Badges
+  - Loading States
+  - Error Handling
+  - Reopen Counter Display
+
+- Phase 4: Testing: **30min**
+  - Manuelle Tests
+  - Edge Cases prüfen
+
+## ✅ Vorteile dieser Implementierung
+
+1. **Minimal Invasiv:** Nur Frontend-Änderungen nötig
+2. **Backend Ready:** API Endpoints bereits vorhanden und getestet
+3. **Konsistent:** Nutzt gleiche API Calls wie Admin Screen
+4. **Sicher:** Berechtigungen werden auf Backend geprüft
+5. **User Experience:** User können Tickets selbst verwalten ohne Admin/Mod
+
+## 🔒 Sicherheit
+
+- ✅ Backend validiert User ID vs. Ticket Creator ID
+- ✅ Reopen Limit wird auf Backend erzwungen
+- ✅ JWT Token erforderlich für API Calls
+- ✅ Keine zusätzlichen Security Concerns
+
+## 📱 UI Mockup (Textbeschreibung)
+
+### Offenes Ticket (_TicketDetailScreen):
+```
+┌─────────────────────────────┐
+│  Ticket #123                │
+│  Status: Open 🟢            │
+├─────────────────────────────┤
+│                             │
+│  [Chat Messages hier]       │
+│                             │
+├─────────────────────────────┤
+│  [Message Input Field]      │
+│  [Send Button]              │
+├─────────────────────────────┤
+│  [🔒 Close Ticket] (Red)    │
+└─────────────────────────────┘
+```
+
+### Geschlossenes Ticket (_TicketDetailScreen):
+```
+┌─────────────────────────────┐
+│  Ticket #123                │
+│  Status: Closed 🔴          │
+│  Reopened 1/3 times         │
+├─────────────────────────────┤
+│                             │
+│  [Chat History (read-only)] │
+│                             │
+├─────────────────────────────┤
+│  [🔓 Reopen Ticket] (Blue)  │
+└─────────────────────────────┘
+```
+
+### Geschlossenes Ticket (Limit erreicht):
+```
+┌─────────────────────────────┐
+│  Ticket #123                │
+│  Status: Closed 🔴          │
+│  ⚠️ Reopen limit reached    │
+│  (3/3 reopens used)         │
+├─────────────────────────────┤
+│                             │
+│  [Chat History (read-only)] │
+│                             │
+├─────────────────────────────┤
+│  ℹ️ Cannot reopen again     │
+│  Please create a new ticket │
+└─────────────────────────────┘
+```
+
+## 🎯 Nächste Schritte
+
+1. ✅ Plan Review (Done - dieser Plan)
+2. ⏳ `lib/models/ticket.dart` prüfen auf `reopenCount`
+3. ⏳ `_TicketDetailScreen` zu StatefulWidget refactoren
+4. ⏳ Action Buttons implementieren
+5. ⏳ `_closeTicket()` und `_reopenTicket()` Methoden
+6. ⏳ UI/UX Polish
+7. ⏳ Testing
+8. ⏳ Dokumentation Update
+
+## 💡 Hinweise
+
+- Die Admin Screen Implementierung kann als Referenz dienen
+- Error Handling sollte spezifisch sein (z.B. "Already closed", "Reopen limit")
+- Loading States wichtig für User Feedback
+- Reopen Counter prominent anzeigen wenn > 0
diff --git a/APK_DOWNLOAD.md b/docs/APK_DOWNLOAD.md
similarity index 87%
rename from APK_DOWNLOAD.md
rename to docs/APK_DOWNLOAD.md
index 6d41ea3..f32de64 100644
--- a/APK_DOWNLOAD.md
+++ b/docs/APK_DOWNLOAD.md
@@ -104,8 +104,8 @@ Choose download option above and save APK to your device.
 ### API URL Setup
 
 **Pre-configured APKs:**
-- Test builds: `https://test-hazebot-admin.hzwd.xyz/api`
-- Production builds: Your production API URL
+- Test builds: Connect to your test/staging API
+- Production builds: Connect to your production API URL
 
 **Manual Configuration:**
 1. Open app
@@ -115,8 +115,8 @@ Choose download option above and save APK to your device.
 5. Save and return to login
 
 **API URL Examples:**
-- **Local Testing:** `http://10.0.2.2:5070/api` (emulator)
-- **LAN Testing:** `http://192.168.1.100:5070/api` (physical device)
+- **Local Testing (Emulator):** `http://10.0.2.2:5070/api`
+- **Local Testing (Device):** `http://YOUR_LOCAL_IP:5070/api` (find with `ip addr` or `ifconfig`)
 - **Production:** `https://your-domain.com/api`
 
 ### API Configuration
@@ -249,15 +249,26 @@ Creates versioned release alongside automated builds.
 
 ---
 
+## 🔗 Next Steps
+
+After installing:
+- 🔧 [Setup Checklist](SETUP_CHECKLIST.md) - Complete setup verification
+- 🔥 [Firebase Setup](FIREBASE_SETUP.md) - Enable push notifications (optional)
+- 📋 [Features](FEATURES.md) - Explore what the app can do
+- 🏠 [Documentation Index](README.md) - All documentation
+
+---
+
 ## 🆘 Support
 
 **Problems?** Open an issue:
-- GitHub Issues: https://github.com/inventory69/HazeBot-Admin/issues
+- GitHub Issues: `https://github.com/YOUR_USERNAME/HazeBot-Admin/issues`
 - Include: Android version, APK version, error messages
 
 **Questions?**
-- Check [README.md](README.md) for full documentation
-- Review [SETUP_CHECKLIST.md](SETUP_CHECKLIST.md)
+- Check [Documentation Index](README.md) for all guides
+- Review [Setup Checklist](SETUP_CHECKLIST.md) for configuration
+- See [Troubleshooting section](#-troubleshooting) above
 
 ---
 
diff --git a/BUILDING.md b/docs/BUILDING.md
similarity index 72%
rename from BUILDING.md
rename to docs/BUILDING.md
index 07e4978..977a0f2 100644
--- a/BUILDING.md
+++ b/docs/BUILDING.md
@@ -26,13 +26,11 @@ flutter build web --release --pwa-strategy=none
 ### Test Locally
 
 ```bash
-# Navigate to build directory
-cd build/web
-
-# Start local server (port 8000)
-python3 ../../../spa_server.py
+# Start local server (port 8080)
+python3 scripts/spa_server.py --dir build/web --port 8080
 
-# Or use Python's built-in server
+# Or navigate to build directory and use Python's built-in server
+cd build/web
 python3 -m http.server 8000
 ```
 
@@ -343,9 +341,77 @@ Run: `./build.sh`
 
 ---
 
-## Next Steps
+## �️ Build Scripts
+
+The `scripts/` directory contains helper scripts for building and development:
+
+### spa_server.py
+**Purpose:** Minimal SPA (Single Page Application) server for testing web builds locally.
+
+**Usage:**
+```bash
+# Serve web build
+python3 scripts/spa_server.py --dir build/web --port 8080
+
+# Custom directory and port
+python3 scripts/spa_server.py --dir path/to/build --port 3000
+```
+
+**Features:**
+- Serves static files from build directory
+- Falls back to `index.html` for client-side routing
+- Perfect for testing web builds before deployment
+
+### generate_adaptive_icons.sh
+**Purpose:** Generate Android adaptive launcher icons from a source PNG.
+
+**Requirements:**
+- ImageMagick (`sudo apt-get install imagemagick`)
+- Source image: `app_icon_source.png` in project root
+
+**Usage:**
+```bash
+# Run from project root
+./scripts/generate_adaptive_icons.sh
+```
+
+**Output:**
+- Foreground/background layers for all densities (mdpi, hdpi, xhdpi, xxhdpi, xxxhdpi)
+- XML descriptors in `mipmap-anydpi-v26/`
+- Adaptive icons for Android 8.0+ (API 26)
+
+### create_notification_icon.sh
+**Purpose:** Create monochrome notification icons for Android status bar.
+
+**Requirements:**
+- ImageMagick
+- Existing launcher icon in `android/app/src/main/res/mipmap-xxxhdpi/`
+
+**Usage:**
+```bash
+# Run from project root
+./scripts/create_notification_icon.sh
+```
+
+**Output:**
+- White monochrome icons in `drawable-*/` directories
+- All densities: 24dp (mdpi) to 96dp (xxxhdpi)
+- Ready for Android notification system
+
+---
+
+## �🔗 Next Steps
+
+- 📱 [APK Installation Guide](APK_DOWNLOAD.md) - Install built APKs
+- 🔥 [Firebase Setup](FIREBASE_SETUP.md) - Configure push notifications
+- 🚀 [GitHub Actions](GITHUB_ACTIONS.md) - Automated CI/CD builds
+- 🧪 [Development Guide](DEVELOPMENT.md) - Development workflows
+- 🏠 [Documentation Index](README.md) - All documentation
+
+---
+
+## 🆘 Getting Help
 
-- 📱 [APK Installation Guide](APK_DOWNLOAD.md)
-- 🔥 [Firebase Setup](FIREBASE_SETUP.md)
-- 🚀 [GitHub Actions CI/CD](GITHUB_ACTIONS.md)
-- 🏠 [Back to README](README.md)
+- **Build Issues:** Check troubleshooting section above
+- **Platform-Specific:** Review [Flutter Documentation](https://docs.flutter.dev/deployment)
+- **Questions:** Open an issue on [GitHub](https://github.com/YOUR_USERNAME/HazeBot-Admin/issues)
diff --git a/CHANGELOG.md b/docs/CHANGELOG.md
similarity index 88%
rename from CHANGELOG.md
rename to docs/CHANGELOG.md
index bf38a6a..98fba06 100644
--- a/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -98,6 +98,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Contributing
 
-See [CONTRIBUTING.md](CONTRIBUTING.md) for details on contributing to this project.
+Report bugs and request features via [GitHub Issues](https://github.com/YOUR_USERNAME/HazeBot-Admin/issues).
 
-Report bugs and request features via [GitHub Issues](https://github.com/inventory69/HazeBot-Admin/issues).
+See the main [README](../README.md#-contributing) for contribution guidelines.
+
+---
+
+## 🔗 Documentation
+
+- 📖 [Documentation Index](README.md) - All documentation
+- 📋 [Features](FEATURES.md) - Complete feature list
+- 🔨 [Building](BUILDING.md) - Build instructions
+- 🏠 [Main README](../README.md) - Project overview
diff --git a/DEVELOPMENT.md b/docs/DEVELOPMENT.md
similarity index 92%
rename from DEVELOPMENT.md
rename to docs/DEVELOPMENT.md
index 219ab68..05f0c6b 100644
--- a/DEVELOPMENT.md
+++ b/docs/DEVELOPMENT.md
@@ -574,8 +574,22 @@ docs: update setup instructions
 
 ---
 
-## Next Steps
+## 🔗 Next Steps
 
-- 🏠 [Back to README](README.md)
-- 🔨 [Building Guide](BUILDING.md)
-- 🏗️ [Architecture](../HazeBot/ARCHITECTURE.md)
+- 🔨 [Building Guide](BUILDING.md) - Build for all platforms
+- 📋 [Features](FEATURES.md) - Understand existing features
+- 🔥 [Firebase Setup](FIREBASE_SETUP.md) - Configure notifications
+- 🏠 [Documentation Index](README.md) - All documentation
+
+**Related Resources:**
+- 🤖 [HazeBot Backend](https://github.com/inventory69/HazeBot) - Bot & API server
+- 📖 [HazeBot API](https://github.com/inventory69/HazeBot/blob/main/api/README.md) - REST API reference
+- 🏗️ [Flutter Documentation](https://docs.flutter.dev) - Official Flutter guides
+
+---
+
+## 🆘 Getting Help
+
+- **Development Issues:** Check troubleshooting section above
+- **Flutter Questions:** [Flutter Documentation](https://docs.flutter.dev)
+- **Project Questions:** Open an issue on [GitHub](https://github.com/YOUR_USERNAME/HazeBot-Admin/issues)
diff --git a/FEATURES.md b/docs/FEATURES.md
similarity index 100%
rename from FEATURES.md
rename to docs/FEATURES.md
diff --git a/FIREBASE_SETUP.md b/docs/FIREBASE_SETUP.md
similarity index 87%
rename from FIREBASE_SETUP.md
rename to docs/FIREBASE_SETUP.md
index 3479334..2ddd69d 100644
--- a/FIREBASE_SETUP.md
+++ b/docs/FIREBASE_SETUP.md
@@ -206,4 +206,21 @@ HazeBot-Admin/
 
 ---
 
-For more info, see [Firebase Cloud Messaging Docs](https://firebase.google.com/docs/cloud-messaging)
+## 🔗 Next Steps
+
+- 🔨 [Building Guide](BUILDING.md) - Build for all platforms with Firebase
+- 🧪 [Development Guide](DEVELOPMENT.md) - Development workflows
+- 🏠 [Documentation Index](README.md) - All documentation
+
+**Related Resources:**
+- [Firebase Cloud Messaging Docs](https://firebase.google.com/docs/cloud-messaging) - Official FCM documentation
+- [Flutter Firebase Messaging](https://pub.dev/packages/firebase_messaging) - Flutter plugin docs
+- 🤖 [HazeBot Backend](https://github.com/inventory69/HazeBot) - Backend notification setup
+
+---
+
+## 🆘 Getting Help
+
+- **Firebase Issues:** Check troubleshooting section above
+- **Flutter Questions:** [Flutter Firebase Setup](https://firebase.google.com/docs/flutter/setup)
+- **Project Questions:** Open an issue on [GitHub](https://github.com/YOUR_USERNAME/HazeBot-Admin/issues)
diff --git a/GITHUB_ACTIONS.md b/docs/GITHUB_ACTIONS.md
similarity index 92%
rename from GITHUB_ACTIONS.md
rename to docs/GITHUB_ACTIONS.md
index 7fd61af..d3fc16f 100644
--- a/GITHUB_ACTIONS.md
+++ b/docs/GITHUB_ACTIONS.md
@@ -48,7 +48,7 @@ The workflow requires secrets for configuration. Add them in your repository:
 3. Value: e.g., `true`
 4. Click **Add secret**
 
-📚 **Detailed Setup Guide:** See [GITHUB_SECRETS_SETUP.md](docs/GITHUB_SECRETS_SETUP.md)
+📚 **Detailed Setup Guide:** See [GITHUB_SECRETS_SETUP.md](GITHUB_SECRETS_SETUP.md)
 
 ---
 
@@ -436,6 +436,12 @@ VERSION_TAG="v$(date +'%Y.%m.%d')-build-${{ github.run_number }}"
 
 ## 📚 Additional Resources
 
+**Related Documentation:**
+- [GITHUB_SECRETS_SETUP.md](GITHUB_SECRETS_SETUP.md) - Configure repository secrets
+- [BUILDING.md](BUILDING.md) - Local build instructions
+- [APK_DOWNLOAD.md](APK_DOWNLOAD.md) - Download and install guide
+- [Documentation Index](README.md) - All documentation
+
 **GitHub Actions Documentation:**
 - [Workflow Syntax](https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions)
 - [Secrets Management](https://docs.github.com/en/actions/security-guides/encrypted-secrets)
@@ -467,15 +473,25 @@ jobs:
 
 ---
 
+## 🔗 Next Steps
+
+- 📱 [APK Download Guide](APK_DOWNLOAD.md) - Install the built APK
+- 🔑 [GitHub Secrets Setup](GITHUB_SECRETS_SETUP.md) - Configure secrets
+- 🔨 [Building Guide](BUILDING.md) - Local build instructions
+- 🏠 [Documentation Index](README.md) - All documentation
+
+---
+
 ## 🆘 Support
 
 **Issues?** 
-- GitHub Issues: https://github.com/inventory69/HazeBot-Admin/issues
+- GitHub Issues: `https://github.com/YOUR_USERNAME/HazeBot-Admin/issues`
 - Include workflow run URL and error logs
 
 **Questions?**
-- Review [README.md](README.md)
+- Review [Documentation Index](README.md)
 - Check [APK_DOWNLOAD.md](APK_DOWNLOAD.md)
+- See [GITHUB_SECRETS_SETUP.md](GITHUB_SECRETS_SETUP.md)
 
 ---
 
diff --git a/docs/GITHUB_SECRETS_SETUP.md b/docs/GITHUB_SECRETS_SETUP.md
index fb3a405..4cd2f70 100644
--- a/docs/GITHUB_SECRETS_SETUP.md
+++ b/docs/GITHUB_SECRETS_SETUP.md
@@ -34,7 +34,7 @@ Die GitHub Actions Workflow benötigt folgende Secrets, um die App korrekt zu ba
 ## ⚙️ Secrets hinzufügen
 
 ### Schritt 1: GitHub Repository öffnen
-1. Gehe zu deinem Repository: https://github.com/inventory69/HazeBot-Admin
+1. Gehe zu deinem Repository: `https://github.com/YOUR_USERNAME/HazeBot-Admin`
 2. Klicke auf **Settings** (Zahnrad-Symbol)
 3. In der linken Sidebar: **Secrets and variables** → **Actions**
 
@@ -151,6 +151,7 @@ PROD_MODE=false  # Verwende false für lokale Entwicklung
 
 ## 📚 Siehe auch
 
-- [build-apk.yml](.github/workflows/build-apk.yml) - GitHub Actions Workflow
-- [app_config.dart](lib/utils/app_config.dart) - PROD_MODE Logik
-- [.env.example](.env.example) - Environment Variables Beispiel
+- [GITHUB_ACTIONS.md](GITHUB_ACTIONS.md) - Vollständige CI/CD Dokumentation
+- [BUILDING.md](BUILDING.md) - Build-Anweisungen
+- [SETUP_CHECKLIST.md](SETUP_CHECKLIST.md) - Setup-Checkliste
+- [Documentation Index](README.md) - Alle Dokumentationen
diff --git a/docs/README.md b/docs/README.md
new file mode 100644
index 0000000..01e9485
--- /dev/null
+++ b/docs/README.md
@@ -0,0 +1,102 @@
+# 📚 HazeBot Admin Documentation
+
+Welcome to the comprehensive documentation for HazeBot Admin - a modern, cross-platform Flutter admin panel for HazeBot.
+
+## 📖 Documentation Index
+
+### 🚀 Getting Started
+
+| Document | Description |
+|----------|-------------|
+| [Setup Checklist](SETUP_CHECKLIST.md) | Quick setup verification guide |
+| [APK Download](APK_DOWNLOAD.md) | Android APK installation instructions |
+| [Firebase Setup](FIREBASE_SETUP.md) | Push notification configuration |
+
+### 💻 Development
+
+| Document | Description |
+|----------|-------------|
+| [Development Guide](DEVELOPMENT.md) | Development workflows, patterns, and best practices |
+| [Building Guide](BUILDING.md) | Build instructions for Web, Android, iOS, and Desktop |
+
+### 🚢 Deployment
+
+| Document | Description |
+|----------|-------------|
+| [GitHub Actions](GITHUB_ACTIONS.md) | CI/CD pipeline documentation |
+| [GitHub Secrets](GITHUB_SECRETS_SETUP.md) | Repository secrets configuration |
+
+### 📋 Reference
+
+| Document | Description |
+|----------|-------------|
+| [Features](FEATURES.md) | Complete feature documentation |
+| [Changelog](CHANGELOG.md) | Version history and release notes |
+
+---
+
+## 🎯 Quick Navigation by Use Case
+
+### I want to...
+
+#### **Set up the app for the first time**
+1. Start with [Setup Checklist](SETUP_CHECKLIST.md) for prerequisites
+2. Follow the [Main README](../README.md#-quick-start) for installation
+3. Configure [Firebase Setup](FIREBASE_SETUP.md) for push notifications
+
+#### **Install the Android app**
+- Download APK using [APK Download Guide](APK_DOWNLOAD.md)
+- Use Obtainium for automatic updates
+
+#### **Develop new features**
+1. Read [Development Guide](DEVELOPMENT.md) for workflows and patterns
+2. Check [Features](FEATURES.md) to understand existing features
+3. Review [Building Guide](BUILDING.md) for platform-specific builds
+
+#### **Build for production**
+1. Follow [Building Guide](BUILDING.md) for your target platform
+2. Configure [GitHub Actions](GITHUB_ACTIONS.md) for automated builds
+3. Set up [GitHub Secrets](GITHUB_SECRETS_SETUP.md) for CI/CD
+
+#### **Understand what the app can do**
+- Browse [Features](FEATURES.md) for complete feature list
+- Check [Changelog](CHANGELOG.md) for recent additions
+
+---
+
+## 🔗 Related Documentation
+
+- **[HazeBot Repository](https://github.com/inventory69/HazeBot)** - Main bot and API server
+- **[HazeBot Documentation](https://github.com/inventory69/HazeBot/blob/main/docs/README.md)** - Backend documentation
+- **[HazeBot API](https://github.com/inventory69/HazeBot/blob/main/api/README.md)** - REST API reference
+
+---
+
+## 📱 Platform Support
+
+| Platform | Status | Notes |
+|----------|--------|-------|
+| **Web** | ✅ Primary | Best experience, recommended for desktop |
+| **Android** | ✅ Supported | APK releases available |
+| **iOS** | ⚠️ Untested | Should work, needs signing |
+| **Linux** | ✅ Supported | Desktop build available |
+| **Windows** | ⚠️ Untested | Should work with Flutter 3.0+ |
+| **macOS** | ⚠️ Untested | Should work, needs signing |
+
+---
+
+## 🆘 Getting Help
+
+1. **Check Documentation** - Search this documentation first
+2. **GitHub Issues** - [Open an issue](https://github.com/inventory69/HazeBot-Admin/issues)
+3. **HazeBot Backend** - Some issues may be API-related, check [HazeBot docs](https://github.com/inventory69/HazeBot/blob/main/docs/README.md)
+
+---
+
+## 🤝 Contributing
+
+See the main [README](../README.md#-contributing) for contribution guidelines.
+
+---
+
+*Made with 💖 for The Chillventory* 📱✨
diff --git a/SETUP_CHECKLIST.md b/docs/SETUP_CHECKLIST.md
similarity index 94%
rename from SETUP_CHECKLIST.md
rename to docs/SETUP_CHECKLIST.md
index 4c88dae..19823a1 100644
--- a/SETUP_CHECKLIST.md
+++ b/docs/SETUP_CHECKLIST.md
@@ -324,11 +324,11 @@ Output: `build/web/`
 **Deploy to:**
 - Static hosting (Netlify, Vercel, GitHub Pages)
 - Own server with nginx/Apache
-- Use `spa_server.py` for local testing
+- Use `python3 scripts/spa_server.py --dir build/web` for local testing
 
 - [ ] Web build successful
 - [ ] Static files generated
-- [ ] Tested locally with `spa_server.py`
+- [ ] Tested locally with `python3 scripts/spa_server.py --dir build/web`
 - [ ] Deployed to hosting
 
 ### Android APK
@@ -617,9 +617,16 @@ Once all items are checked:
 ---
 
 **Need Help?**
-- GitHub Issues: https://github.com/inventory69/HazeBot-Admin/issues
-- Documentation: [README.md](README.md)
-- Backend Setup: [HazeBot README](https://github.com/inventory69/HazeBot)
+- GitHub Issues: `https://github.com/YOUR_USERNAME/HazeBot-Admin/issues`
+- Documentation: [Documentation Index](README.md)
+- Backend Setup: [HazeBot Repository](https://github.com/inventory69/HazeBot)
+- Backend Docs: [HazeBot Documentation](https://github.com/inventory69/HazeBot/blob/main/docs/README.md)
+
+**Related Guides:**
+- 🔨 [Building Guide](BUILDING.md) - Build for all platforms
+- 🔥 [Firebase Setup](FIREBASE_SETUP.md) - Push notifications
+- 🚀 [GitHub Actions](GITHUB_ACTIONS.md) - CI/CD pipeline
+- 🧪 [Development Guide](DEVELOPMENT.md) - Development workflows
 
 ---
 
diff --git a/lib/models/ticket.dart b/lib/models/ticket.dart
index 2e8821e..8bdbd83 100644
--- a/lib/models/ticket.dart
+++ b/lib/models/ticket.dart
@@ -17,6 +17,7 @@ class Ticket {
   final String? assignedToName;
   final String? assignedToAvatar;
   final String? initialMessage;
+  final int reopenCount;
 
   Ticket({
     required this.ticketId,
@@ -37,6 +38,7 @@ class Ticket {
     this.assignedToName,
     this.assignedToAvatar,
     this.initialMessage,
+    this.reopenCount = 0,
   });
 
   factory Ticket.fromJson(Map<String, dynamic> json) {
@@ -59,6 +61,7 @@ class Ticket {
       assignedToName: json['assigned_to_name'] as String?,
       assignedToAvatar: json['assigned_to_avatar'] as String?,
       initialMessage: json['initial_message'] as String?,
+      reopenCount: json['reopen_count'] as int? ?? 0,
     );
   }
 
@@ -82,6 +85,7 @@ class Ticket {
       'assigned_to_name': assignedToName,
       'assigned_to_avatar': assignedToAvatar,
       'initial_message': initialMessage,
+      'reopen_count': reopenCount,
     };
   }
 
diff --git a/lib/screens/user/tickets_screen.dart b/lib/screens/user/tickets_screen.dart
index 4dec511..a141bf3 100644
--- a/lib/screens/user/tickets_screen.dart
+++ b/lib/screens/user/tickets_screen.dart
@@ -889,22 +889,159 @@ class _CreateTicketTabState extends State<_CreateTicketTab> {
 }
 
 // Ticket Detail Screen (for users) - using shared TicketChatWidget
-class _TicketDetailScreen extends StatelessWidget {
+class _TicketDetailScreen extends StatefulWidget {
   final Ticket ticket;
 
   const _TicketDetailScreen({required this.ticket});
 
+  @override
+  State<_TicketDetailScreen> createState() => _TicketDetailScreenState();
+}
+
+class _TicketDetailScreenState extends State<_TicketDetailScreen> {
+  late Ticket _ticket;
+  bool _isProcessing = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _ticket = widget.ticket;
+  }
+
+  Future<void> _closeTicket() async {
+    // Show close message dialog
+    final closeMessage = await showDialog<String>(
+      context: context,
+      builder: (context) => _CloseMessageDialog(),
+    );
+
+    if (closeMessage == null) return; // User cancelled
+
+    setState(() => _isProcessing = true);
+
+    try {
+      final authService = Provider.of<AuthService>(context, listen: false);
+      await authService.apiService.closeTicket(
+        _ticket.ticketId,
+        closeMessage: closeMessage.isEmpty ? null : closeMessage,
+      );
+
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(
+            content: Text('✅ Ticket closed successfully'),
+            backgroundColor: Colors.green,
+          ),
+        );
+        Navigator.pop(context); // Go back to ticket list
+      }
+    } catch (e) {
+      if (mounted) {
+        setState(() => _isProcessing = false);
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text('Failed to close ticket: $e'),
+            backgroundColor: Colors.red,
+          ),
+        );
+      }
+    }
+  }
+
+  Future<void> _reopenTicket() async {
+    // Show confirmation dialog
+    final confirmed = await showDialog<bool>(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: const Text('Reopen Ticket'),
+        content: Text(
+          'Do you want to reopen this ticket?\n\n'
+          'Reopens remaining: ${3 - _ticket.reopenCount}/3',
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(context, false),
+            child: const Text('Cancel'),
+          ),
+          FilledButton(
+            onPressed: () => Navigator.pop(context, true),
+            child: const Text('Reopen'),
+          ),
+        ],
+      ),
+    );
+
+    if (confirmed != true) return;
+
+    setState(() => _isProcessing = true);
+
+    try {
+      final authService = Provider.of<AuthService>(context, listen: false);
+      await authService.apiService.reopenTicket(_ticket.ticketId);
+
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(
+            content: Text('✅ Ticket reopened successfully'),
+            backgroundColor: Colors.green,
+          ),
+        );
+        Navigator.pop(context); // Go back to ticket list
+      }
+    } catch (e) {
+      if (mounted) {
+        setState(() => _isProcessing = false);
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text('Failed to reopen ticket: $e'),
+            backgroundColor: Colors.red,
+          ),
+        );
+      }
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
     final colorScheme = theme.colorScheme;
     final statusColor =
-        ticket.status.toLowerCase() == 'open' ? Colors.green : Colors.grey;
+        _ticket.status.toLowerCase() == 'open' ? Colors.green : Colors.grey;
 
     return Scaffold(
       appBar: AppBar(
-        title: Text('Ticket #${ticket.ticketNum}'),
+        title: Text('Ticket #${_ticket.ticketNum}'),
         backgroundColor: colorScheme.surface,
+        actions: [
+          // Show Close button for open tickets
+          if (_ticket.isOpen && !_isProcessing)
+            IconButton(
+              onPressed: _closeTicket,
+              icon: const Icon(Icons.lock),
+              tooltip: 'Close Ticket',
+              color: Colors.red[700],
+            ),
+          // Show Reopen button for closed tickets (if limit not reached)
+          if (_ticket.isClosed && _ticket.reopenCount < 3 && !_isProcessing)
+            IconButton(
+              onPressed: _reopenTicket,
+              icon: const Icon(Icons.lock_open),
+              tooltip: 'Reopen Ticket',
+              color: Colors.blue[700],
+            ),
+          // Show loading indicator when processing
+          if (_isProcessing)
+            const Padding(
+              padding: EdgeInsets.symmetric(horizontal: 16),
+              child: Center(
+                child: SizedBox(
+                  width: 20,
+                  height: 20,
+                  child: CircularProgressIndicator(strokeWidth: 2),
+                ),
+              ),
+            ),
+        ],
       ),
       body: Column(
         children: [
@@ -925,7 +1062,7 @@ class _TicketDetailScreen extends StatelessWidget {
                         borderRadius: BorderRadius.circular(4),
                       ),
                       child: Text(
-                        ticket.type,
+                        _ticket.type,
                         style: TextStyle(
                           color: colorScheme.onPrimaryContainer,
                           fontSize: 12,
@@ -948,7 +1085,7 @@ class _TicketDetailScreen extends StatelessWidget {
                         mainAxisSize: MainAxisSize.min,
                         children: [
                           Icon(
-                            ticket.status.toLowerCase() == 'open'
+                            _ticket.status.toLowerCase() == 'open'
                                 ? Icons.circle
                                 : Icons.check_circle,
                             color: statusColor,
@@ -956,7 +1093,7 @@ class _TicketDetailScreen extends StatelessWidget {
                           ),
                           const SizedBox(width: 4),
                           Text(
-                            ticket.status,
+                            _ticket.status,
                             style: TextStyle(
                               color: statusColor,
                               fontSize: 12,
@@ -968,7 +1105,69 @@ class _TicketDetailScreen extends StatelessWidget {
                     ),
                   ],
                 ),
-                if (ticket.initialMessage != null) ...[
+                // Show reopen count badge if ticket has been reopened
+                if (_ticket.isClosed && _ticket.reopenCount > 0) ...[
+                  const SizedBox(height: 8),
+                  Container(
+                    padding: const EdgeInsets.symmetric(
+                        horizontal: 8, vertical: 4),
+                    decoration: BoxDecoration(
+                      color: Colors.orange[50],
+                      borderRadius: BorderRadius.circular(4),
+                      border: Border.all(color: Colors.orange[300]!),
+                    ),
+                    child: Row(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        Icon(
+                          Icons.info_outline,
+                          size: 14,
+                          color: Colors.orange[700],
+                        ),
+                        const SizedBox(width: 4),
+                        Text(
+                          'Reopened ${_ticket.reopenCount}/3 times',
+                          style: TextStyle(
+                            fontSize: 12,
+                            color: Colors.orange[900],
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ],
+                // Show limit reached warning
+                if (_ticket.isClosed && _ticket.reopenCount >= 3) ...[
+                  const SizedBox(height: 8),
+                  Container(
+                    padding: const EdgeInsets.symmetric(
+                        horizontal: 8, vertical: 4),
+                    decoration: BoxDecoration(
+                      color: Colors.red[50],
+                      borderRadius: BorderRadius.circular(4),
+                      border: Border.all(color: Colors.red[300]!),
+                    ),
+                    child: Row(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        Icon(
+                          Icons.warning_amber,
+                          size: 14,
+                          color: Colors.red[700],
+                        ),
+                        const SizedBox(width: 4),
+                        Text(
+                          'Reopen limit reached (3/3)',
+                          style: TextStyle(
+                            fontSize: 12,
+                            color: Colors.red[900],
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ],
+                if (_ticket.initialMessage != null) ...[
                   const SizedBox(height: 12),
                   ExpansionTile(
                     tilePadding: EdgeInsets.zero,
@@ -984,7 +1183,7 @@ class _TicketDetailScreen extends StatelessWidget {
                         const SizedBox(width: 8),
                         Expanded(
                           child: Text(
-                            _extractSubject(ticket.initialMessage!),
+                            _extractSubject(_ticket.initialMessage!),
                             style: theme.textTheme.titleMedium?.copyWith(
                               fontWeight: FontWeight.bold,
                             ),
@@ -1006,7 +1205,7 @@ class _TicketDetailScreen extends StatelessWidget {
                           ),
                         ),
                         child: Text(
-                          _extractDescription(ticket.initialMessage!),
+                          _extractDescription(_ticket.initialMessage!),
                           style: theme.textTheme.bodyMedium?.copyWith(
                             color: colorScheme.onSurfaceVariant,
                           ),
@@ -1015,26 +1214,6 @@ class _TicketDetailScreen extends StatelessWidget {
                     ],
                   ),
                 ],
-                if (ticket.assignedToName != null) ...[
-                  const SizedBox(height: 12),
-                  Row(
-                    children: [
-                      Icon(
-                        Icons.person,
-                        size: 16,
-                        color: colorScheme.onSurfaceVariant,
-                      ),
-                      const SizedBox(width: 6),
-                      Text(
-                        'Assigned to: ${ticket.assignedToName}',
-                        style: TextStyle(
-                          fontSize: 13,
-                          color: colorScheme.onSurfaceVariant,
-                        ),
-                      ),
-                    ],
-                  ),
-                ],
               ],
             ),
           ),
@@ -1044,7 +1223,7 @@ class _TicketDetailScreen extends StatelessWidget {
           // Chat widget (full screen mode)
           Expanded(
             child: TicketChatWidget(
-              ticket: ticket,
+              ticket: _ticket,
               isFullScreen: true,
             ),
           ),
@@ -1066,3 +1245,47 @@ class _TicketDetailScreen extends StatelessWidget {
     return descMatch?.group(1)?.trim() ?? '';
   }
 }
+
+// Old duplicate removed below (was causing the error)
+
+// Close Message Dialog
+class _CloseMessageDialog extends StatelessWidget {
+  final TextEditingController _controller = TextEditingController();
+
+  _CloseMessageDialog();
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      title: const Text('Close Ticket'),
+      content: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          const Text('Add an optional closing message:'),
+          const SizedBox(height: 16),
+          TextField(
+            controller: _controller,
+            decoration: const InputDecoration(
+              hintText:
+                  'e.g., Issue resolved, let me know if you need more help.',
+              border: OutlineInputBorder(),
+            ),
+            maxLines: 3,
+            maxLength: 500,
+            autofocus: true,
+          ),
+        ],
+      ),
+      actions: [
+        TextButton(
+          onPressed: () => Navigator.pop(context),
+          child: const Text('Cancel'),
+        ),
+        FilledButton(
+          onPressed: () => Navigator.pop(context, _controller.text),
+          child: const Text('Close Ticket'),
+        ),
+      ],
+    );
+  }
+}
diff --git a/create_notification_icon.sh b/scripts/create_notification_icon.sh
similarity index 100%
rename from create_notification_icon.sh
rename to scripts/create_notification_icon.sh
diff --git a/generate_adaptive_icons.sh b/scripts/generate_adaptive_icons.sh
similarity index 100%
rename from generate_adaptive_icons.sh
rename to scripts/generate_adaptive_icons.sh
diff --git a/spa_server.py b/scripts/spa_server.py
similarity index 100%
rename from spa_server.py
rename to scripts/spa_server.py
diff --git a/test/widget_test.dart b/test/widget_test.dart
deleted file mode 100644
index ec0e6c1..0000000
--- a/test/widget_test.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// Basic test file for HazeBot Admin
-// Add your widget tests here
-
-import 'package:flutter_test/flutter_test.dart';
-
-void main() {
-  test('Placeholder test', () {
-    // This is a placeholder test to prevent test failures
-    // Add real tests as the app develops
-    expect(1 + 1, equals(2));
-  });
-}