diff --git a/includes/header.php b/includes/header.php
index d1af3ba..9d61826 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -1,4 +1,5 @@
 <?php
+ob_start();
 session_start();
 require_once __DIR__ . '/../db/config.php';
 
diff --git a/login.php b/login.php
index 76f2c06..e5a3138 100644
--- a/login.php
+++ b/login.php
@@ -2,15 +2,11 @@
 require_once __DIR__ . '/includes/header.php';
 
 if (isLoggedIn()) {
-    redirect('index.php');
+    redirect('user_dashboard.php');
 }
 
 $error = '';
 
-// Fetch charity settings
-$stmt = db()->query("SELECT * FROM charity_settings WHERE id = 1");
-$charity = $stmt->fetch();
-
 if ($_SERVER['REQUEST_METHOD'] === 'POST') {
     $username = trim($_POST['username'] ?? '');
     $password = $_POST['password'] ?? '';
@@ -18,63 +14,67 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
     if ($username && $password) {
         $stmt = db()->prepare("SELECT * FROM users WHERE username = ?");
         $stmt->execute([$username]);
-        $user = $stmt->fetch(PDO::FETCH_ASSOC);
+        $user = $stmt->fetch();
 
         if ($user && password_verify($password, $user['password'])) {
             $_SESSION['user_id'] = $user['id'];
             $_SESSION['username'] = $user['username'];
-            $_SESSION['full_name'] = $user['full_name'];
-            $_SESSION['user_role'] = $user['role'];
+            $_SESSION['role'] = $user['role'];
             
-            // Set permissions in session immediately
-            $_SESSION['can_view'] = $user['can_view'] ?? 1;
-            $_SESSION['can_add'] = $user['can_add'] ?? 0;
-            $_SESSION['can_edit'] = $user['can_edit'] ?? 0;
-            $_SESSION['can_delete'] = $user['can_delete'] ?? 0;
-            
-            redirect('index.php');
+            // Redirect to dashboard
+            redirect('user_dashboard.php');
         } else {
-            $error = 'اسم المستخدم أو كلمة المرور غير صحيحة';
+            $error = "اسم المستخدم أو كلمة المرور غير صحيحة";
         }
     } else {
-        $error = 'يرجى إدخال جميع الحقول المطلوبة';
+        $error = "يرجى إدخال اسم المستخدم وكلمة المرور";
     }
 }
 ?>
 
 <div class="row justify-content-center align-items-center" style="min-height: 80vh;">
-    <div class="col-md-4">
-        <div class="card p-4 shadow-sm border-0">
-            <div class="text-center mb-4">
-                <?php if ($charity['charity_logo']): ?>
-                    <img src="<?= htmlspecialchars($charity['charity_logo']) ?>" alt="Logo" class="mb-3" style="max-height: 100px;">
-                <?php endif; ?>
-                <h3 class="fw-bold"><?= htmlspecialchars($charity['charity_name'] ?? 'تسجيل الدخول') ?></h3>
-                <p class="text-muted">نظام المراسلات</p>
-            </div>
-            
-            <?php if ($error): ?>
-                <div class="alert alert-danger text-center"><?= $error ?></div>
-            <?php endif; ?>
+    <div class="col-md-5 col-lg-4">
+        <div class="card shadow-sm border-0">
+            <div class="card-body p-4">
+                <div class="text-center mb-4">
+                    <?php if (!empty($charity['charity_logo'])): ?>
+                        <img src="<?php echo htmlspecialchars($charity['charity_logo']); ?>" alt="Logo" class="img-fluid mb-3" style="max-height: 80px;">
+                    <?php endif; ?>
+                    <h4 class="fw-bold mb-0"><?php echo htmlspecialchars($charity['charity_name'] ?? 'تسجيل الدخول'); ?></h4>
+                    <p class="text-muted small">يرجى إدخال بيانات الاعتماد الخاصة بك</p>
+                </div>
 
-            <form method="POST">
-                <div class="mb-3">
-                    <label for="username" class="form-label">اسم المستخدم</label>
-                    <input type="text" class="form-control" id="username" name="username" required autocomplete="username">
-                </div>
-                <div class="mb-3">
-                    <div class="d-flex justify-content-between">
-                        <label for="password" class="form-label">كلمة المرور</label>
-                        <a href="forgot_password.php" class="text-decoration-none small text-primary">نسيت كلمة المرور؟</a>
+                <?php if ($error): ?>
+                    <div class="alert alert-danger py-2 small" role="alert">
+                        <?php echo $error; ?>
                     </div>
-                    <input type="password" class="form-control" id="password" name="password" required autocomplete="current-password">
-                </div>
-                <div class="d-grid mt-4">
-                    <button type="submit" class="btn btn-dark btn-lg">دخول</button>
-                </div>
-            </form>
+                <?php endif; ?>
+
+                <form method="POST" action="">
+                    <div class="mb-3">
+                        <label for="username" class="form-label small fw-semibold">اسم المستخدم</label>
+                        <input type="text" class="form-control" id="username" name="username" required tabindex="1" autofocus>
+                    </div>
+                    
+                    <div class="mb-2">
+                        <div class="d-flex justify-content-between align-items-center mb-1">
+                            <label for="password" class="form-label small fw-semibold mb-0">كلمة المرور</label>
+                            <a href="forgot_password.php" class="text-decoration-none small text-primary" tabindex="4">نسيت كلمة المرور؟</a>
+                        </div>
+                        <input type="password" class="form-control" id="password" name="password" required tabindex="2">
+                    </div>
+
+                    <div class="mt-4">
+                        <button type="submit" class="btn btn-primary w-100 fw-bold py-2" tabindex="3">تسجيل الدخول</button>
+                    </div>
+                </form>
+            </div>
+        </div>
+        
+        <div class="text-center mt-3 text-muted small">
+            &copy; <?php echo date('Y'); ?> <?php echo htmlspecialchars($charity['charity_name'] ?? ''); ?>. جميع الحقوق محفوظة.
         </div>
     </div>
 </div>
 
-<?php require_once __DIR__ . '/includes/footer.php'; ?>
+<?php require_once __DIR__ . '/includes/footer.php'; ?>
\ No newline at end of file