diff --git a/.github/workflows/.gitkeep b/.github/workflows/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..04552d7
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,44 @@
+name: Build
+
+on:
+  push:
+    branches: [main, khesir/dev]
+  pull_request:
+    branches: [main]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build-android:
+    name: Build Android
+    runs-on: ubuntu-latest
+    environment: production
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version: '3.35.4'
+          channel: 'stable'
+          cache: true
+
+      - name: Get dependencies
+        run: flutter pub get
+
+      - name: Build APK
+        run: |
+          flutter build apk --release \
+            --dart-define="PROD=true" \
+            --dart-define="SUPABASE_URL=${{ secrets.SUPABASE_URL }}" \
+            --dart-define="SUPABASE_ANON_KEY=${{ secrets.SUPABASE_ANON_KEY }}" \
+            --dart-define="GOOGLE_WEB_CLIENT_ID=${{ secrets.GOOGLE_WEB_CLIENT_ID }}"
+
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..8f9027f
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,102 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build-android:
+    name: Build Android
+    runs-on: ubuntu-latest
+    environment: production
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version: '3.35.4'
+          channel: 'stable'
+          cache: true
+
+      - name: Get dependencies
+        run: flutter pub get
+
+      - name: Extract version from tag
+        id: version
+        run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
+
+      - name: Build APK
+        run: |
+          flutter build apk --release \
+            --dart-define="PROD=true" \
+            --dart-define="SUPABASE_URL=${{ secrets.SUPABASE_URL }}" \
+            --dart-define="SUPABASE_ANON_KEY=${{ secrets.SUPABASE_ANON_KEY }}" \
+            --dart-define="GOOGLE_WEB_CLIENT_ID=${{ secrets.GOOGLE_WEB_CLIENT_ID }}"
+
+      - name: Build App Bundle
+        run: |
+          flutter build appbundle --release \
+            --dart-define="PROD=true" \
+            --dart-define="SUPABASE_URL=${{ secrets.SUPABASE_URL }}" \
+            --dart-define="SUPABASE_ANON_KEY=${{ secrets.SUPABASE_ANON_KEY }}" \
+            --dart-define="GOOGLE_WEB_CLIENT_ID=${{ secrets.GOOGLE_WEB_CLIENT_ID }}"
+
+      - name: Rename artifacts
+        run: |
+          mv build/app/outputs/flutter-apk/app-release.apk build/app/outputs/flutter-apk/KeepTrack-${{ steps.version.outputs.VERSION }}.apk
+          mv build/app/outputs/bundle/release/app-release.aab build/app/outputs/bundle/release/KeepTrack-${{ steps.version.outputs.VERSION }}.aab
+
+      - name: Upload APK artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: android-apk
+          path: build/app/outputs/flutter-apk/KeepTrack-${{ steps.version.outputs.VERSION }}.apk
+
+      - name: Upload AAB artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: android-aab
+          path: build/app/outputs/bundle/release/KeepTrack-${{ steps.version.outputs.VERSION }}.aab
+
+  create-release:
+    name: Create GitHub Release
+    runs-on: ubuntu-latest
+    needs: [build-android]
+    permissions:
+      contents: write
+    steps:
+      - name: Extract version from tag
+        id: version
+        run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
+
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: artifacts
+
+      - name: Display downloaded files
+        run: ls -R artifacts
+
+      - name: Create Release
+        uses: softprops/action-gh-release@v2
+        with:
+          name: Keep Track v${{ steps.version.outputs.VERSION }}
+          draft: true
+          generate_release_notes: true
+          files: |
+            artifacts/android-apk/*.apk
+            artifacts/android-aab/*.aab
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 4848f9f..c878bb7 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -11,6 +11,7 @@ android {
     ndkVersion = flutter.ndkVersion
 
     compileOptions {
+        isCoreLibraryDesugaringEnabled = true
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
@@ -42,3 +43,7 @@ android {
 flutter {
     source = "../.."
 }
+
+dependencies {
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
+}
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index afd79b7..f5b0b31 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -3,6 +3,12 @@
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
+    <!-- Notifications -->
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
+    <uses-permission android:name="android.permission.VIBRATE"/>
+
     <application
         android:label="Keep Track"
         android:name="${applicationName}"
@@ -34,6 +40,19 @@
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
+
+        <!-- Boot receiver for rescheduling notifications after device restart -->
+        <receiver android:exported="false" android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationBootReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
+                <action android:name="android.intent.action.QUICKBOOT_POWERON" />
+                <action android:name="com.htc.intent.action.QUICKBOOT_POWERON"/>
+            </intent-filter>
+        </receiver>
+
+        <!-- Notification receiver -->
+        <receiver android:exported="false" android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationReceiver" />
     </application>
     <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility and
diff --git a/installers/desktop_inno_script.iss b/installers/desktop_inno_script.iss
index 7ef6daf..cf91428 100644
--- a/installers/desktop_inno_script.iss
+++ b/installers/desktop_inno_script.iss
@@ -2,16 +2,16 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 ; Non-commercial use only
 
-#define MyAppName "Keep Track"
-#define MyAppVersion "7.3"
+#define MyAppName "KeepTrack"
+#define MyAppVersion "0.7.4"
 #define MyAppPublisher "Khesir"
-#define MyAppURL "https://khesir.com"
+#define MyAppURL "https://keep-track.khesir.com/"
 #define MyAppExeName "keep_track.exe"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{A1C21F3D-EFFE-4448-B387-C9D8414C7960}
+AppId={{A8947B06-4B99-45BB-8600-8A7D4B7D06D1}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
 ;AppVerName={#MyAppName} {#MyAppVersion}
@@ -33,10 +33,10 @@ DisableProgramGroupPage=yes
 ; Uncomment the following line to run in non administrative install mode (install for current user only).
 ;PrivilegesRequired=lowest
 OutputDir=C:\Users\ajriz\Documents\Projects\Personal-Codex\personal_codex\installers
-OutputBaseFilename=KeepTrack-v.7.3
+OutputBaseFilename=KeepTrack-v0.7.4
 SetupIconFile=C:\Users\ajriz\Documents\Projects\Personal-Codex\personal_codex\app_icon.ico
 SolidCompression=yes
-WizardStyle=modern
+WizardStyle=modern dynamic
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -46,9 +46,10 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 
 [Files]
 Source: "C:\Users\ajriz\Documents\Projects\Personal-Codex\personal_codex\build\windows\x64\runner\Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Users\ajriz\Documents\Projects\Personal-Codex\personal_codex\build\windows\x64\runner\Release\url_launcher_windows_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\ajriz\Documents\Projects\Personal-Codex\personal_codex\build\windows\x64\runner\Release\app_links_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\ajriz\Documents\Projects\Personal-Codex\personal_codex\build\windows\x64\runner\Release\flutter_windows.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\ajriz\Documents\Projects\Personal-Codex\personal_codex\build\windows\x64\runner\Release\permission_handler_windows_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\ajriz\Documents\Projects\Personal-Codex\personal_codex\build\windows\x64\runner\Release\url_launcher_windows_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\ajriz\Documents\Projects\Personal-Codex\personal_codex\build\windows\x64\runner\Release\data\*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 9e259f9..e7edb37 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -45,5 +45,10 @@
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>fetch</string>
+		<string>remote-notification</string>
+	</array>
 </dict>
 </plist>
diff --git a/landing/.vitepress/theme/components/DownloadButtons.vue b/landing/.vitepress/theme/components/DownloadButtons.vue
index c847066..6f5f2a3 100644
--- a/landing/.vitepress/theme/components/DownloadButtons.vue
+++ b/landing/.vitepress/theme/components/DownloadButtons.vue
@@ -11,7 +11,7 @@
         target="_blank"
         rel="noopener noreferrer"
       >
-        <span class="download-icon">{{ getIcon(asset.name) }}</span>
+        <span class="download-icon" v-html="getIcon(asset.name)"></span>
         <span>{{ getLabel(asset.name) }}</span>
         <span class="size">{{ formatSize(asset.size) }}</span>
       </a>
@@ -81,9 +81,13 @@ onMounted(async () => {
 })
 
 function getIcon(filename: string): string {
-  if (filename.includes('windows') || filename.endsWith('.exe')) return '🪟'
-  if (filename.includes('android') || filename.endsWith('.apk')) return '🤖'
-  return '📦'
+  if (filename.includes('windows') || filename.endsWith('.exe')) {
+    return '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor"><path d="M0 3.449L9.75 2.1v9.451H0m10.949-9.602L24 0v11.4H10.949M0 12.6h9.75v9.451L0 20.699M10.949 12.6H24V24l-12.9-1.801"/></svg>'
+  }
+  if (filename.includes('android') || filename.endsWith('.apk')) {
+    return '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor"><path d="M17.523 15.341c-.5 0-.91-.41-.91-.91s.41-.91.91-.91.91.41.91.91-.41.91-.91.91m-11.046 0c-.5 0-.91-.41-.91-.91s.41-.91.91-.91.91.41.91.91-.41.91-.91.91m11.4-6.044l1.994-3.455a.416.416 0 00-.152-.567.416.416 0 00-.568.152L17.12 8.93c-1.54-.7-3.27-1.09-5.12-1.09s-3.58.39-5.12 1.09L4.85 5.427a.416.416 0 00-.568-.152.416.416 0 00-.152.567l1.994 3.455C2.64 11.185 0 14.613 0 18.545h24c0-3.932-2.64-7.36-6.123-9.248"/></svg>'
+  }
+  return '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor"><path d="M20 6h-8l-2-2H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2z"/></svg>'
 }
 
 function getLabel(filename: string): string {
@@ -121,4 +125,14 @@ function formatSize(bytes: number): string {
   opacity: 0.8;
   font-weight: 400;
 }
+
+.download-icon {
+  display: flex;
+  align-items: center;
+}
+
+.download-icon :deep(svg) {
+  width: 24px;
+  height: 24px;
+}
 </style>
diff --git a/landing/docs/index.md b/landing/docs/index.md
index b9d0a3c..9aec7a6 100644
--- a/landing/docs/index.md
+++ b/landing/docs/index.md
@@ -26,10 +26,10 @@ Personal Codex is a comprehensive desktop application designed to help you manag
 - Focus sessions with automatic breaks
 - Statistics and insights
 
-### 🌙 Modern Interface
-- Beautiful, clean design
-- Full dark mode support
-- Responsive layout for all screen sizes
+### 🔔 Mobile Notifications
+- Push notifications on Android and iOS
+- Task deadline reminders
+- Payment and finance alerts
 
 ### 🔐 Secure & Private
 - Supabase authentication
diff --git a/landing/index.md b/landing/index.md
index a72cad0..f653fc5 100644
--- a/landing/index.md
+++ b/landing/index.md
@@ -4,7 +4,10 @@ layout: home
 hero:
   name: Keep Track
   tagline: Your all-in-one personal management system
-  text: Organize your life with powerful task management, comprehensive finance tracking, and productivity tools - all in one beautiful app.
+  text: Manage tasks, track finances, and boost productivity — all in one app.
+  image:
+    src: /app_icon.png
+    alt: Keep Track App
   actions:
     - theme: brand
       text: Download Now
@@ -26,10 +29,6 @@ features:
     title: Pomodoro Timer
     details: Boost your productivity with built-in Pomodoro timer. Focus on your work with timed sessions and automatic break reminders.
 
-  - icon: 📊
-    title: Beautiful Dashboard
-    details: Get insights at a glance with our modern, clean dashboard. Track your tasks, finances, and productivity in real-time.
-
   - icon: 🌙
     title: Dark Mode
     details: Easy on the eyes with full dark mode support. Switch between light and dark themes seamlessly across all screens.
@@ -46,6 +45,10 @@ features:
     title: Modern Design
     details: Built with Flutter and Material Design 3. Beautiful, responsive, and intuitive interface inspired by modern design principles.
 
+  - icon: 🔔
+    title: Mobile Notifications
+    details: Stay on top of your tasks and finances with push notifications on Android and iOS. Never miss a deadline or payment reminder.
+
   - icon: 🚀
     title: Regular Updates
     details: Constantly improving with new features and bug fixes. Check out our GitHub releases for the latest updates.
diff --git a/landing/public/app_icon.png b/landing/public/app_icon.png
new file mode 100644
index 0000000..a8c96c6
Binary files /dev/null and b/landing/public/app_icon.png differ
diff --git a/lib/core/config/app_info.dart b/lib/core/config/app_info.dart
new file mode 100644
index 0000000..a4b107c
--- /dev/null
+++ b/lib/core/config/app_info.dart
@@ -0,0 +1,24 @@
+/// Application information and configuration
+class AppInfo {
+  AppInfo._();
+
+  /// GitHub repository owner
+  static const String gitHubOwner = 'khesir';
+
+  /// GitHub repository name
+  static const String gitHubRepo = 'KeepTrack';
+
+  /// Full GitHub repository path
+  static String get gitHubRepoPath => '$gitHubOwner/$gitHubRepo';
+
+  /// Primary download URL for app updates
+  static const String downloadUrl = 'https://keep-track.khesir.com/download';
+
+  /// GitHub releases URL (fallback)
+  static String get releasesUrl =>
+      'https://github.com/$gitHubOwner/$gitHubRepo/releases';
+
+  /// GitHub API URL for latest release
+  static String get latestReleaseApiUrl =>
+      'https://api.github.com/repos/$gitHubOwner/$gitHubRepo/releases/latest';
+}
diff --git a/lib/core/migrations/migration_manager.dart b/lib/core/migrations/migration_manager.dart
index 1da742d..5af30a1 100644
--- a/lib/core/migrations/migration_manager.dart
+++ b/lib/core/migrations/migration_manager.dart
@@ -43,6 +43,12 @@ import 'migrations/039_create_pomodoro_sessions_table.dart';
 import 'migrations/040_add_pomodoro_session_pause_and_project.dart';
 import 'migrations/041_cleanup_stale_pomodoro_sessions.dart';
 import 'migrations/042_add_pomodoro_session_title.dart';
+import 'migrations/043_create_buckets_table.dart';
+import 'migrations/044_add_bucket_id_to_task_and_project.dart';
+import 'migrations/045_add_pomodoro_stopwatch_type.dart';
+import 'migrations/046_add_debt_monthly_payment_fields.dart';
+import 'migrations/047_add_goal_fee_fields.dart';
+import 'migrations/048_add_fee_to_payment_rpcs.dart';
 
 /// Manages database migrations
 ///
@@ -297,6 +303,12 @@ class MigrationManager {
     Migration040AddPomodoroSessionPauseAndProject(),
     Migration041CleanupStalePomodoroSessions(),
     Migration042AddPomodoroSessionTitle(),
+    Migration043CreateBucketsTable(),
+    Migration044AddBucketIdToTaskAndProject(),
+    Migration045AddPomodoroStopwatchType(),
+    Migration046AddDebtMonthlyPaymentFields(),
+    Migration047AddGoalFeeFields(),
+    Migration048AddFeeToPaymentRpcs(),
     // Add new migrations here:
   ];
 
diff --git a/lib/core/migrations/migrations/043_create_buckets_table.dart b/lib/core/migrations/migrations/043_create_buckets_table.dart
new file mode 100644
index 0000000..239f0d2
--- /dev/null
+++ b/lib/core/migrations/migrations/043_create_buckets_table.dart
@@ -0,0 +1,109 @@
+import 'package:supabase_flutter/supabase_flutter.dart';
+import 'package:keep_track/core/logging/app_logger.dart';
+import '../migration.dart';
+
+/// Creates buckets table for task categorization
+class Migration043CreateBucketsTable extends Migration {
+  @override
+  String get version => '043_create_buckets_table';
+
+  @override
+  String get description => 'Create buckets table for task categorization';
+
+  @override
+  Future<void> up(SupabaseClient client) async {
+    AppLogger.info('  🪣 Creating buckets table...');
+
+    final sql = '''
+      -- Create buckets table
+      CREATE TABLE IF NOT EXISTS buckets (
+        id UUID DEFAULT gen_random_uuid() PRIMARY KEY,
+        name TEXT NOT NULL,
+        is_archive BOOLEAN DEFAULT FALSE NOT NULL,
+        user_id UUID REFERENCES auth.users(id) ON DELETE CASCADE,
+        created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+        updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+        
+        -- Constraints
+        CONSTRAINT buckets_name_user_id_unique UNIQUE(name, user_id),
+        CONSTRAINT buckets_name_not_empty CHECK (length(trim(name)) > 0),
+        CONSTRAINT buckets_name_length CHECK (length(name) <= 100)
+      );
+
+      -- Add indexes for performance
+      CREATE INDEX IF NOT EXISTS idx_buckets_user_id ON buckets(user_id);
+      CREATE INDEX IF NOT EXISTS idx_buckets_is_archive ON buckets(is_archive);
+      CREATE INDEX IF NOT EXISTS idx_buckets_user_id_archive ON buckets(user_id, is_archive);
+
+      -- Add RLS policies
+      ALTER TABLE buckets ENABLE ROW LEVEL SECURITY;
+
+      -- Users can view their own buckets
+      CREATE POLICY "Users can view own buckets" ON buckets
+        FOR SELECT USING (auth.uid() = user_id);
+
+      -- Users can insert their own buckets
+      CREATE POLICY "Users can insert own buckets" ON buckets
+        FOR INSERT WITH CHECK (auth.uid() = user_id);
+
+      -- Users can update their own buckets
+      CREATE POLICY "Users can update own buckets" ON buckets
+        FOR UPDATE USING (auth.uid() = user_id);
+
+      -- Users can delete their own buckets
+      CREATE POLICY "Users can delete own buckets" ON buckets
+        FOR DELETE USING (auth.uid() = user_id);
+
+      -- Trigger to update updated_at timestamp
+      CREATE OR REPLACE FUNCTION update_buckets_updated_at()
+        RETURNS TRIGGER AS \$\$
+        BEGIN
+          NEW.updated_at = CURRENT_TIMESTAMP;
+          RETURN NEW;
+        END;
+        \$\$ LANGUAGE plpgsql;
+
+      CREATE TRIGGER buckets_updated_at
+        BEFORE UPDATE ON buckets
+        FOR EACH ROW
+        EXECUTE FUNCTION update_buckets_updated_at();
+    ''';
+
+    try {
+      await client.rpc('exec_sql', params: {'sql': sql});
+      AppLogger.info('  ✅ Successfully created buckets table');
+    } catch (e, stackTrace) {
+      AppLogger.error('  ❌ Failed to create buckets table', e, stackTrace);
+      rethrow;
+    }
+  }
+
+  @override
+  Future<void> down(SupabaseClient client) async {
+    AppLogger.info('  🗑️ Dropping buckets table...');
+
+    final sql = '''
+      -- Drop trigger
+      DROP TRIGGER IF EXISTS buckets_updated_at ON buckets;
+      
+      -- Drop function
+      DROP FUNCTION IF EXISTS update_buckets_updated_at();
+      
+      -- Drop indexes
+      DROP INDEX IF EXISTS idx_buckets_user_id;
+      DROP INDEX IF EXISTS idx_buckets_is_archive;
+      DROP INDEX IF EXISTS idx_buckets_user_id_archive;
+      
+      -- Drop table
+      DROP TABLE IF EXISTS buckets;
+    ''';
+
+    try {
+      await client.rpc('exec_sql', params: {'sql': sql});
+      AppLogger.info('  ✅ Successfully dropped buckets table');
+    } catch (e, stackTrace) {
+      AppLogger.error('  ❌ Failed to drop buckets table', e, stackTrace);
+      rethrow;
+    }
+  }
+}
\ No newline at end of file
diff --git a/lib/core/migrations/migrations/044_add_bucket_id_to_task_and_project.dart b/lib/core/migrations/migrations/044_add_bucket_id_to_task_and_project.dart
new file mode 100644
index 0000000..bf86fad
--- /dev/null
+++ b/lib/core/migrations/migrations/044_add_bucket_id_to_task_and_project.dart
@@ -0,0 +1,68 @@
+import 'package:supabase_flutter/supabase_flutter.dart';
+import 'package:keep_track/core/logging/app_logger.dart';
+import '../migration.dart';
+
+/// Adds bucket_id foreign key to tasks and projects tables
+class Migration044AddBucketIdToTaskAndProject extends Migration {
+  @override
+  String get version => '044_add_bucket_id_to_task_and_project';
+
+  @override
+  String get description => 'Add bucket_id foreign key to tasks and projects tables';
+
+  @override
+  Future<void> up(SupabaseClient client) async {
+    AppLogger.info('  🔗 Adding bucket_id to tasks and projects tables...');
+
+    final sql = '''
+      -- Add bucket_id column to tasks table
+      ALTER TABLE tasks 
+      ADD COLUMN IF NOT EXISTS bucket_id UUID REFERENCES buckets(id) ON DELETE SET NULL;
+      
+      -- Add bucket_id column to projects table  
+      ALTER TABLE projects 
+      ADD COLUMN IF NOT EXISTS bucket_id UUID REFERENCES buckets(id) ON DELETE SET NULL;
+      
+      -- Add indexes for bucket_id columns for better query performance
+      CREATE INDEX IF NOT EXISTS idx_tasks_bucket_id ON tasks(bucket_id);
+      CREATE INDEX IF NOT EXISTS idx_projects_bucket_id ON projects(bucket_id);
+      
+      -- Add composite indexes for common queries
+      CREATE INDEX IF NOT EXISTS idx_tasks_bucket_id_status ON tasks(bucket_id, status);
+      CREATE INDEX IF NOT EXISTS idx_projects_bucket_id_archived ON projects(bucket_id, is_archived);
+    ''';
+
+    try {
+      await client.rpc('exec_sql', params: {'sql': sql});
+      AppLogger.info('  ✅ Successfully added bucket_id to tasks and projects tables');
+    } catch (e, stackTrace) {
+      AppLogger.error('  ❌ Failed to add bucket_id to tables', e, stackTrace);
+      rethrow;
+    }
+  }
+
+  @override
+  Future<void> down(SupabaseClient client) async {
+    AppLogger.info('  🗑️ Removing bucket_id from tasks and projects tables...');
+
+    final sql = '''
+      -- Drop indexes
+      DROP INDEX IF EXISTS idx_tasks_bucket_id;
+      DROP INDEX IF EXISTS idx_projects_bucket_id;
+      DROP INDEX IF EXISTS idx_tasks_bucket_id_status;
+      DROP INDEX IF EXISTS idx_projects_bucket_id_archived;
+      
+      -- Remove bucket_id columns
+      ALTER TABLE tasks DROP COLUMN IF EXISTS bucket_id;
+      ALTER TABLE projects DROP COLUMN IF EXISTS bucket_id;
+    ''';
+
+    try {
+      await client.rpc('exec_sql', params: {'sql': sql});
+      AppLogger.info('  ✅ Successfully removed bucket_id from tasks and projects tables');
+    } catch (e, stackTrace) {
+      AppLogger.error('  ❌ Failed to remove bucket_id from tables', e, stackTrace);
+      rethrow;
+    }
+  }
+}
\ No newline at end of file
diff --git a/lib/core/migrations/migrations/045_add_pomodoro_stopwatch_type.dart b/lib/core/migrations/migrations/045_add_pomodoro_stopwatch_type.dart
new file mode 100644
index 0000000..50123c4
--- /dev/null
+++ b/lib/core/migrations/migrations/045_add_pomodoro_stopwatch_type.dart
@@ -0,0 +1,60 @@
+import 'package:supabase_flutter/supabase_flutter.dart';
+import 'package:keep_track/core/logging/app_logger.dart';
+import '../migration.dart';
+
+/// Adds 'stopwatch' to the allowed pomodoro session types
+class Migration045AddPomodoroStopwatchType extends Migration {
+  @override
+  String get version => '045_add_pomodoro_stopwatch_type';
+
+  @override
+  String get description => 'Add stopwatch type to pomodoro_sessions table';
+
+  @override
+  Future<void> up(SupabaseClient client) async {
+    AppLogger.info('  Updating pomodoro_sessions type constraint...');
+
+    final sql = '''
+      -- Drop the existing check constraint on type column
+      ALTER TABLE pomodoro_sessions
+        DROP CONSTRAINT IF EXISTS pomodoro_sessions_type_check;
+
+      -- Add new check constraint that includes 'stopwatch'
+      ALTER TABLE pomodoro_sessions
+        ADD CONSTRAINT pomodoro_sessions_type_check
+        CHECK (type IN ('pomodoro', 'short', 'long', 'stopwatch'));
+    ''';
+
+    try {
+      await client.rpc('exec_sql', params: {'sql': sql});
+      AppLogger.info('  Added stopwatch type to pomodoro_sessions');
+    } catch (e, stackTrace) {
+      AppLogger.error('  Failed to update type constraint', e, stackTrace);
+      rethrow;
+    }
+  }
+
+  @override
+  Future<void> down(SupabaseClient client) async {
+    AppLogger.info('  Reverting pomodoro_sessions type constraint...');
+
+    final sql = '''
+      -- Drop the constraint with stopwatch
+      ALTER TABLE pomodoro_sessions
+        DROP CONSTRAINT IF EXISTS pomodoro_sessions_type_check;
+
+      -- Restore original constraint (without stopwatch)
+      ALTER TABLE pomodoro_sessions
+        ADD CONSTRAINT pomodoro_sessions_type_check
+        CHECK (type IN ('pomodoro', 'short', 'long'));
+    ''';
+
+    try {
+      await client.rpc('exec_sql', params: {'sql': sql});
+      AppLogger.info('  Reverted type constraint');
+    } catch (e, stackTrace) {
+      AppLogger.error('  Failed to revert type constraint', e, stackTrace);
+      rethrow;
+    }
+  }
+}
diff --git a/lib/core/migrations/migrations/046_add_debt_monthly_payment_fields.dart b/lib/core/migrations/migrations/046_add_debt_monthly_payment_fields.dart
new file mode 100644
index 0000000..65cb50f
--- /dev/null
+++ b/lib/core/migrations/migrations/046_add_debt_monthly_payment_fields.dart
@@ -0,0 +1,91 @@
+import 'package:supabase_flutter/supabase_flutter.dart';
+import 'package:keep_track/core/logging/app_logger.dart';
+import '../migration.dart';
+
+/// Adds monthly payment tracking fields to debts table
+class Migration046AddDebtMonthlyPaymentFields extends Migration {
+  @override
+  String get version => '046_add_debt_monthly_payment_fields';
+
+  @override
+  String get description =>
+      'Add monthly payment amount, fee, next payment date, and payment frequency to debts';
+
+  @override
+  Future<void> up(SupabaseClient client) async {
+    AppLogger.info('  Adding monthly payment fields to debts table...');
+
+    final sql = '''
+      -- Add monthly payment amount field
+      ALTER TABLE debts
+        ADD COLUMN IF NOT EXISTS monthly_payment_amount DECIMAL(12,2) DEFAULT 0;
+
+      -- Add fee amount field
+      ALTER TABLE debts
+        ADD COLUMN IF NOT EXISTS fee_amount DECIMAL(12,2) DEFAULT 0;
+
+      -- Add next payment date field
+      ALTER TABLE debts
+        ADD COLUMN IF NOT EXISTS next_payment_date TIMESTAMP WITH TIME ZONE;
+
+      -- Add payment frequency field with check constraint
+      ALTER TABLE debts
+        ADD COLUMN IF NOT EXISTS payment_frequency TEXT DEFAULT 'monthly';
+
+      -- Add check constraint for payment frequency values
+      DO \$\$
+      BEGIN
+        IF NOT EXISTS (
+          SELECT 1 FROM pg_constraint
+          WHERE conname = 'debts_payment_frequency_check'
+        ) THEN
+          ALTER TABLE debts
+            ADD CONSTRAINT debts_payment_frequency_check
+            CHECK (payment_frequency IN ('weekly', 'biweekly', 'monthly', 'quarterly'));
+        END IF;
+      END \$\$;
+    ''';
+
+    try {
+      await client.rpc('exec_sql', params: {'sql': sql});
+      AppLogger.info('  Added monthly payment fields to debts table');
+    } catch (e, stackTrace) {
+      AppLogger.error(
+        '  Failed to add monthly payment fields to debts',
+        e,
+        stackTrace,
+      );
+      rethrow;
+    }
+  }
+
+  @override
+  Future<void> down(SupabaseClient client) async {
+    AppLogger.info('  Removing monthly payment fields from debts table...');
+
+    final sql = '''
+      -- Remove check constraint
+      ALTER TABLE debts
+        DROP CONSTRAINT IF EXISTS debts_payment_frequency_check;
+
+      -- Remove columns
+      ALTER TABLE debts
+        DROP COLUMN IF EXISTS monthly_payment_amount,
+        DROP COLUMN IF EXISTS fee_amount,
+        DROP COLUMN IF EXISTS next_payment_date,
+        DROP COLUMN IF EXISTS payment_frequency;
+    ''';
+
+    try {
+      await client.rpc('exec_sql', params: {'sql': sql});
+      AppLogger.info('  Removed monthly payment fields from debts table');
+    } catch (e, stackTrace) {
+      AppLogger.error(
+        '  Failed to remove monthly payment fields from debts',
+        e,
+        stackTrace,
+      );
+      rethrow;
+    }
+  }
+}
diff --git a/lib/core/migrations/migrations/047_add_goal_fee_fields.dart b/lib/core/migrations/migrations/047_add_goal_fee_fields.dart
new file mode 100644
index 0000000..57809be
--- /dev/null
+++ b/lib/core/migrations/migrations/047_add_goal_fee_fields.dart
@@ -0,0 +1,87 @@
+import 'package:supabase_flutter/supabase_flutter.dart';
+import 'package:keep_track/core/logging/app_logger.dart';
+import '../migration.dart';
+
+/// Adds management and withdrawal fee percentage fields to goals table
+class Migration047AddGoalFeeFields extends Migration {
+  @override
+  String get version => '047_add_goal_fee_fields';
+
+  @override
+  String get description =>
+      'Add management fee percent and withdrawal fee percent to goals';
+
+  @override
+  Future<void> up(SupabaseClient client) async {
+    AppLogger.info('  Adding fee fields to goals table...');
+
+    final sql = '''
+      -- Add management fee percent field (0-100)
+      ALTER TABLE goals
+        ADD COLUMN IF NOT EXISTS management_fee_percent DECIMAL(5,2) DEFAULT 0;
+
+      -- Add withdrawal fee percent field (0-100)
+      ALTER TABLE goals
+        ADD COLUMN IF NOT EXISTS withdrawal_fee_percent DECIMAL(5,2) DEFAULT 0;
+
+      -- Add check constraints for fee percentages
+      DO \$\$
+      BEGIN
+        IF NOT EXISTS (
+          SELECT 1 FROM pg_constraint
+          WHERE conname = 'goals_management_fee_percent_check'
+        ) THEN
+          ALTER TABLE goals
+            ADD CONSTRAINT goals_management_fee_percent_check
+            CHECK (management_fee_percent >= 0 AND management_fee_percent <= 100);
+        END IF;
+
+        IF NOT EXISTS (
+          SELECT 1 FROM pg_constraint
+          WHERE conname = 'goals_withdrawal_fee_percent_check'
+        ) THEN
+          ALTER TABLE goals
+            ADD CONSTRAINT goals_withdrawal_fee_percent_check
+            CHECK (withdrawal_fee_percent >= 0 AND withdrawal_fee_percent <= 100);
+        END IF;
+      END \$\$;
+    ''';
+
+    try {
+      await client.rpc('exec_sql', params: {'sql': sql});
+      AppLogger.info('  Added fee fields to goals table');
+    } catch (e, stackTrace) {
+      AppLogger.error('  Failed to add fee fields to goals', e, stackTrace);
+      rethrow;
+    }
+  }
+
+  @override
+  Future<void> down(SupabaseClient client) async {
+    AppLogger.info('  Removing fee fields from goals table...');
+
+    final sql = '''
+      -- Remove check constraints
+      ALTER TABLE goals
+        DROP CONSTRAINT IF EXISTS goals_management_fee_percent_check,
+        DROP CONSTRAINT IF EXISTS goals_withdrawal_fee_percent_check;
+
+      -- Remove columns
+      ALTER TABLE goals
+        DROP COLUMN IF EXISTS management_fee_percent,
+        DROP COLUMN IF EXISTS withdrawal_fee_percent;
+    ''';
+
+    try {
+      await client.rpc('exec_sql', params: {'sql': sql});
+      AppLogger.info('  Removed fee fields from goals table');
+    } catch (e, stackTrace) {
+      AppLogger.error(
+        '  Failed to remove fee fields from goals',
+        e,
+        stackTrace,
+      );
+      rethrow;
+    }
+  }
+}
diff --git a/lib/core/migrations/migrations/048_add_fee_to_payment_rpcs.dart b/lib/core/migrations/migrations/048_add_fee_to_payment_rpcs.dart
new file mode 100644
index 0000000..2e912ce
--- /dev/null
+++ b/lib/core/migrations/migrations/048_add_fee_to_payment_rpcs.dart
@@ -0,0 +1,248 @@
+import 'package:supabase_flutter/supabase_flutter.dart';
+import 'package:keep_track/core/logging/app_logger.dart';
+import '../migration.dart';
+
+/// Adds optional fee parameter to goal and debt payment RPC functions
+class Migration048AddFeeToPaymentRpcs extends Migration {
+  @override
+  String get version => '048_add_fee_to_payment_rpcs';
+
+  @override
+  String get description =>
+      'Add optional fee parameter to create_goal_payment_transaction and create_debt_payment_transaction';
+
+  @override
+  Future<void> up(SupabaseClient client) async {
+    AppLogger.info('  Updating payment RPC functions with fee support...');
+
+    final sql = '''
+-- Drop existing functions first to avoid overload conflicts
+DROP FUNCTION IF EXISTS create_goal_payment_transaction(UUID, UUID, UUID, DECIMAL, transaction_type, TEXT, TIMESTAMP WITH TIME ZONE, TEXT, UUID);
+DROP FUNCTION IF EXISTS create_debt_payment_transaction(UUID, UUID, UUID, DECIMAL, transaction_type, TEXT, TIMESTAMP WITH TIME ZONE, TEXT, UUID);
+
+-- ============================================================
+-- RPC Function: create_goal_payment_transaction (updated with fee)
+-- ============================================================
+CREATE OR REPLACE FUNCTION create_goal_payment_transaction(
+  p_user_id UUID,
+  p_account_id UUID,
+  p_finance_category_id UUID,
+  p_amount DECIMAL,
+  p_type transaction_type,
+  p_description TEXT,
+  p_date TIMESTAMP WITH TIME ZONE,
+  p_notes TEXT,
+  p_goal_id UUID,
+  p_fee DECIMAL DEFAULT 0
+)
+RETURNS JSONB
+LANGUAGE plpgsql
+SECURITY DEFINER
+AS \$\$
+DECLARE
+  v_transaction_id UUID;
+  v_goal_target DECIMAL;
+  v_goal_current DECIMAL;
+  v_new_current DECIMAL;
+  v_new_status TEXT;
+  v_total_deduction DECIMAL;
+  v_result JSONB;
+BEGIN
+  -- Get goal details
+  SELECT target_amount, current_amount
+  INTO v_goal_target, v_goal_current
+  FROM goals
+  WHERE id = p_goal_id AND user_id = p_user_id;
+
+  IF NOT FOUND THEN
+    RAISE EXCEPTION 'Goal not found or access denied';
+  END IF;
+
+  -- Calculate new goal amount
+  v_new_current := v_goal_current + p_amount;
+
+  -- Calculate total deduction from account (amount + fee)
+  v_total_deduction := p_amount + COALESCE(p_fee, 0);
+
+  -- Determine new status
+  IF v_new_current >= v_goal_target THEN
+    v_new_status := 'completed';
+  ELSE
+    v_new_status := (SELECT status FROM goals WHERE id = p_goal_id);
+  END IF;
+
+  -- Insert transaction with goal link and fee
+  INSERT INTO transactions (
+    id, user_id, account_id, finance_category_id,
+    amount, type, description, date, notes,
+    goal_id, fee, created_at, updated_at
+  )
+  VALUES (
+    gen_random_uuid(), p_user_id, p_account_id, p_finance_category_id,
+    p_amount, p_type, p_description, COALESCE(p_date, NOW()), p_notes,
+    p_goal_id, COALESCE(p_fee, 0), NOW(), NOW()
+  )
+  RETURNING id INTO v_transaction_id;
+
+  -- Update goal progress
+  UPDATE goals
+  SET
+    current_amount = v_new_current,
+    status = v_new_status,
+    completed_at = CASE
+      WHEN v_new_status = 'completed' THEN NOW()
+      ELSE completed_at
+    END,
+    updated_at = NOW()
+  WHERE id = p_goal_id;
+
+  -- Update account balance (deduct amount + fee for expenses)
+  UPDATE accounts
+  SET
+    balance = CASE
+      WHEN p_type = 'income' THEN balance + p_amount
+      WHEN p_type = 'expense' THEN balance - v_total_deduction
+      ELSE balance
+    END,
+    updated_at = NOW()
+  WHERE id = p_account_id;
+
+  -- Return result with transaction details
+  SELECT jsonb_build_object(
+    'transaction_id', v_transaction_id,
+    'goal_id', p_goal_id,
+    'new_goal_amount', v_new_current,
+    'goal_status', v_new_status,
+    'fee', COALESCE(p_fee, 0),
+    'success', true
+  ) INTO v_result;
+
+  RETURN v_result;
+END;
+\$\$;
+
+-- ============================================================
+-- RPC Function: create_debt_payment_transaction (updated with fee)
+-- ============================================================
+CREATE OR REPLACE FUNCTION create_debt_payment_transaction(
+  p_user_id UUID,
+  p_account_id UUID,
+  p_finance_category_id UUID,
+  p_amount DECIMAL,
+  p_type transaction_type,
+  p_description TEXT,
+  p_date TIMESTAMP WITH TIME ZONE,
+  p_notes TEXT,
+  p_debt_id UUID,
+  p_fee DECIMAL DEFAULT 0
+)
+RETURNS JSONB
+LANGUAGE plpgsql
+SECURITY DEFINER
+AS \$\$
+DECLARE
+  v_transaction_id UUID;
+  v_debt_remaining DECIMAL;
+  v_new_remaining DECIMAL;
+  v_new_status TEXT;
+  v_total_amount DECIMAL;
+  v_result JSONB;
+BEGIN
+  -- Get debt details
+  SELECT remaining_amount
+  INTO v_debt_remaining
+  FROM debts
+  WHERE id = p_debt_id AND user_id = p_user_id;
+
+  IF NOT FOUND THEN
+    RAISE EXCEPTION 'Debt not found or access denied';
+  END IF;
+
+  -- Calculate new remaining amount
+  v_new_remaining := GREATEST(v_debt_remaining - p_amount, 0);
+
+  -- Calculate total amount including fee
+  v_total_amount := p_amount + COALESCE(p_fee, 0);
+
+  -- Determine new status
+  IF v_new_remaining <= 0 THEN
+    v_new_status := 'settled';
+  ELSE
+    v_new_status := (SELECT status FROM debts WHERE id = p_debt_id);
+  END IF;
+
+  -- Insert transaction with debt link and fee
+  INSERT INTO transactions (
+    id, user_id, account_id, finance_category_id,
+    amount, type, description, date, notes,
+    debt_id, fee, created_at, updated_at
+  )
+  VALUES (
+    gen_random_uuid(), p_user_id, p_account_id, p_finance_category_id,
+    p_amount, p_type, p_description, COALESCE(p_date, NOW()), p_notes,
+    p_debt_id, COALESCE(p_fee, 0), NOW(), NOW()
+  )
+  RETURNING id INTO v_transaction_id;
+
+  -- Update debt
+  UPDATE debts
+  SET
+    remaining_amount = v_new_remaining,
+    status = v_new_status,
+    settled_at = CASE
+      WHEN v_new_status = 'settled' THEN NOW()
+      ELSE settled_at
+    END,
+    updated_at = NOW()
+  WHERE id = p_debt_id;
+
+  -- Update account balance (include fee in the total)
+  UPDATE accounts
+  SET
+    balance = CASE
+      WHEN p_type = 'income' THEN balance + p_amount
+      WHEN p_type = 'expense' THEN balance - v_total_amount
+      ELSE balance
+    END,
+    updated_at = NOW()
+  WHERE id = p_account_id;
+
+  -- Return result
+  SELECT jsonb_build_object(
+    'transaction_id', v_transaction_id,
+    'debt_id', p_debt_id,
+    'new_remaining_amount', v_new_remaining,
+    'debt_status', v_new_status,
+    'fee', COALESCE(p_fee, 0),
+    'success', true
+  ) INTO v_result;
+
+  RETURN v_result;
+END;
+\$\$;
+
+-- Grant execute permissions
+GRANT EXECUTE ON FUNCTION create_goal_payment_transaction TO authenticated;
+GRANT EXECUTE ON FUNCTION create_debt_payment_transaction TO authenticated;
+    ''';
+
+    try {
+      await client.rpc('exec_sql', params: {'sql': sql});
+      AppLogger.info('  Added fee support to payment RPC functions');
+    } catch (e, stackTrace) {
+      AppLogger.error(
+        '  Failed to add fee support to payment RPCs',
+        e,
+        stackTrace,
+      );
+      rethrow;
+    }
+  }
+
+  @override
+  Future<void> down(SupabaseClient client) async {
+    // Reverting would restore the original functions without fee parameter
+    // This is handled by re-running migration 020
+    AppLogger.info('  Rollback not implemented - run migration 020 to restore');
+  }
+}
diff --git a/lib/core/routing/app_router.dart b/lib/core/routing/app_router.dart
index c19c766..2d7c3a7 100644
--- a/lib/core/routing/app_router.dart
+++ b/lib/core/routing/app_router.dart
@@ -9,6 +9,7 @@ import 'package:keep_track/features/module_selection/task_module_screen.dart';
 import 'package:keep_track/features/settings/setting_page.dart';
 import 'package:keep_track/features/settings/subpages/app_configuration_finance_page.dart';
 import 'package:keep_track/features/settings/subpages/app_configuration_task_page.dart';
+import 'package:keep_track/features/tasks/presentation/screens/configuration/bucket_management_screen.dart';
 import 'package:keep_track/features/tasks/presentation/screens/configuration/project_management_screen.dart';
 import 'package:keep_track/features/tasks/presentation/screens/configuration/task_management_screen.dart';
 import 'package:keep_track/features/tasks/presentation/screens/tabs/task/create_task_page.dart';
@@ -16,6 +17,8 @@ import 'package:keep_track/features/tasks/presentation/screens/create_project_pa
 import '../../features/finance/modules/budget/domain/entities/budget.dart';
 import '../../features/finance/modules/transaction/domain/entities/transaction.dart';
 import '../../features/finance/presentation/screens/configuration/accounts/account_management.dart';
+import '../../features/finance/presentation/screens/account_details_screen.dart';
+import '../../features/finance/modules/account/domain/entities/account.dart';
 import '../../features/finance/presentation/screens/configuration/budgets/budget_management_screen.dart';
 import '../../features/finance/presentation/screens/configuration/budgets/create_budget_screen.dart';
 import '../../features/finance/presentation/screens/configuration/budgets/budget_detail_screen.dart';
@@ -66,9 +69,11 @@ class AppRoutes {
   // Task Management Settings
   static const String taskManagement = '/task-management';
   static const String projectManagement = '/project-management';
+  static const String bucketManagement = '/bucket-management';
 
   // Finance Management
   static const String accountManagement = '/account-management';
+  static const String accountDetail = '/account-detail';
   static const String categoryManagement = '/category-management';
   static const String budgetManagement = '/budget-management';
   static const String goalsManagement = '/goals-management';
@@ -125,6 +130,11 @@ class AppRouter {
           builder: (_) => const ProjectManagementScreen(),
           settings: settings,
         );
+      case AppRoutes.bucketManagement:
+        return MaterialPageRoute(
+          builder: (_) => const BucketManagementScreen(),
+          settings: settings,
+        );
 
       case AppRoutes.projectDetail:
         final project = settings.arguments as Project?;
@@ -207,6 +217,17 @@ class AppRouter {
           builder: (_) => const AccountManagementScreen(),
           settings: settings,
         );
+      case AppRoutes.accountDetail:
+        final account = settings.arguments as Account?;
+        if (account == null) {
+          return MaterialPageRoute(
+            builder: (_) => UnknownRouteScreen(routeName: settings.name ?? ''),
+          );
+        }
+        return MaterialPageRoute(
+          builder: (_) => AccountDetailsScreen(account: account),
+          settings: settings,
+        );
       case AppRoutes.categoryManagement:
         return MaterialPageRoute(
           builder: (_) => const CategoryManagementScreen(),
diff --git a/lib/core/services/notification/notification_ids.dart b/lib/core/services/notification/notification_ids.dart
new file mode 100644
index 0000000..9d38f37
--- /dev/null
+++ b/lib/core/services/notification/notification_ids.dart
@@ -0,0 +1,39 @@
+/// Notification ID constants for the app
+/// Fixed IDs for recurring notifications, dynamic IDs for task-specific notifications
+class NotificationIds {
+  NotificationIds._();
+
+  /// Fixed ID for daily finance reminder
+  static const int financeReminder = 1;
+
+  /// Fixed ID for morning task reminder
+  static const int taskMorning = 2;
+
+  /// Fixed ID for evening task reminder
+  static const int taskEvening = 3;
+
+  /// Generate a unique ID for task due notifications
+  /// Uses hash of task ID to create consistent IDs for the same task
+  static int taskDueNotification(String taskId) {
+    // Range: 1000 to 10999 (10000 possible IDs)
+    return 1000 + (taskId.hashCode.abs() % 10000);
+  }
+
+  /// Generate a unique ID for planned payment due notifications
+  /// [paymentId] - The planned payment ID
+  /// [daysBefore] - Days before due (1, 2, or 3)
+  /// Range: 20000 to 49999
+  static int plannedPaymentDueNotification(String paymentId, int daysBefore) {
+    final baseId = 20000 + (paymentId.hashCode.abs() % 10000);
+    return baseId + (daysBefore * 10000);
+  }
+
+  /// Generate a unique ID for debt due notifications
+  /// [debtId] - The debt ID
+  /// [daysBefore] - Days before due (1, 2, or 3)
+  /// Range: 50000 to 79999
+  static int debtDueNotification(String debtId, int daysBefore) {
+    final baseId = 50000 + (debtId.hashCode.abs() % 10000);
+    return baseId + (daysBefore * 10000);
+  }
+}
diff --git a/lib/core/services/notification/notification_scheduler.dart b/lib/core/services/notification/notification_scheduler.dart
new file mode 100644
index 0000000..e3e8dd8
--- /dev/null
+++ b/lib/core/services/notification/notification_scheduler.dart
@@ -0,0 +1,333 @@
+import 'package:flutter/material.dart';
+import 'package:keep_track/core/logging/app_logger.dart';
+import 'package:keep_track/core/services/notification/notification_ids.dart';
+import 'package:keep_track/core/services/notification/notification_service.dart';
+
+/// Scheduler for managing different notification types
+/// Provides high-level scheduling methods for finance and task reminders
+class NotificationScheduler {
+  final NotificationService _service;
+
+  NotificationScheduler(this._service);
+
+  /// Check if scheduler can schedule notifications
+  bool get canSchedule => _service.isInitialized;
+
+  // ============================================
+  // Finance Reminders
+  // ============================================
+
+  /// Schedule daily finance tracking reminder
+  Future<void> scheduleDailyFinanceReminder({
+    required TimeOfDay time,
+  }) async {
+    if (!canSchedule) {
+      AppLogger.warning('NotificationScheduler: Cannot schedule - service not initialized');
+      return;
+    }
+
+    // Cancel existing finance reminder
+    await _service.cancelNotification(NotificationIds.financeReminder);
+
+    // Schedule new reminder
+    await _service.scheduleDailyNotification(
+      id: NotificationIds.financeReminder,
+      title: 'Track Your Finances',
+      body: 'Take a moment to record today\'s transactions',
+      hour: time.hour,
+      minute: time.minute,
+      channelId: 'finance_reminders',
+      payload: 'finance_reminder',
+    );
+
+    AppLogger.info('NotificationScheduler: Finance reminder scheduled for ${time.hour}:${time.minute}');
+  }
+
+  /// Cancel finance reminder
+  Future<void> cancelFinanceReminder() async {
+    await _service.cancelNotification(NotificationIds.financeReminder);
+  }
+
+  // ============================================
+  // Task Reminders
+  // ============================================
+
+  /// Schedule morning task reminder
+  Future<void> scheduleMorningTaskReminder({
+    required TimeOfDay time,
+  }) async {
+    if (!canSchedule) {
+      AppLogger.warning('NotificationScheduler: Cannot schedule - service not initialized');
+      return;
+    }
+
+    // Cancel existing morning reminder
+    await _service.cancelNotification(NotificationIds.taskMorning);
+
+    // Schedule new reminder
+    await _service.scheduleDailyNotification(
+      id: NotificationIds.taskMorning,
+      title: 'Good Morning!',
+      body: 'Check your tasks for today',
+      hour: time.hour,
+      minute: time.minute,
+      channelId: 'task_reminders',
+      payload: 'task_morning',
+    );
+
+    AppLogger.info('NotificationScheduler: Morning reminder scheduled for ${time.hour}:${time.minute}');
+  }
+
+  /// Schedule evening task reminder
+  Future<void> scheduleEveningTaskReminder({
+    required TimeOfDay time,
+  }) async {
+    if (!canSchedule) {
+      AppLogger.warning('NotificationScheduler: Cannot schedule - service not initialized');
+      return;
+    }
+
+    // Cancel existing evening reminder
+    await _service.cancelNotification(NotificationIds.taskEvening);
+
+    // Schedule new reminder
+    await _service.scheduleDailyNotification(
+      id: NotificationIds.taskEvening,
+      title: 'Evening Check-in',
+      body: 'Review your progress and plan for tomorrow',
+      hour: time.hour,
+      minute: time.minute,
+      channelId: 'task_reminders',
+      payload: 'task_evening',
+    );
+
+    AppLogger.info('NotificationScheduler: Evening reminder scheduled for ${time.hour}:${time.minute}');
+  }
+
+  /// Cancel morning task reminder
+  Future<void> cancelMorningTaskReminder() async {
+    await _service.cancelNotification(NotificationIds.taskMorning);
+  }
+
+  /// Cancel evening task reminder
+  Future<void> cancelEveningTaskReminder() async {
+    await _service.cancelNotification(NotificationIds.taskEvening);
+  }
+
+  // ============================================
+  // Task Due Notifications
+  // ============================================
+
+  /// Schedule a task due notification
+  /// [taskId] - Unique task identifier
+  /// [title] - Task title for the notification
+  /// [dueDate] - When the task is due
+  /// [reminderBefore] - How long before the due date to send the notification
+  Future<void> scheduleTaskDueNotification({
+    required String taskId,
+    required String title,
+    required DateTime dueDate,
+    required Duration reminderBefore,
+  }) async {
+    if (!canSchedule) {
+      AppLogger.warning('NotificationScheduler: Cannot schedule - service not initialized');
+      return;
+    }
+
+    final notificationId = NotificationIds.taskDueNotification(taskId);
+    final scheduledTime = dueDate.subtract(reminderBefore);
+
+    // Don't schedule if the reminder time is in the past
+    if (scheduledTime.isBefore(DateTime.now())) {
+      AppLogger.info('NotificationScheduler: Skipping past task reminder for "$title"');
+      return;
+    }
+
+    // Cancel existing notification for this task
+    await _service.cancelNotification(notificationId);
+
+    // Schedule the notification
+    await _service.scheduleNotification(
+      id: notificationId,
+      title: 'Task Due Soon',
+      body: title,
+      scheduledTime: scheduledTime,
+      channelId: 'task_reminders',
+      payload: 'task_due:$taskId',
+    );
+
+    AppLogger.info('NotificationScheduler: Task due notification scheduled for "$title" at $scheduledTime');
+  }
+
+  /// Cancel a task due notification
+  Future<void> cancelTaskDueNotification(String taskId) async {
+    final notificationId = NotificationIds.taskDueNotification(taskId);
+    await _service.cancelNotification(notificationId);
+    AppLogger.info('NotificationScheduler: Task due notification cancelled for task $taskId');
+  }
+
+  // ============================================
+  // Payment Due Notifications
+  // ============================================
+
+  /// Schedule payment due notifications (3 days, 2 days, 1 day before)
+  /// [paymentId] - Unique payment identifier
+  /// [name] - Payment name for the notification
+  /// [amount] - Payment amount to display
+  /// [dueDate] - When the payment is due
+  /// [notifyDaysBefore] - List of days before to notify (default: [3, 2, 1])
+  /// [notifyHour] - Hour to send notification (default: 9 AM)
+  Future<void> schedulePaymentDueNotifications({
+    required String paymentId,
+    required String name,
+    required double amount,
+    required DateTime dueDate,
+    List<int> notifyDaysBefore = const [3, 2, 1],
+    int notifyHour = 9,
+  }) async {
+    if (!canSchedule) {
+      AppLogger.warning('NotificationScheduler: Cannot schedule - service not initialized');
+      return;
+    }
+
+    for (final daysBefore in notifyDaysBefore) {
+      final notificationId = NotificationIds.plannedPaymentDueNotification(paymentId, daysBefore);
+      final scheduledDate = DateTime(
+        dueDate.year,
+        dueDate.month,
+        dueDate.day - daysBefore,
+        notifyHour,
+        0,
+      );
+
+      // Skip if the scheduled time is in the past
+      if (scheduledDate.isBefore(DateTime.now())) {
+        continue;
+      }
+
+      final daysText = daysBefore == 1 ? 'tomorrow' : 'in $daysBefore days';
+
+      await _service.scheduleNotification(
+        id: notificationId,
+        title: 'Payment Due $daysText',
+        body: '$name - \$${amount.toStringAsFixed(2)}',
+        scheduledTime: scheduledDate,
+        channelId: 'payment_reminders',
+        payload: 'payment_due:$paymentId',
+      );
+    }
+
+    AppLogger.info('NotificationScheduler: Payment notifications scheduled for "$name"');
+  }
+
+  /// Cancel all payment due notifications for a specific payment
+  Future<void> cancelPaymentDueNotifications(String paymentId) async {
+    for (final daysBefore in [1, 2, 3]) {
+      final notificationId = NotificationIds.plannedPaymentDueNotification(paymentId, daysBefore);
+      await _service.cancelNotification(notificationId);
+    }
+    AppLogger.info('NotificationScheduler: Payment notifications cancelled for $paymentId');
+  }
+
+  // ============================================
+  // Debt Due Notifications
+  // ============================================
+
+  /// Schedule debt due notifications (3 days, 2 days, 1 day before)
+  /// [debtId] - Unique debt identifier
+  /// [personName] - Person name for the notification
+  /// [amount] - Remaining debt amount to display
+  /// [dueDate] - When the debt is due
+  /// [notifyDaysBefore] - List of days before to notify (default: [3, 2, 1])
+  /// [notifyHour] - Hour to send notification (default: 9 AM)
+  Future<void> scheduleDebtDueNotifications({
+    required String debtId,
+    required String personName,
+    required double amount,
+    required DateTime dueDate,
+    List<int> notifyDaysBefore = const [3, 2, 1],
+    int notifyHour = 9,
+  }) async {
+    if (!canSchedule) {
+      AppLogger.warning('NotificationScheduler: Cannot schedule - service not initialized');
+      return;
+    }
+
+    for (final daysBefore in notifyDaysBefore) {
+      final notificationId = NotificationIds.debtDueNotification(debtId, daysBefore);
+      final scheduledDate = DateTime(
+        dueDate.year,
+        dueDate.month,
+        dueDate.day - daysBefore,
+        notifyHour,
+        0,
+      );
+
+      // Skip if the scheduled time is in the past
+      if (scheduledDate.isBefore(DateTime.now())) {
+        continue;
+      }
+
+      final daysText = daysBefore == 1 ? 'tomorrow' : 'in $daysBefore days';
+
+      await _service.scheduleNotification(
+        id: notificationId,
+        title: 'Debt Due $daysText',
+        body: '$personName - \$${amount.toStringAsFixed(2)} remaining',
+        scheduledTime: scheduledDate,
+        channelId: 'payment_reminders',
+        payload: 'debt_due:$debtId',
+      );
+    }
+
+    AppLogger.info('NotificationScheduler: Debt notifications scheduled for "$personName"');
+  }
+
+  /// Cancel all debt due notifications for a specific debt
+  Future<void> cancelDebtDueNotifications(String debtId) async {
+    for (final daysBefore in [1, 2, 3]) {
+      final notificationId = NotificationIds.debtDueNotification(debtId, daysBefore);
+      await _service.cancelNotification(notificationId);
+    }
+    AppLogger.info('NotificationScheduler: Debt notifications cancelled for $debtId');
+  }
+
+  // ============================================
+  // Utility Methods
+  // ============================================
+
+  /// Cancel all scheduled notifications
+  Future<void> cancelAllNotifications() async {
+    await _service.cancelAllNotifications();
+  }
+
+  /// Reschedule all daily reminders based on settings
+  Future<void> rescheduleAllDailyReminders({
+    bool financeEnabled = false,
+    TimeOfDay? financeTime,
+    bool morningEnabled = false,
+    TimeOfDay? morningTime,
+    bool eveningEnabled = false,
+    TimeOfDay? eveningTime,
+  }) async {
+    // Cancel all daily reminders first
+    await cancelFinanceReminder();
+    await cancelMorningTaskReminder();
+    await cancelEveningTaskReminder();
+
+    // Reschedule if enabled
+    if (financeEnabled && financeTime != null) {
+      await scheduleDailyFinanceReminder(time: financeTime);
+    }
+
+    if (morningEnabled && morningTime != null) {
+      await scheduleMorningTaskReminder(time: morningTime);
+    }
+
+    if (eveningEnabled && eveningTime != null) {
+      await scheduleEveningTaskReminder(time: eveningTime);
+    }
+
+    AppLogger.info('NotificationScheduler: All daily reminders rescheduled');
+  }
+}
diff --git a/lib/core/services/notification/notification_service.dart b/lib/core/services/notification/notification_service.dart
new file mode 100644
index 0000000..21ed52c
--- /dev/null
+++ b/lib/core/services/notification/notification_service.dart
@@ -0,0 +1,321 @@
+import 'dart:io' show Platform;
+import 'package:flutter/foundation.dart' show kIsWeb;
+import 'package:flutter_local_notifications/flutter_local_notifications.dart';
+import 'package:timezone/timezone.dart' as tz;
+import 'package:timezone/data/latest_all.dart' as tz_data;
+import 'package:keep_track/core/logging/app_logger.dart';
+
+/// Core notification service for handling local notifications
+/// Only initializes on mobile platforms (Android/iOS)
+class NotificationService {
+  NotificationService._();
+
+  static final NotificationService _instance = NotificationService._();
+  static NotificationService get instance => _instance;
+
+  FlutterLocalNotificationsPlugin? _plugin;
+  bool _initialized = false;
+
+  /// Check if the current platform supports notifications
+  bool get isSupportedPlatform {
+    if (kIsWeb) return false;
+    return Platform.isAndroid || Platform.isIOS;
+  }
+
+  /// Check if the service is initialized
+  bool get isInitialized => _initialized;
+
+  /// Get the notification plugin (only available on mobile)
+  FlutterLocalNotificationsPlugin? get plugin => _plugin;
+
+  /// Initialize the notification service
+  /// Safe to call on any platform - will no-op on unsupported platforms
+  Future<bool> initialize() async {
+    if (!isSupportedPlatform) {
+      AppLogger.info('NotificationService: Platform not supported, skipping initialization');
+      return false;
+    }
+
+    if (_initialized) {
+      AppLogger.info('NotificationService: Already initialized');
+      return true;
+    }
+
+    try {
+      // Initialize timezone database
+      tz_data.initializeTimeZones();
+      final localTimezone = DateTime.now().timeZoneName;
+      AppLogger.info('NotificationService: Timezone initialized - $localTimezone');
+
+      // Create plugin instance
+      _plugin = FlutterLocalNotificationsPlugin();
+
+      // Android initialization settings
+      const androidSettings = AndroidInitializationSettings('@mipmap/ic_launcher');
+
+      // iOS initialization settings
+      const iosSettings = DarwinInitializationSettings(
+        requestAlertPermission: false,
+        requestBadgePermission: false,
+        requestSoundPermission: false,
+      );
+
+      const initSettings = InitializationSettings(
+        android: androidSettings,
+        iOS: iosSettings,
+      );
+
+      // Initialize the plugin
+      final success = await _plugin!.initialize(
+        initSettings,
+        onDidReceiveNotificationResponse: _onNotificationTapped,
+      );
+
+      if (success == true) {
+        _initialized = true;
+        AppLogger.info('NotificationService: Initialized successfully');
+
+        // Create notification channels for Android
+        await _createNotificationChannels();
+
+        return true;
+      } else {
+        AppLogger.warning('NotificationService: Initialization returned false');
+        return false;
+      }
+    } catch (e, stackTrace) {
+      AppLogger.error('NotificationService: Initialization failed', e, stackTrace);
+      return false;
+    }
+  }
+
+  /// Handle notification tap
+  void _onNotificationTapped(NotificationResponse response) {
+    AppLogger.info('NotificationService: Notification tapped - ${response.payload}');
+    // TODO: Handle navigation based on payload if needed
+  }
+
+  /// Create Android notification channels
+  Future<void> _createNotificationChannels() async {
+    if (!Platform.isAndroid || _plugin == null) return;
+
+    final androidPlugin = _plugin!.resolvePlatformSpecificImplementation<
+        AndroidFlutterLocalNotificationsPlugin>();
+
+    if (androidPlugin == null) return;
+
+    // Finance reminders channel
+    await androidPlugin.createNotificationChannel(
+      const AndroidNotificationChannel(
+        'finance_reminders',
+        'Finance Reminders',
+        description: 'Daily reminders to track your finances',
+        importance: Importance.defaultImportance,
+      ),
+    );
+
+    // Task reminders channel (high priority)
+    await androidPlugin.createNotificationChannel(
+      const AndroidNotificationChannel(
+        'task_reminders',
+        'Task Reminders',
+        description: 'Reminders for your tasks and deadlines',
+        importance: Importance.high,
+      ),
+    );
+
+    // Payment reminders channel (high priority)
+    await androidPlugin.createNotificationChannel(
+      const AndroidNotificationChannel(
+        'payment_reminders',
+        'Payment Reminders',
+        description: 'Reminders for upcoming payments and debt due dates',
+        importance: Importance.high,
+      ),
+    );
+
+    AppLogger.info('NotificationService: Notification channels created');
+  }
+
+  /// Show an immediate notification
+  Future<void> showNotification({
+    required int id,
+    required String title,
+    required String body,
+    String? payload,
+    String channelId = 'task_reminders',
+  }) async {
+    if (!_initialized || _plugin == null) {
+      AppLogger.warning('NotificationService: Cannot show notification - not initialized');
+      return;
+    }
+
+    final androidDetails = AndroidNotificationDetails(
+      channelId,
+      _getChannelName(channelId),
+      importance: _isHighPriorityChannel(channelId) ? Importance.high : Importance.defaultImportance,
+      priority: _isHighPriorityChannel(channelId) ? Priority.high : Priority.defaultPriority,
+    );
+
+    const iosDetails = DarwinNotificationDetails(
+      presentAlert: true,
+      presentBadge: true,
+      presentSound: true,
+    );
+
+    final details = NotificationDetails(
+      android: androidDetails,
+      iOS: iosDetails,
+    );
+
+    await _plugin!.show(id, title, body, details, payload: payload);
+    AppLogger.info('NotificationService: Notification shown - $title');
+  }
+
+  String _getChannelName(String channelId) {
+    switch (channelId) {
+      case 'finance_reminders':
+        return 'Finance Reminders';
+      case 'task_reminders':
+        return 'Task Reminders';
+      case 'payment_reminders':
+        return 'Payment Reminders';
+      default:
+        return 'Reminders';
+    }
+  }
+
+  bool _isHighPriorityChannel(String channelId) {
+    return channelId == 'task_reminders' || channelId == 'payment_reminders';
+  }
+
+  /// Schedule a notification at a specific time
+  Future<void> scheduleNotification({
+    required int id,
+    required String title,
+    required String body,
+    required DateTime scheduledTime,
+    String? payload,
+    String channelId = 'task_reminders',
+  }) async {
+    if (!_initialized || _plugin == null) {
+      AppLogger.warning('NotificationService: Cannot schedule notification - not initialized');
+      return;
+    }
+
+    // Don't schedule notifications in the past
+    if (scheduledTime.isBefore(DateTime.now())) {
+      AppLogger.warning('NotificationService: Skipping past notification - $title at $scheduledTime');
+      return;
+    }
+
+    final androidDetails = AndroidNotificationDetails(
+      channelId,
+      _getChannelName(channelId),
+      importance: _isHighPriorityChannel(channelId) ? Importance.high : Importance.defaultImportance,
+      priority: _isHighPriorityChannel(channelId) ? Priority.high : Priority.defaultPriority,
+    );
+
+    const iosDetails = DarwinNotificationDetails(
+      presentAlert: true,
+      presentBadge: true,
+      presentSound: true,
+    );
+
+    final details = NotificationDetails(
+      android: androidDetails,
+      iOS: iosDetails,
+    );
+
+    await _plugin!.zonedSchedule(
+      id,
+      title,
+      body,
+      tz.TZDateTime.from(scheduledTime, tz.local),
+      details,
+      androidScheduleMode: AndroidScheduleMode.exactAllowWhileIdle,
+      uiLocalNotificationDateInterpretation:
+          UILocalNotificationDateInterpretation.absoluteTime,
+      payload: payload,
+    );
+
+    AppLogger.info('NotificationService: Notification scheduled - $title at $scheduledTime');
+  }
+
+  /// Schedule a daily repeating notification
+  Future<void> scheduleDailyNotification({
+    required int id,
+    required String title,
+    required String body,
+    required int hour,
+    required int minute,
+    String? payload,
+    String channelId = 'task_reminders',
+  }) async {
+    if (!_initialized || _plugin == null) {
+      AppLogger.warning('NotificationService: Cannot schedule daily notification - not initialized');
+      return;
+    }
+
+    final androidDetails = AndroidNotificationDetails(
+      channelId,
+      _getChannelName(channelId),
+      importance: _isHighPriorityChannel(channelId) ? Importance.high : Importance.defaultImportance,
+      priority: _isHighPriorityChannel(channelId) ? Priority.high : Priority.defaultPriority,
+    );
+
+    const iosDetails = DarwinNotificationDetails(
+      presentAlert: true,
+      presentBadge: true,
+      presentSound: true,
+    );
+
+    final details = NotificationDetails(
+      android: androidDetails,
+      iOS: iosDetails,
+    );
+
+    await _plugin!.zonedSchedule(
+      id,
+      title,
+      body,
+      _nextInstanceOfTime(hour, minute),
+      details,
+      androidScheduleMode: AndroidScheduleMode.exactAllowWhileIdle,
+      uiLocalNotificationDateInterpretation:
+          UILocalNotificationDateInterpretation.absoluteTime,
+      matchDateTimeComponents: DateTimeComponents.time,
+      payload: payload,
+    );
+
+    AppLogger.info('NotificationService: Daily notification scheduled - $title at $hour:$minute');
+  }
+
+  /// Get the next instance of a specific time
+  tz.TZDateTime _nextInstanceOfTime(int hour, int minute) {
+    final now = tz.TZDateTime.now(tz.local);
+    var scheduledDate = tz.TZDateTime(tz.local, now.year, now.month, now.day, hour, minute);
+
+    if (scheduledDate.isBefore(now)) {
+      scheduledDate = scheduledDate.add(const Duration(days: 1));
+    }
+
+    return scheduledDate;
+  }
+
+  /// Cancel a notification by ID
+  Future<void> cancelNotification(int id) async {
+    if (!_initialized || _plugin == null) return;
+
+    await _plugin!.cancel(id);
+    AppLogger.info('NotificationService: Notification cancelled - ID: $id');
+  }
+
+  /// Cancel all notifications
+  Future<void> cancelAllNotifications() async {
+    if (!_initialized || _plugin == null) return;
+
+    await _plugin!.cancelAll();
+    AppLogger.info('NotificationService: All notifications cancelled');
+  }
+}
diff --git a/lib/core/services/notification/platform_notification_helper.dart b/lib/core/services/notification/platform_notification_helper.dart
new file mode 100644
index 0000000..bbbcc68
--- /dev/null
+++ b/lib/core/services/notification/platform_notification_helper.dart
@@ -0,0 +1,77 @@
+import 'dart:io' show Platform;
+import 'package:flutter/foundation.dart' show kIsWeb;
+import 'package:permission_handler/permission_handler.dart';
+import 'package:keep_track/core/logging/app_logger.dart';
+
+/// Helper class for handling notification permissions across platforms
+class PlatformNotificationHelper {
+  PlatformNotificationHelper._();
+
+  static final PlatformNotificationHelper _instance =
+      PlatformNotificationHelper._();
+  static PlatformNotificationHelper get instance => _instance;
+
+  /// Check if the current platform supports notifications
+  bool get isSupportedPlatform {
+    if (kIsWeb) return false;
+    return Platform.isAndroid || Platform.isIOS;
+  }
+
+  /// Request notification permissions
+  /// Returns true if permissions were granted
+  Future<bool> requestPermissions() async {
+    if (!isSupportedPlatform) {
+      AppLogger.info('Notifications: Platform not supported, skipping permission request');
+      return false;
+    }
+
+    try {
+      // Request notification permission (Android 13+ and iOS)
+      final notificationStatus = await Permission.notification.request();
+      AppLogger.info('Notifications: Permission status - $notificationStatus');
+
+      if (notificationStatus.isGranted) {
+        // Also request exact alarm permission on Android for scheduled notifications
+        if (Platform.isAndroid) {
+          final alarmStatus = await Permission.scheduleExactAlarm.request();
+          AppLogger.info('Notifications: Exact alarm permission - $alarmStatus');
+        }
+        return true;
+      }
+
+      if (notificationStatus.isPermanentlyDenied) {
+        AppLogger.warning('Notifications: Permission permanently denied');
+      }
+
+      return false;
+    } catch (e) {
+      AppLogger.error('Notifications: Error requesting permissions', e);
+      return false;
+    }
+  }
+
+  /// Check if notifications are enabled
+  Future<bool> areNotificationsEnabled() async {
+    if (!isSupportedPlatform) return false;
+
+    try {
+      final status = await Permission.notification.status;
+      return status.isGranted;
+    } catch (e) {
+      AppLogger.error('Notifications: Error checking permission status', e);
+      return false;
+    }
+  }
+
+  /// Open app notification settings
+  Future<bool> openNotificationSettings() async {
+    if (!isSupportedPlatform) return false;
+
+    try {
+      return await openAppSettings();
+    } catch (e) {
+      AppLogger.error('Notifications: Error opening settings', e);
+      return false;
+    }
+  }
+}
diff --git a/lib/core/services/version_checker_service.dart b/lib/core/services/version_checker_service.dart
new file mode 100644
index 0000000..52aab01
--- /dev/null
+++ b/lib/core/services/version_checker_service.dart
@@ -0,0 +1,192 @@
+import 'dart:convert';
+import 'package:http/http.dart' as http;
+import 'package:package_info_plus/package_info_plus.dart';
+import 'package:keep_track/core/config/app_info.dart';
+import 'package:keep_track/core/logging/app_logger.dart';
+
+/// Result of a version check
+class VersionCheckResult {
+  final bool updateAvailable;
+  final String currentVersion;
+  final String? latestVersion;
+  final String? releaseUrl;
+  final String? releaseNotes;
+  final String? error;
+
+  const VersionCheckResult({
+    required this.updateAvailable,
+    required this.currentVersion,
+    this.latestVersion,
+    this.releaseUrl,
+    this.releaseNotes,
+    this.error,
+  });
+
+  factory VersionCheckResult.noUpdate(String currentVersion) {
+    return VersionCheckResult(
+      updateAvailable: false,
+      currentVersion: currentVersion,
+    );
+  }
+
+  factory VersionCheckResult.error(String currentVersion, String error) {
+    return VersionCheckResult(
+      updateAvailable: false,
+      currentVersion: currentVersion,
+      error: error,
+    );
+  }
+}
+
+/// Service for checking app version against GitHub releases
+class VersionCheckerService {
+  VersionCheckerService._();
+
+  static final VersionCheckerService _instance = VersionCheckerService._();
+  static VersionCheckerService get instance => _instance;
+
+  /// Check if a newer version is available on GitHub
+  Future<VersionCheckResult> checkForUpdates() async {
+    try {
+      final packageInfo = await PackageInfo.fromPlatform();
+      final currentVersion = packageInfo.version;
+
+      AppLogger.info('Version Check: Current version is $currentVersion');
+
+      final response = await http
+          .get(
+            Uri.parse(AppInfo.latestReleaseApiUrl),
+            headers: {'Accept': 'application/vnd.github.v3+json'},
+          )
+          .timeout(const Duration(seconds: 10));
+
+      if (response.statusCode == 200) {
+        final data = jsonDecode(response.body) as Map<String, dynamic>;
+        final tagName = data['tag_name'] as String?;
+        final htmlUrl = data['html_url'] as String?;
+        final body = data['body'] as String?;
+
+        if (tagName == null) {
+          AppLogger.warning('Version Check: No tag_name in response');
+          return VersionCheckResult.noUpdate(currentVersion);
+        }
+
+        // Remove 'v' prefix if present (e.g., v0.7.4 -> 0.7.4)
+        final latestVersion = tagName.startsWith('v')
+            ? tagName.substring(1)
+            : tagName;
+
+        AppLogger.info('Version Check: Latest version is $latestVersion');
+
+        final isNewer = _isNewerVersion(currentVersion, latestVersion);
+
+        if (isNewer) {
+          AppLogger.info('Version Check: Update available!');
+          return VersionCheckResult(
+            updateAvailable: true,
+            currentVersion: currentVersion,
+            latestVersion: latestVersion,
+            releaseUrl: htmlUrl ?? AppInfo.releasesUrl,
+            releaseNotes: body,
+          );
+        }
+
+        return VersionCheckResult.noUpdate(currentVersion);
+      } else if (response.statusCode == 404) {
+        AppLogger.info('Version Check: No releases found on GitHub');
+        return VersionCheckResult.noUpdate(currentVersion);
+      } else {
+        AppLogger.warning(
+          'Version Check: Failed with status ${response.statusCode}',
+        );
+        return VersionCheckResult.error(
+          currentVersion,
+          'GitHub API returned status ${response.statusCode}',
+        );
+      }
+    } catch (e) {
+      AppLogger.error('Version Check: Error - $e');
+      final packageInfo = await PackageInfo.fromPlatform();
+      return VersionCheckResult.error(
+        packageInfo.version,
+        e.toString(),
+      );
+    }
+  }
+
+  /// Compare two semantic versions
+  /// Returns true if latestVersion is newer than currentVersion
+  bool _isNewerVersion(String current, String latest) {
+    try {
+      // Strip any pre-release or build metadata for comparison
+      // e.g., "0.7.3-alpha.4+38" -> "0.7.3"
+      final currentBase = _extractBaseVersion(current);
+      final latestBase = _extractBaseVersion(latest);
+
+      // Validate that both versions contain only numeric parts
+      final currentParts = _parseVersionParts(currentBase);
+      final latestParts = _parseVersionParts(latestBase);
+
+      if (currentParts == null || latestParts == null) {
+        AppLogger.warning(
+          'Version Check: Cannot compare non-semantic versions: $current vs $latest',
+        );
+        return false;
+      }
+
+      // Pad shorter version with zeros
+      while (currentParts.length < 3) {
+        currentParts.add(0);
+      }
+      while (latestParts.length < 3) {
+        latestParts.add(0);
+      }
+
+      // Compare major.minor.patch
+      for (var i = 0; i < 3; i++) {
+        if (latestParts[i] > currentParts[i]) return true;
+        if (latestParts[i] < currentParts[i]) return false;
+      }
+
+      // Base versions are equal, check pre-release
+      // A release version is newer than a pre-release of the same base
+      final currentHasPreRelease = current.contains('-');
+      final latestHasPreRelease = latest.contains('-');
+
+      if (currentHasPreRelease && !latestHasPreRelease) {
+        // Current is pre-release, latest is stable -> update available
+        return true;
+      }
+
+      return false;
+    } catch (e) {
+      AppLogger.error('Version comparison error: $e');
+      return false;
+    }
+  }
+
+  /// Extract base version (major.minor.patch) from full version string
+  String _extractBaseVersion(String version) {
+    // Remove pre-release suffix (e.g., -alpha.4)
+    var base = version.split('-').first;
+    // Remove build metadata (e.g., +38)
+    base = base.split('+').first;
+    return base;
+  }
+
+  /// Parse version string into numeric parts, returns null if invalid
+  List<int>? _parseVersionParts(String version) {
+    final parts = version.split('.');
+    final result = <int>[];
+
+    for (final part in parts) {
+      final number = int.tryParse(part);
+      if (number == null) {
+        return null; // Non-numeric part found
+      }
+      result.add(number);
+    }
+
+    return result.isEmpty ? null : result;
+  }
+}
diff --git a/lib/features/auth/presentation/screens/auth_settings_screen.dart b/lib/features/auth/presentation/screens/auth_settings_screen.dart
index d2cea95..6ea9d31 100644
--- a/lib/features/auth/presentation/screens/auth_settings_screen.dart
+++ b/lib/features/auth/presentation/screens/auth_settings_screen.dart
@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:keep_track/core/di/service_locator.dart';
+import 'package:keep_track/core/services/notification/platform_notification_helper.dart';
 import 'package:keep_track/core/theme/gcash_theme.dart';
 import 'package:keep_track/features/auth/data/services/auth_service.dart';
+import 'package:keep_track/features/notifications/presentation/screens/notification_settings_screen.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 
 /// Screen for managing authentication methods
@@ -131,6 +133,12 @@ class _AuthSettingsScreenState extends State<AuthSettingsScreen> {
             _buildPasswordSection(),
             const SizedBox(height: 24),
 
+            // Notification settings (mobile only)
+            if (PlatformNotificationHelper.instance.isSupportedPlatform) ...[
+              _buildNotificationSettingsCard(),
+              const SizedBox(height: 24),
+            ],
+
             // Info about account linking
             _buildInfoCard(),
           ],
@@ -346,6 +354,56 @@ class _AuthSettingsScreenState extends State<AuthSettingsScreen> {
     );
   }
 
+  Widget _buildNotificationSettingsCard() {
+    return Card(
+      child: InkWell(
+        onTap: () {
+          Navigator.push(
+            context,
+            MaterialPageRoute(
+              builder: (context) => const NotificationSettingsScreen(),
+            ),
+          );
+        },
+        borderRadius: BorderRadius.circular(12),
+        child: Padding(
+          padding: const EdgeInsets.all(16),
+          child: Row(
+            children: [
+              Icon(Icons.notifications, color: GCashColors.primary),
+              const SizedBox(width: 12),
+              Expanded(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    const Text(
+                      'Notification Settings',
+                      style: TextStyle(
+                        fontSize: 16,
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                    Text(
+                      'Manage reminders for tasks and finances',
+                      style: TextStyle(
+                        fontSize: 14,
+                        color: Colors.grey[600],
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              Icon(
+                Icons.chevron_right,
+                color: Colors.grey[400],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
   Widget _buildInfoCard() {
     return Card(
       color: Colors.blue.withOpacity(0.05),
diff --git a/lib/features/auth/presentation/state/auth_controller.dart b/lib/features/auth/presentation/state/auth_controller.dart
index 55619b2..6097ec3 100644
--- a/lib/features/auth/presentation/state/auth_controller.dart
+++ b/lib/features/auth/presentation/state/auth_controller.dart
@@ -5,6 +5,7 @@ import 'package:keep_track/core/di/service_locator.dart';
 import 'package:keep_track/features/auth/data/services/auth_service.dart';
 import 'package:keep_track/features/auth/domain/entities/user.dart';
 import 'package:keep_track/features/finance/data/services/finance_initialization_service.dart';
+import 'package:keep_track/features/tasks/data/sevices/bucket_initialization_service.dart';
 
 class AuthController extends StreamState<AsyncState<User?>> {
   final AuthService _authService;
@@ -182,14 +183,46 @@ class AuthController extends StreamState<AsyncState<User?>> {
 
       // Initialize default finance categories
       final financeService = locator.get<FinanceInitializationService>();
-      final result = await financeService.initializeDefaultCategories(userId);
 
-      result.fold(
+      final financeResult = await financeService.initializeDefaultCategories(
+        userId,
+      );
+
+      financeResult.fold(
+        onSuccess: (wasInitialized) {
+          if (wasInitialized) {
+            AppLogger.info(
+              '✅ Finance data initialization completed successfully',
+            );
+          } else {
+            AppLogger.info(
+              'Finance data  already exists, skipping initialization',
+            );
+          }
+        },
+        onError: (failure) {
+          // Log error but don't block user from using the app
+          AppLogger.warning(
+            'Failed to initialize user data (non-blocking): ${failure.message}',
+          );
+        },
+      );
+      final bucketService = locator.get<BucketInitializationService>();
+
+      final bucketResult = await bucketService.initializeDefaultCategories(
+        userId,
+      );
+
+      bucketResult.fold(
         onSuccess: (wasInitialized) {
           if (wasInitialized) {
-            AppLogger.info('✅ User data initialization completed successfully');
+            AppLogger.info(
+              '✅ Bucket data initialization completed successfully',
+            );
           } else {
-            AppLogger.info('User data already exists, skipping initialization');
+            AppLogger.info(
+              'Bucket data already exists, skipping initialization',
+            );
           }
         },
         onError: (failure) {
diff --git a/lib/features/finance/modules/debt/data/models/debt_model.dart b/lib/features/finance/modules/debt/data/models/debt_model.dart
index 223cbe1..6402f99 100644
--- a/lib/features/finance/modules/debt/data/models/debt_model.dart
+++ b/lib/features/finance/modules/debt/data/models/debt_model.dart
@@ -18,6 +18,10 @@ class DebtModel extends Debt {
     super.userId,
     super.accountId,
     super.transactionId,
+    super.monthlyPaymentAmount,
+    super.feeAmount,
+    super.nextPaymentDate,
+    super.paymentFrequency,
   });
 
   /// Convert from JSON (Supabase response)
@@ -53,6 +57,16 @@ class DebtModel extends Debt {
       userId: json['user_id'] as String?,
       accountId: json['account_id'] as String?,
       transactionId: json['transaction_id'] as String?,
+      monthlyPaymentAmount:
+          (json['monthly_payment_amount'] as num?)?.toDouble() ?? 0,
+      feeAmount: (json['fee_amount'] as num?)?.toDouble() ?? 0,
+      nextPaymentDate: json['next_payment_date'] != null
+          ? DateTime.parse(json['next_payment_date'] as String)
+          : null,
+      paymentFrequency: PaymentFrequency.values.firstWhere(
+        (e) => e.name == json['payment_frequency'],
+        orElse: () => PaymentFrequency.monthly,
+      ),
     );
   }
 
@@ -73,6 +87,11 @@ class DebtModel extends Debt {
       if (userId != null) 'user_id': userId,
       if (accountId != null) 'account_id': accountId,
       if (transactionId != null) 'transaction_id': transactionId,
+      'monthly_payment_amount': monthlyPaymentAmount,
+      'fee_amount': feeAmount,
+      if (nextPaymentDate != null)
+        'next_payment_date': nextPaymentDate!.toIso8601String(),
+      'payment_frequency': paymentFrequency.name,
     };
   }
 
@@ -95,6 +114,10 @@ class DebtModel extends Debt {
       userId: debt.userId,
       accountId: debt.accountId,
       transactionId: debt.transactionId,
+      monthlyPaymentAmount: debt.monthlyPaymentAmount,
+      feeAmount: debt.feeAmount,
+      nextPaymentDate: debt.nextPaymentDate,
+      paymentFrequency: debt.paymentFrequency,
     );
   }
 }
diff --git a/lib/features/finance/modules/debt/domain/entities/debt.dart b/lib/features/finance/modules/debt/domain/entities/debt.dart
index 558198c..2eb18c0 100644
--- a/lib/features/finance/modules/debt/domain/entities/debt.dart
+++ b/lib/features/finance/modules/debt/domain/entities/debt.dart
@@ -16,6 +16,10 @@ class Debt {
   final String? userId;
   final String? accountId; // Account/wallet this debt is associated with
   final String? transactionId; // Initial transaction when debt was created
+  final double monthlyPaymentAmount; // Fixed amount due each payment period
+  final double feeAmount; // Total fees associated with the debt
+  final DateTime? nextPaymentDate; // When next payment is due
+  final PaymentFrequency paymentFrequency; // Payment frequency
 
   Debt({
     this.id,
@@ -34,6 +38,10 @@ class Debt {
     this.userId,
     this.accountId,
     this.transactionId,
+    this.monthlyPaymentAmount = 0,
+    this.feeAmount = 0,
+    this.nextPaymentDate,
+    this.paymentFrequency = PaymentFrequency.monthly,
   });
 
   /// Calculate repayment progress (0.0 to 1.0)
@@ -53,6 +61,22 @@ class Debt {
   /// Calculate days until due date (negative if overdue)
   int? get daysUntilDue => dueDate?.difference(DateTime.now()).inDays;
 
+  /// Total amount including fees
+  double get totalAmountWithFees => originalAmount + feeAmount;
+
+  /// Check if next payment is due (today or in the past)
+  bool get isPaymentDue {
+    if (nextPaymentDate == null || status != DebtStatus.active) return false;
+    final now = DateTime.now();
+    final today = DateTime(now.year, now.month, now.day);
+    final paymentDay = DateTime(
+      nextPaymentDate!.year,
+      nextPaymentDate!.month,
+      nextPaymentDate!.day,
+    );
+    return !paymentDay.isAfter(today);
+  }
+
   Debt copyWith({
     String? id,
     DebtType? type,
@@ -70,6 +94,10 @@ class Debt {
     String? userId,
     String? accountId,
     String? transactionId,
+    double? monthlyPaymentAmount,
+    double? feeAmount,
+    DateTime? nextPaymentDate,
+    PaymentFrequency? paymentFrequency,
   }) {
     return Debt(
       id: id ?? this.id,
@@ -88,6 +116,10 @@ class Debt {
       userId: userId ?? this.userId,
       accountId: accountId ?? this.accountId,
       transactionId: transactionId ?? this.transactionId,
+      monthlyPaymentAmount: monthlyPaymentAmount ?? this.monthlyPaymentAmount,
+      feeAmount: feeAmount ?? this.feeAmount,
+      nextPaymentDate: nextPaymentDate ?? this.nextPaymentDate,
+      paymentFrequency: paymentFrequency ?? this.paymentFrequency,
     );
   }
 
@@ -134,3 +166,17 @@ enum DebtStatus {
     }
   }
 }
+
+enum PaymentFrequency {
+  weekly,
+  biweekly,
+  monthly,
+  quarterly;
+
+  String get displayName => switch (this) {
+        weekly => 'Weekly',
+        biweekly => 'Bi-weekly',
+        monthly => 'Monthly',
+        quarterly => 'Quarterly',
+      };
+}
diff --git a/lib/features/finance/modules/goal/data/models/goal_model.dart b/lib/features/finance/modules/goal/data/models/goal_model.dart
index 79811a5..953c2a2 100644
--- a/lib/features/finance/modules/goal/data/models/goal_model.dart
+++ b/lib/features/finance/modules/goal/data/models/goal_model.dart
@@ -16,6 +16,8 @@ class GoalModel extends Goal {
     super.updatedAt,
     super.completedAt,
     super.userId,
+    super.managementFeePercent,
+    super.withdrawalFeePercent,
   });
 
   /// Convert from JSON (Supabase response)
@@ -47,6 +49,10 @@ class GoalModel extends Goal {
           ? DateTime.parse(json['completed_at'] as String)
           : null,
       userId: json['user_id'] as String?,
+      managementFeePercent:
+          (json['management_fee_percent'] as num?)?.toDouble() ?? 0,
+      withdrawalFeePercent:
+          (json['withdrawal_fee_percent'] as num?)?.toDouble() ?? 0,
     );
   }
 
@@ -65,6 +71,8 @@ class GoalModel extends Goal {
       'monthly_contribution': monthlyContribution,
       if (completedAt != null) 'completed_at': completedAt!.toIso8601String(),
       if (userId != null) 'user_id': userId,
+      'management_fee_percent': managementFeePercent,
+      'withdrawal_fee_percent': withdrawalFeePercent,
     };
   }
 
@@ -85,6 +93,8 @@ class GoalModel extends Goal {
       updatedAt: goal.updatedAt,
       completedAt: goal.completedAt,
       userId: goal.userId,
+      managementFeePercent: goal.managementFeePercent,
+      withdrawalFeePercent: goal.withdrawalFeePercent,
     );
   }
 }
diff --git a/lib/features/finance/modules/goal/domain/entities/goal.dart b/lib/features/finance/modules/goal/domain/entities/goal.dart
index b5deceb..188a929 100644
--- a/lib/features/finance/modules/goal/domain/entities/goal.dart
+++ b/lib/features/finance/modules/goal/domain/entities/goal.dart
@@ -14,6 +14,9 @@ class Goal {
   final DateTime? updatedAt; // Optional - Supabase auto-generates
   final DateTime? completedAt;
   final String? userId;
+  final double managementFeePercent; // Recurring fee percentage (0-100)
+  final double withdrawalFeePercent; // Early withdrawal penalty percentage (0-100)
+
   Goal({
     this.id,
     required this.name,
@@ -29,6 +32,8 @@ class Goal {
     this.updatedAt,
     this.completedAt,
     this.userId,
+    this.managementFeePercent = 0,
+    this.withdrawalFeePercent = 0,
   });
 
   /// Calculate progress percentage (0.0 to 1.0)
@@ -45,6 +50,16 @@ class Goal {
   /// Calculate days remaining until target date
   int? get daysRemaining => targetDate?.difference(DateTime.now()).inDays;
 
+  /// Calculate management fee amount based on current amount
+  double get managementFeeAmount => currentAmount * (managementFeePercent / 100);
+
+  /// Calculate withdrawal fee amount (penalty if withdrawn early)
+  double get withdrawalFeeAmount => currentAmount * (withdrawalFeePercent / 100);
+
+  /// Calculate net amount after deducting estimated fees
+  double get netAmountAfterFees =>
+      currentAmount - managementFeeAmount - withdrawalFeeAmount;
+
   Goal copyWith({
     String? id,
     String? name,
@@ -60,6 +75,8 @@ class Goal {
     DateTime? updatedAt,
     DateTime? completedAt,
     String? userId,
+    double? managementFeePercent,
+    double? withdrawalFeePercent,
   }) {
     return Goal(
       id: id ?? this.id,
@@ -76,6 +93,8 @@ class Goal {
       updatedAt: updatedAt ?? this.updatedAt,
       completedAt: completedAt ?? this.completedAt,
       userId: userId ?? this.userId,
+      managementFeePercent: managementFeePercent ?? this.managementFeePercent,
+      withdrawalFeePercent: withdrawalFeePercent ?? this.withdrawalFeePercent,
     );
   }
 
diff --git a/lib/features/finance/presentation/screens/account_details_screen.dart b/lib/features/finance/presentation/screens/account_details_screen.dart
new file mode 100644
index 0000000..f13e7dd
--- /dev/null
+++ b/lib/features/finance/presentation/screens/account_details_screen.dart
@@ -0,0 +1,811 @@
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:keep_track/core/di/service_locator.dart';
+import 'package:keep_track/core/settings/utils/currency_formatter.dart';
+import 'package:keep_track/core/state/stream_builder_widget.dart';
+import 'package:keep_track/core/theme/app_theme.dart';
+import 'package:keep_track/core/ui/responsive/desktop_aware_screen.dart';
+import 'package:keep_track/core/utils/icon_helper.dart';
+import 'package:keep_track/features/finance/modules/account/domain/entities/account.dart';
+import 'package:keep_track/features/finance/modules/transaction/domain/entities/transaction.dart';
+import 'package:keep_track/features/finance/presentation/state/transaction_controller.dart';
+
+/// Daily finance data for bar graph
+class DailyAccountData {
+  final DateTime date;
+  final double income;
+  final double expense;
+  final double transfer;
+
+  DailyAccountData({
+    required this.date,
+    required this.income,
+    required this.expense,
+    required this.transfer,
+  });
+}
+
+class AccountDetailsScreen extends StatefulWidget {
+  final Account account;
+
+  const AccountDetailsScreen({super.key, required this.account});
+
+  @override
+  State<AccountDetailsScreen> createState() => _AccountDetailsScreenState();
+}
+
+class _AccountDetailsScreenState extends State<AccountDetailsScreen> {
+  late final TransactionController _transactionController;
+  int _daysToShow = 15;
+  Set<String> _selectedTypes = {'income', 'expense', 'transfer'};
+
+  @override
+  void initState() {
+    super.initState();
+    _transactionController = locator.get<TransactionController>();
+    _transactionController.loadTransactionsByAccount(widget.account.id!);
+  }
+
+  List<DailyAccountData> _processTransactionsToDaily(List<Transaction> transactions) {
+    final Map<String, DailyAccountData> dailyMap = {};
+
+    if (_daysToShow == 0) {
+      // "All" mode: process all transactions
+      for (final transaction in transactions) {
+        final dateKey = DateFormat('yyyy-MM-dd').format(transaction.date);
+        final existing = dailyMap[dateKey];
+
+        if (existing == null) {
+          dailyMap[dateKey] = DailyAccountData(
+            date: DateTime(transaction.date.year, transaction.date.month, transaction.date.day),
+            income: transaction.type == TransactionType.income ? transaction.amount : 0,
+            expense: transaction.type == TransactionType.expense ? transaction.amount : 0,
+            transfer: transaction.type == TransactionType.transfer ? transaction.amount : 0,
+          );
+        } else {
+          switch (transaction.type) {
+            case TransactionType.income:
+              dailyMap[dateKey] = DailyAccountData(
+                date: existing.date,
+                income: existing.income + transaction.amount,
+                expense: existing.expense,
+                transfer: existing.transfer,
+              );
+              break;
+            case TransactionType.expense:
+              dailyMap[dateKey] = DailyAccountData(
+                date: existing.date,
+                income: existing.income,
+                expense: existing.expense + transaction.amount,
+                transfer: existing.transfer,
+              );
+              break;
+            case TransactionType.transfer:
+              dailyMap[dateKey] = DailyAccountData(
+                date: existing.date,
+                income: existing.income,
+                expense: existing.expense,
+                transfer: existing.transfer + transaction.amount,
+              );
+              break;
+          }
+        }
+      }
+    } else {
+      // Fixed days mode: only process transactions within the range
+      final now = DateTime.now();
+      final today = DateTime(now.year, now.month, now.day);
+      final startDate = today.subtract(Duration(days: _daysToShow - 1));
+
+      // Create a map with all dates initialized to zero
+      for (int i = 0; i < _daysToShow; i++) {
+        final date = startDate.add(Duration(days: i));
+        final dateKey = DateFormat('yyyy-MM-dd').format(date);
+        dailyMap[dateKey] = DailyAccountData(
+          date: date,
+          income: 0,
+          expense: 0,
+          transfer: 0,
+        );
+      }
+
+      // Aggregate transactions by date
+      for (final transaction in transactions) {
+        final dateKey = DateFormat('yyyy-MM-dd').format(transaction.date);
+        if (dailyMap.containsKey(dateKey)) {
+          final existing = dailyMap[dateKey]!;
+          switch (transaction.type) {
+            case TransactionType.income:
+              dailyMap[dateKey] = DailyAccountData(
+                date: existing.date,
+                income: existing.income + transaction.amount,
+                expense: existing.expense,
+                transfer: existing.transfer,
+              );
+              break;
+            case TransactionType.expense:
+              dailyMap[dateKey] = DailyAccountData(
+                date: existing.date,
+                income: existing.income,
+                expense: existing.expense + transaction.amount,
+                transfer: existing.transfer,
+              );
+              break;
+            case TransactionType.transfer:
+              dailyMap[dateKey] = DailyAccountData(
+                date: existing.date,
+                income: existing.income,
+                expense: existing.expense,
+                transfer: existing.transfer + transaction.amount,
+              );
+              break;
+          }
+        }
+      }
+    }
+
+    // Convert to list and sort by date
+    final result = dailyMap.values.toList();
+    result.sort((a, b) => a.date.compareTo(b.date));
+    return result;
+  }
+
+  Widget _buildBody(BuildContext context, bool isDesktop, Color accountColor, IconData accountIcon) {
+    return AsyncStreamBuilder<List<Transaction>>(
+      state: _transactionController,
+      loadingBuilder: (_) => const Center(child: CircularProgressIndicator()),
+      errorBuilder: (context, message) => Center(
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Icon(Icons.error_outline, size: 64, color: Colors.red[300]),
+            const SizedBox(height: 16),
+            Text('Error: $message'),
+            const SizedBox(height: 16),
+            ElevatedButton(
+              onPressed: () => _transactionController.loadTransactionsByAccount(widget.account.id!),
+              child: const Text('Retry'),
+            ),
+          ],
+        ),
+      ),
+      builder: (context, transactions) {
+        // Filter transactions for this account
+        final accountTransactions = transactions.where((t) =>
+            t.accountId == widget.account.id ||
+            t.toAccountId == widget.account.id).toList();
+
+        // Sort by date descending
+        accountTransactions.sort((a, b) => b.date.compareTo(a.date));
+
+        // Calculate totals
+        double totalIncome = 0;
+        double totalExpense = 0;
+        double totalTransfer = 0;
+
+        for (final t in accountTransactions) {
+          switch (t.type) {
+            case TransactionType.income:
+              totalIncome += t.amount;
+              break;
+            case TransactionType.expense:
+              totalExpense += t.amount;
+              break;
+            case TransactionType.transfer:
+              totalTransfer += t.amount;
+              break;
+          }
+        }
+
+        return SingleChildScrollView(
+          padding: EdgeInsets.all(isDesktop ? AppSpacing.xl : 16),
+          child: Center(
+            child: ConstrainedBox(
+              constraints: BoxConstraints(
+                maxWidth: isDesktop ? 1200 : double.infinity,
+              ),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  // Account Info Card
+                  _buildAccountInfoCard(accountColor, accountIcon, isDesktop),
+                  SizedBox(height: isDesktop ? AppSpacing.xl : 24),
+
+                  // Summary Cards
+                  _buildSummaryCards(
+                    totalIncome,
+                    totalExpense,
+                    totalTransfer,
+                    isDesktop,
+                  ),
+                  SizedBox(height: isDesktop ? AppSpacing.xl : 24),
+
+                  // Bar Graph
+                  _buildBarGraph(accountTransactions, isDesktop),
+                  SizedBox(height: isDesktop ? AppSpacing.xl : 24),
+
+                  // Transactions List
+                  _buildTransactionsList(accountTransactions, isDesktop),
+                ],
+              ),
+            ),
+          ),
+        );
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final accountColor = widget.account.colorHex != null
+        ? Color(int.parse(widget.account.colorHex!.replaceFirst('#', '0xff')))
+        : Colors.blue[700]!;
+    final accountIcon = IconHelper.fromString(widget.account.iconCodePoint);
+
+    return DesktopAwareScreen(
+      builder: (context, isDesktop) {
+        return Scaffold(
+          backgroundColor: isDesktop
+              ? (Theme.of(context).brightness == Brightness.dark
+                    ? const Color(0xFF09090B)
+                    : AppColors.backgroundSecondary)
+              : null,
+          appBar: AppBar(
+            title: Text(widget.account.name),
+            leading: IconButton(
+              icon: const Icon(Icons.arrow_back),
+              onPressed: () => Navigator.pop(context),
+            ),
+          ),
+          body: _buildBody(context, isDesktop, accountColor, accountIcon),
+        );
+      },
+    );
+  }
+
+  Widget _buildAccountInfoCard(Color accountColor, IconData accountIcon, bool isDesktop) {
+    return Card(
+      elevation: 0,
+      child: Container(
+        padding: const EdgeInsets.all(24),
+        decoration: BoxDecoration(
+          gradient: LinearGradient(
+            colors: [accountColor, accountColor.withOpacity(0.7)],
+            begin: Alignment.topLeft,
+            end: Alignment.bottomRight,
+          ),
+          borderRadius: BorderRadius.circular(12),
+        ),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Container(
+                  padding: const EdgeInsets.all(12),
+                  decoration: BoxDecoration(
+                    color: Colors.white.withOpacity(0.2),
+                    shape: BoxShape.circle,
+                  ),
+                  child: Icon(accountIcon, color: Colors.white, size: 28),
+                ),
+                const SizedBox(width: 16),
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        widget.account.name,
+                        style: const TextStyle(
+                          color: Colors.white,
+                          fontSize: 24,
+                          fontWeight: FontWeight.bold,
+                        ),
+                      ),
+                      const SizedBox(height: 4),
+                      Text(
+                        widget.account.accountType.toString().split('.').last,
+                        style: const TextStyle(color: Colors.white70, fontSize: 14),
+                      ),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+            const SizedBox(height: 24),
+            Text(
+              'Current Balance',
+              style: TextStyle(color: Colors.white.withOpacity(0.8), fontSize: 14),
+            ),
+            const SizedBox(height: 4),
+            Text(
+              NumberFormat.currency(
+                symbol: currencyFormatter.currencySymbol,
+                decimalDigits: 2,
+              ).format(widget.account.balance),
+              style: const TextStyle(
+                color: Colors.white,
+                fontSize: 36,
+                fontWeight: FontWeight.bold,
+              ),
+            ),
+            if (widget.account.bankAccountNumber != null) ...[
+              const SizedBox(height: 16),
+              Row(
+                children: [
+                  const Icon(Icons.account_balance, color: Colors.white70, size: 16),
+                  const SizedBox(width: 8),
+                  Text(
+                    widget.account.bankAccountNumber!,
+                    style: const TextStyle(color: Colors.white70, fontSize: 14),
+                  ),
+                ],
+              ),
+            ],
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildSummaryCards(
+    double totalIncome,
+    double totalExpense,
+    double totalTransfer,
+    bool isDesktop,
+  ) {
+    return Row(
+      children: [
+        Expanded(
+          child: _buildSummaryCard(
+            'Income',
+            totalIncome,
+            Colors.green,
+            Icons.arrow_downward,
+          ),
+        ),
+        const SizedBox(width: 12),
+        Expanded(
+          child: _buildSummaryCard(
+            'Expense',
+            totalExpense,
+            Colors.red,
+            Icons.arrow_upward,
+          ),
+        ),
+        const SizedBox(width: 12),
+        Expanded(
+          child: _buildSummaryCard(
+            'Transfer',
+            totalTransfer,
+            Colors.blue,
+            Icons.swap_horiz,
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildSummaryCard(
+    String label,
+    double amount,
+    Color color,
+    IconData icon,
+  ) {
+    return Card(
+      elevation: 0,
+      child: Padding(
+        padding: const EdgeInsets.all(16),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Icon(icon, color: color, size: 20),
+                const SizedBox(width: 8),
+                Text(
+                  label,
+                  style: TextStyle(
+                    color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
+                    fontSize: 12,
+                  ),
+                ),
+              ],
+            ),
+            const SizedBox(height: 8),
+            Text(
+              NumberFormat.currency(
+                symbol: currencyFormatter.currencySymbol,
+                decimalDigits: 0,
+              ).format(amount),
+              style: TextStyle(
+                fontSize: 18,
+                fontWeight: FontWeight.bold,
+                color: color,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildBarGraph(List<Transaction> transactions, bool isDesktop) {
+    final data = _processTransactionsToDaily(transactions);
+    final maxAmount = data.fold<double>(
+      0,
+      (max, d) {
+        final dayMax = [d.income, d.expense, d.transfer].reduce((a, b) => a > b ? a : b);
+        return dayMax > max ? dayMax : max;
+      },
+    );
+
+    return Card(
+      elevation: 0,
+      child: Padding(
+        padding: const EdgeInsets.all(20),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            // Header
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                const Text(
+                  'Transaction History',
+                  style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+                ),
+                Container(
+                  padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+                  decoration: BoxDecoration(
+                    color: Theme.of(context).colorScheme.surfaceContainerHighest,
+                    borderRadius: BorderRadius.circular(8),
+                  ),
+                  child: DropdownButton<int>(
+                    value: _daysToShow,
+                    isDense: true,
+                    underline: const SizedBox(),
+                    items: [7, 15, 30, 0].map((days) {
+                      return DropdownMenuItem<int>(
+                        value: days,
+                        child: Text(
+                          days == 0 ? 'All' : '$days days',
+                          style: const TextStyle(fontSize: 12),
+                        ),
+                      );
+                    }).toList(),
+                    onChanged: (value) {
+                      if (value != null) {
+                        setState(() {
+                          _daysToShow = value;
+                        });
+                      }
+                    },
+                  ),
+                ),
+              ],
+            ),
+            const SizedBox(height: 12),
+
+            // Filter chips
+            Wrap(
+              spacing: 8,
+              runSpacing: 8,
+              children: [
+                _buildFilterChip('income', 'Income', Colors.green),
+                _buildFilterChip('expense', 'Expense', Colors.red),
+                _buildFilterChip('transfer', 'Transfer', Colors.blue),
+              ],
+            ),
+            const SizedBox(height: 16),
+
+            // Bar Graph
+            SizedBox(
+              height: isDesktop ? 200 : 160,
+              child: data.isEmpty || maxAmount == 0
+                  ? Center(
+                      child: Column(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: [
+                          Icon(
+                            Icons.bar_chart,
+                            size: 48,
+                            color: Theme.of(context).colorScheme.onSurface.withOpacity(0.3),
+                          ),
+                          const SizedBox(height: 8),
+                          Text(
+                            'No transactions in this period',
+                            style: TextStyle(
+                              color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
+                            ),
+                          ),
+                        ],
+                      ),
+                    )
+                  : LayoutBuilder(
+                      builder: (context, constraints) {
+                        final selectedCount = _selectedTypes.length;
+                        final barWidth = selectedCount > 0
+                            ? (constraints.maxWidth - (data.length - 1) * 6) / (data.length * selectedCount)
+                            : (constraints.maxWidth - (data.length - 1) * 6) / (data.length * 3);
+                        final clampedBarWidth = barWidth.clamp(3.0, 20.0);
+
+                        return Row(
+                          crossAxisAlignment: CrossAxisAlignment.end,
+                          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                          children: data.map((dayData) {
+                            final incomeHeight = maxAmount > 0 && _selectedTypes.contains('income')
+                                ? (dayData.income / maxAmount) * (isDesktop ? 160 : 120)
+                                : 0.0;
+                            final expenseHeight = maxAmount > 0 && _selectedTypes.contains('expense')
+                                ? (dayData.expense / maxAmount) * (isDesktop ? 160 : 120)
+                                : 0.0;
+                            final transferHeight = maxAmount > 0 && _selectedTypes.contains('transfer')
+                                ? (dayData.transfer / maxAmount) * (isDesktop ? 160 : 120)
+                                : 0.0;
+
+                            final tooltipLines = <String>[DateFormat('MMM d').format(dayData.date)];
+                            if (_selectedTypes.contains('income')) {
+                              tooltipLines.add('Income: ${currencyFormatter.currencySymbol}${NumberFormat('#,##0').format(dayData.income)}');
+                            }
+                            if (_selectedTypes.contains('expense')) {
+                              tooltipLines.add('Expense: ${currencyFormatter.currencySymbol}${NumberFormat('#,##0').format(dayData.expense)}');
+                            }
+                            if (_selectedTypes.contains('transfer')) {
+                              tooltipLines.add('Transfer: ${currencyFormatter.currencySymbol}${NumberFormat('#,##0').format(dayData.transfer)}');
+                            }
+
+                            return Tooltip(
+                              message: tooltipLines.join('\n'),
+                              child: Column(
+                                mainAxisAlignment: MainAxisAlignment.end,
+                                children: [
+                                  Row(
+                                    crossAxisAlignment: CrossAxisAlignment.end,
+                                    children: [
+                                      // Income bar
+                                      if (_selectedTypes.contains('income'))
+                                        AnimatedContainer(
+                                          duration: const Duration(milliseconds: 300),
+                                          width: clampedBarWidth,
+                                          height: incomeHeight,
+                                          decoration: BoxDecoration(
+                                            color: Colors.green.withOpacity(0.8),
+                                            borderRadius: const BorderRadius.vertical(
+                                              top: Radius.circular(3),
+                                            ),
+                                          ),
+                                        ),
+                                      if (_selectedTypes.contains('income') && _selectedTypes.length > 1)
+                                        const SizedBox(width: 1),
+                                      // Expense bar
+                                      if (_selectedTypes.contains('expense'))
+                                        AnimatedContainer(
+                                          duration: const Duration(milliseconds: 300),
+                                          width: clampedBarWidth,
+                                          height: expenseHeight,
+                                          decoration: BoxDecoration(
+                                            color: Colors.red.withOpacity(0.8),
+                                            borderRadius: const BorderRadius.vertical(
+                                              top: Radius.circular(3),
+                                            ),
+                                          ),
+                                        ),
+                                      if (_selectedTypes.contains('expense') && _selectedTypes.contains('transfer'))
+                                        const SizedBox(width: 1),
+                                      // Transfer bar
+                                      if (_selectedTypes.contains('transfer'))
+                                        AnimatedContainer(
+                                          duration: const Duration(milliseconds: 300),
+                                          width: clampedBarWidth,
+                                          height: transferHeight,
+                                          decoration: BoxDecoration(
+                                            color: Colors.blue.withOpacity(0.8),
+                                            borderRadius: const BorderRadius.vertical(
+                                              top: Radius.circular(3),
+                                            ),
+                                          ),
+                                        ),
+                                    ],
+                                  ),
+                                  const SizedBox(height: 4),
+                                  Text(
+                                    DateFormat('d').format(dayData.date),
+                                    style: TextStyle(
+                                      fontSize: 9,
+                                      color: Theme.of(context)
+                                          .colorScheme
+                                          .onSurface
+                                          .withOpacity(0.5),
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            );
+                          }).toList(),
+                        );
+                      },
+                    ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildLegendIndicator(Color color, String label) {
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Container(
+          width: 12,
+          height: 12,
+          decoration: BoxDecoration(
+            color: color.withOpacity(0.8),
+            borderRadius: BorderRadius.circular(3),
+          ),
+        ),
+        const SizedBox(width: 6),
+        Text(
+          label,
+          style: TextStyle(
+            fontSize: 12,
+            color: Theme.of(context).colorScheme.onSurface.withOpacity(0.7),
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildFilterChip(String type, String label, Color color) {
+    final isSelected = _selectedTypes.contains(type);
+    return FilterChip(
+      label: Text(
+        label,
+        style: TextStyle(
+          fontSize: 12,
+          color: isSelected ? Colors.white : color,
+          fontWeight: isSelected ? FontWeight.w600 : FontWeight.normal,
+        ),
+      ),
+      selected: isSelected,
+      onSelected: (selected) {
+        setState(() {
+          if (selected) {
+            _selectedTypes.add(type);
+          } else {
+            if (_selectedTypes.length > 1) {
+              _selectedTypes.remove(type);
+            }
+          }
+        });
+      },
+      selectedColor: color,
+      backgroundColor: color.withOpacity(0.1),
+      checkmarkColor: Colors.white,
+      side: BorderSide(color: color.withOpacity(0.3)),
+      padding: const EdgeInsets.symmetric(horizontal: 4),
+      visualDensity: VisualDensity.compact,
+    );
+  }
+
+  Widget _buildTransactionsList(List<Transaction> transactions, bool isDesktop) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            const Text(
+              'All Transactions',
+              style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+            ),
+            Text(
+              '${transactions.length} transaction${transactions.length != 1 ? 's' : ''}',
+              style: TextStyle(
+                color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
+              ),
+            ),
+          ],
+        ),
+        const SizedBox(height: 16),
+        if (transactions.isEmpty)
+          Card(
+            elevation: 0,
+            child: Padding(
+              padding: const EdgeInsets.all(32),
+              child: Center(
+                child: Column(
+                  children: [
+                    Icon(
+                      Icons.receipt_long,
+                      size: 48,
+                      color: Theme.of(context).colorScheme.onSurface.withOpacity(0.3),
+                    ),
+                    const SizedBox(height: 8),
+                    Text(
+                      'No transactions yet',
+                      style: TextStyle(
+                        color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          )
+        else
+          ListView.builder(
+            shrinkWrap: true,
+            physics: const NeverScrollableScrollPhysics(),
+            itemCount: transactions.length,
+            itemBuilder: (context, index) {
+              final transaction = transactions[index];
+              return _buildTransactionItem(transaction);
+            },
+          ),
+      ],
+    );
+  }
+
+  Widget _buildTransactionItem(Transaction transaction) {
+    Color typeColor;
+    IconData typeIcon;
+    String prefix;
+
+    switch (transaction.type) {
+      case TransactionType.income:
+        typeColor = Colors.green;
+        typeIcon = Icons.arrow_downward;
+        prefix = '+';
+        break;
+      case TransactionType.expense:
+        typeColor = Colors.red;
+        typeIcon = Icons.arrow_upward;
+        prefix = '-';
+        break;
+      case TransactionType.transfer:
+        typeColor = Colors.blue;
+        typeIcon = Icons.swap_horiz;
+        prefix = transaction.accountId == widget.account.id ? '-' : '+';
+        break;
+    }
+
+    return Card(
+      elevation: 0,
+      margin: const EdgeInsets.only(bottom: 8),
+      child: ListTile(
+        leading: Container(
+          padding: const EdgeInsets.all(8),
+          decoration: BoxDecoration(
+            color: typeColor.withOpacity(0.1),
+            borderRadius: BorderRadius.circular(8),
+          ),
+          child: Icon(typeIcon, color: typeColor, size: 20),
+        ),
+        title: Text(
+          transaction.description ?? transaction.type.displayName,
+          style: const TextStyle(fontWeight: FontWeight.w600),
+        ),
+        subtitle: Text(
+          DateFormat('MMM d, yyyy - h:mm a').format(transaction.date),
+          style: TextStyle(
+            fontSize: 12,
+            color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
+          ),
+        ),
+        trailing: Text(
+          '$prefix${NumberFormat.currency(
+            symbol: currencyFormatter.currencySymbol,
+            decimalDigits: 2,
+          ).format(transaction.amount)}',
+          style: TextStyle(
+            fontSize: 16,
+            fontWeight: FontWeight.bold,
+            color: typeColor,
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/features/finance/presentation/screens/configuration/debts/widgets/debt_management_dialog.dart b/lib/features/finance/presentation/screens/configuration/debts/widgets/debt_management_dialog.dart
index 8d9396f..790281e 100644
--- a/lib/features/finance/presentation/screens/configuration/debts/widgets/debt_management_dialog.dart
+++ b/lib/features/finance/presentation/screens/configuration/debts/widgets/debt_management_dialog.dart
@@ -33,12 +33,16 @@ class _DebtManagementDialogState extends State<DebtManagementDialog> {
   late final TextEditingController originalAmountController;
   late final TextEditingController remainingAmountController;
   late final TextEditingController notesController;
+  late final TextEditingController monthlyPaymentController;
+  late final TextEditingController feeAmountController;
   late final FinanceCategoryController _categoryController;
 
   late DateTime selectedStartDate;
   late DateTime? selectedDueDate;
+  late DateTime? selectedNextPaymentDate;
   late DebtType selectedType;
   late DebtStatus selectedStatus;
+  late PaymentFrequency selectedPaymentFrequency;
   String? selectedAccountId;
   String? selectedCategoryId;
 
@@ -59,11 +63,23 @@ class _DebtManagementDialogState extends State<DebtManagementDialog> {
       text: d?.remainingAmount.toString() ?? d?.originalAmount.toString() ?? '',
     );
     notesController = TextEditingController(text: d?.notes ?? '');
+    monthlyPaymentController = TextEditingController(
+      text: d?.monthlyPaymentAmount != null && d!.monthlyPaymentAmount > 0
+          ? d.monthlyPaymentAmount.toString()
+          : '',
+    );
+    feeAmountController = TextEditingController(
+      text: d?.feeAmount != null && d!.feeAmount > 0
+          ? d.feeAmount.toString()
+          : '',
+    );
 
     selectedStartDate = d?.startDate ?? DateTime.now();
     selectedDueDate = d?.dueDate;
+    selectedNextPaymentDate = d?.nextPaymentDate;
     selectedType = d?.type ?? DebtType.lending;
     selectedStatus = d?.status ?? DebtStatus.active;
+    selectedPaymentFrequency = d?.paymentFrequency ?? PaymentFrequency.monthly;
     selectedAccountId = d?.accountId ?? widget.accounts.firstOrNull?.id;
 
     _categoryController = locator.get<FinanceCategoryController>();
@@ -77,6 +93,8 @@ class _DebtManagementDialogState extends State<DebtManagementDialog> {
     originalAmountController.dispose();
     remainingAmountController.dispose();
     notesController.dispose();
+    monthlyPaymentController.dispose();
+    feeAmountController.dispose();
     super.dispose();
   }
 
@@ -115,6 +133,9 @@ class _DebtManagementDialogState extends State<DebtManagementDialog> {
           double.tryParse(originalAmountController.text) ?? 0;
       final remainingAmount =
           double.tryParse(remainingAmountController.text) ?? originalAmount;
+      final monthlyPayment =
+          double.tryParse(monthlyPaymentController.text) ?? 0;
+      final feeAmount = double.tryParse(feeAmountController.text) ?? 0;
 
       final debtEntity = Debt(
         id: widget.debt?.id,
@@ -132,6 +153,10 @@ class _DebtManagementDialogState extends State<DebtManagementDialog> {
         userId: widget.userId,
         accountId: selectedAccountId,
         transactionId: widget.debt?.transactionId,
+        monthlyPaymentAmount: monthlyPayment,
+        feeAmount: feeAmount,
+        nextPaymentDate: selectedNextPaymentDate,
+        paymentFrequency: selectedPaymentFrequency,
       );
 
       widget.onSave(debtEntity, selectedCategoryId);
@@ -342,6 +367,96 @@ class _DebtManagementDialogState extends State<DebtManagementDialog> {
                 ),
               ),
               const SizedBox(height: 16),
+              TextField(
+                controller: feeAmountController,
+                decoration: InputDecoration(
+                  labelText: 'Fee Amount (Optional)',
+                  border: const OutlineInputBorder(),
+                  prefixText: '$currencySymbol ',
+                  helperText: 'Total fees associated with this debt',
+                ),
+                keyboardType: const TextInputType.numberWithOptions(
+                  decimal: true,
+                ),
+              ),
+              const SizedBox(height: 16),
+              TextField(
+                controller: monthlyPaymentController,
+                decoration: InputDecoration(
+                  labelText: 'Payment Amount (Optional)',
+                  border: const OutlineInputBorder(),
+                  prefixText: '$currencySymbol ',
+                  helperText: 'Fixed amount due each payment period',
+                ),
+                keyboardType: const TextInputType.numberWithOptions(
+                  decimal: true,
+                ),
+              ),
+              const SizedBox(height: 16),
+              const Text(
+                'Payment Frequency',
+                style: TextStyle(fontWeight: FontWeight.w600),
+              ),
+              const SizedBox(height: 8),
+              SegmentedButton<PaymentFrequency>(
+                segments: PaymentFrequency.values
+                    .map(
+                      (freq) => ButtonSegment(
+                        value: freq,
+                        label: Text(freq.displayName),
+                      ),
+                    )
+                    .toList(),
+                selected: {selectedPaymentFrequency},
+                onSelectionChanged: (Set<PaymentFrequency> newSelection) {
+                  setDialogState(() {
+                    selectedPaymentFrequency = newSelection.first;
+                  });
+                },
+              ),
+              const SizedBox(height: 16),
+              ListTile(
+                contentPadding: EdgeInsets.zero,
+                title: const Text('Next Payment Date (Optional)'),
+                subtitle: Text(
+                  selectedNextPaymentDate != null
+                      ? '${selectedNextPaymentDate?.year}-${selectedNextPaymentDate?.month.toString().padLeft(2, '0')}-${selectedNextPaymentDate?.day.toString().padLeft(2, '0')}'
+                      : 'No next payment date set',
+                ),
+                trailing: Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    if (selectedNextPaymentDate != null)
+                      IconButton(
+                        icon: const Icon(Icons.clear),
+                        onPressed: () {
+                          setDialogState(() {
+                            selectedNextPaymentDate = null;
+                          });
+                        },
+                      ),
+                    IconButton(
+                      icon: const Icon(Icons.calendar_today),
+                      onPressed: () async {
+                        final date = await showDatePicker(
+                          context: context,
+                          initialDate: selectedNextPaymentDate ?? DateTime.now(),
+                          firstDate: DateTime.now(),
+                          lastDate: DateTime.now().add(
+                            const Duration(days: 3650),
+                          ),
+                        );
+                        if (date != null) {
+                          setDialogState(() {
+                            selectedNextPaymentDate = date;
+                          });
+                        }
+                      },
+                    ),
+                  ],
+                ),
+              ),
+              const SizedBox(height: 16),
               ListTile(
                 contentPadding: EdgeInsets.zero,
                 title: const Text('Start Date'),
diff --git a/lib/features/finance/presentation/screens/configuration/goals/widgets/goals_management_dialog.dart b/lib/features/finance/presentation/screens/configuration/goals/widgets/goals_management_dialog.dart
index f2e2585..d495b3e 100644
--- a/lib/features/finance/presentation/screens/configuration/goals/widgets/goals_management_dialog.dart
+++ b/lib/features/finance/presentation/screens/configuration/goals/widgets/goals_management_dialog.dart
@@ -25,6 +25,8 @@ class _GoalsManagementScreenState extends State<GoalsManagementDialog> {
   late final TextEditingController targetAmountController;
   late final TextEditingController currentAmountController;
   late final TextEditingController monthlyContributionController;
+  late final TextEditingController managementFeeController;
+  late final TextEditingController withdrawalFeeController;
 
   late DateTime? selectedTargetDate;
   late GoalStatus selectedStatus;
@@ -48,6 +50,16 @@ class _GoalsManagementScreenState extends State<GoalsManagementDialog> {
     monthlyContributionController = TextEditingController(
       text: g?.monthlyContribution.toString() ?? '0',
     );
+    managementFeeController = TextEditingController(
+      text: g?.managementFeePercent != null && g!.managementFeePercent > 0
+          ? g.managementFeePercent.toString()
+          : '',
+    );
+    withdrawalFeeController = TextEditingController(
+      text: g?.withdrawalFeePercent != null && g!.withdrawalFeePercent > 0
+          ? g.withdrawalFeePercent.toString()
+          : '',
+    );
 
     selectedTargetDate = g?.targetDate;
     selectedStatus = g?.status ?? GoalStatus.active;
@@ -63,6 +75,8 @@ class _GoalsManagementScreenState extends State<GoalsManagementDialog> {
     targetAmountController.dispose();
     currentAmountController.dispose();
     monthlyContributionController.dispose();
+    managementFeeController.dispose();
+    withdrawalFeeController.dispose();
     super.dispose();
   }
 
@@ -89,6 +103,10 @@ class _GoalsManagementScreenState extends State<GoalsManagementDialog> {
       final currentAmount = double.tryParse(currentAmountController.text) ?? 0;
       final monthlyContribution =
           double.tryParse(monthlyContributionController.text) ?? 0;
+      final managementFee =
+          (double.tryParse(managementFeeController.text) ?? 0).clamp(0.0, 100.0);
+      final withdrawalFee =
+          (double.tryParse(withdrawalFeeController.text) ?? 0).clamp(0.0, 100.0);
 
       final colorHex = '#${selectedColor.value.toRadixString(16).substring(2)}';
 
@@ -103,6 +121,8 @@ class _GoalsManagementScreenState extends State<GoalsManagementDialog> {
         status: selectedStatus,
         monthlyContribution: monthlyContribution,
         userId: widget.userId,
+        managementFeePercent: managementFee,
+        withdrawalFeePercent: withdrawalFee,
       );
 
       widget.onSave(goalEntity);
@@ -186,6 +206,32 @@ class _GoalsManagementScreenState extends State<GoalsManagementDialog> {
                 ),
               ),
               const SizedBox(height: 16),
+              TextField(
+                controller: managementFeeController,
+                decoration: const InputDecoration(
+                  labelText: 'Management Fee % (Optional)',
+                  border: OutlineInputBorder(),
+                  suffixText: '%',
+                  helperText: 'Recurring fee percentage (0-100)',
+                ),
+                keyboardType: const TextInputType.numberWithOptions(
+                  decimal: true,
+                ),
+              ),
+              const SizedBox(height: 16),
+              TextField(
+                controller: withdrawalFeeController,
+                decoration: const InputDecoration(
+                  labelText: 'Withdrawal Fee % (Optional)',
+                  border: OutlineInputBorder(),
+                  suffixText: '%',
+                  helperText: 'Early withdrawal penalty percentage (0-100)',
+                ),
+                keyboardType: const TextInputType.numberWithOptions(
+                  decimal: true,
+                ),
+              ),
+              const SizedBox(height: 16),
               ListTile(
                 contentPadding: EdgeInsets.zero,
                 title: const Text('Target Date'),
diff --git a/lib/features/finance/presentation/screens/tabs/accounts/accounts_tab_new.dart b/lib/features/finance/presentation/screens/tabs/accounts/accounts_tab_new.dart
index 360c225..021825c 100644
--- a/lib/features/finance/presentation/screens/tabs/accounts/accounts_tab_new.dart
+++ b/lib/features/finance/presentation/screens/tabs/accounts/accounts_tab_new.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:keep_track/core/settings/utils/currency_formatter.dart';
 import 'package:keep_track/core/theme/app_theme.dart';
 import 'package:keep_track/core/ui/responsive/desktop_aware_screen.dart';
+import 'package:keep_track/core/routing/app_router.dart';
 import 'package:intl/intl.dart';
 import 'package:keep_track/core/di/service_locator.dart';
 import 'package:keep_track/core/state/stream_builder_widget.dart';
@@ -285,8 +286,11 @@ class _AccountsTabNewState extends State<AccountsTabNew> {
       clipBehavior: Clip.antiAlias,
       child: InkWell(
         onTap: () {
-          // Navigate to account detail or show edit dialog
-          // You can implement navigation here
+          Navigator.pushNamed(
+            context,
+            AppRoutes.accountDetail,
+            arguments: account,
+          );
         },
         child: Padding(
           padding: const EdgeInsets.all(16),
diff --git a/lib/features/finance/presentation/screens/tabs/debts/debts_tab_new.dart b/lib/features/finance/presentation/screens/tabs/debts/debts_tab_new.dart
index 790cf87..09de2c2 100644
--- a/lib/features/finance/presentation/screens/tabs/debts/debts_tab_new.dart
+++ b/lib/features/finance/presentation/screens/tabs/debts/debts_tab_new.dart
@@ -45,6 +45,7 @@ class _DebtsTabNewState extends State<DebtsTabNew> {
 
   Future<void> _showRecordPaymentDialog(Debt debt) async {
     final amountController = TextEditingController();
+    final feeController = TextEditingController();
     String? selectedAccountId;
     String? selectedCategoryId;
 
@@ -71,8 +72,24 @@ class _DebtsTabNewState extends State<DebtsTabNew> {
                 decoration: InputDecoration(
                   labelText: 'Amount',
                   prefixText: currencyFormatter.currencySymbol,
-                  hintText:
-                      'Remaining: ${currencyFormatter.currencySymbol}${debt.remainingAmount.toStringAsFixed(2)}',
+                  hintText: debt.monthlyPaymentAmount > 0
+                      ? 'Suggested: ${debt.monthlyPaymentAmount.toStringAsFixed(2)}'
+                      : 'Enter payment amount',
+                  border: OutlineInputBorder(
+                    borderRadius: BorderRadius.circular(8),
+                  ),
+                ),
+                keyboardType: TextInputType.numberWithOptions(decimal: true),
+              ),
+              const SizedBox(height: 16),
+
+              // Fee Field
+              TextField(
+                controller: feeController,
+                decoration: InputDecoration(
+                  labelText: 'Fee Amount (Optional)',
+                  prefixText: currencyFormatter.currencySymbol,
+                  hintText: 'Processing/service fee',
                   border: OutlineInputBorder(
                     borderRadius: BorderRadius.circular(8),
                   ),
@@ -180,6 +197,7 @@ class _DebtsTabNewState extends State<DebtsTabNew> {
 
               // Call RPC function
               try {
+                final fee = double.tryParse(feeController.text) ?? 0;
                 await _supabaseService.client.rpc(
                   'create_debt_payment_transaction',
                   params: {
@@ -194,6 +212,7 @@ class _DebtsTabNewState extends State<DebtsTabNew> {
                     'p_date': DateTime.now().toIso8601String(),
                     'p_notes': null,
                     'p_debt_id': debt.id,
+                    'p_fee': fee,
                   },
                 );
 
@@ -224,6 +243,7 @@ class _DebtsTabNewState extends State<DebtsTabNew> {
     }
 
     amountController.dispose();
+    feeController.dispose();
   }
 
   @override
diff --git a/lib/features/finance/presentation/screens/tabs/goals/goals_tab.dart b/lib/features/finance/presentation/screens/tabs/goals/goals_tab.dart
index 9d3ebaa..24ad7af 100644
--- a/lib/features/finance/presentation/screens/tabs/goals/goals_tab.dart
+++ b/lib/features/finance/presentation/screens/tabs/goals/goals_tab.dart
@@ -49,6 +49,7 @@ class _GoalsTabNewState extends State<GoalsTabNew> {
           ? goal.monthlyContribution.toStringAsFixed(2)
           : '',
     );
+    final feeController = TextEditingController();
     String? selectedAccountId;
     String? selectedCategoryId;
 
@@ -65,7 +66,25 @@ class _GoalsTabNewState extends State<GoalsTabNew> {
                 controller: amountController,
                 decoration: InputDecoration(
                   labelText: 'Amount',
-                  prefixText: '₱',
+                  prefixText: currencyFormatter.currencySymbol,
+                  hintText: goal.monthlyContribution > 0
+                      ? 'Suggested: ${goal.monthlyContribution.toStringAsFixed(2)}'
+                      : 'Enter payment amount',
+                  border: OutlineInputBorder(
+                    borderRadius: BorderRadius.circular(8),
+                  ),
+                ),
+                keyboardType: TextInputType.numberWithOptions(decimal: true),
+              ),
+              const SizedBox(height: 16),
+
+              // Fee Field
+              TextField(
+                controller: feeController,
+                decoration: InputDecoration(
+                  labelText: 'Fee Amount (Optional)',
+                  prefixText: currencyFormatter.currencySymbol,
+                  hintText: 'Processing/management fee',
                   border: OutlineInputBorder(
                     borderRadius: BorderRadius.circular(8),
                   ),
@@ -162,6 +181,7 @@ class _GoalsTabNewState extends State<GoalsTabNew> {
 
               // Call RPC function
               try {
+                final fee = double.tryParse(feeController.text) ?? 0;
                 await _supabaseService.client.rpc(
                   'create_goal_payment_transaction',
                   params: {
@@ -174,6 +194,7 @@ class _GoalsTabNewState extends State<GoalsTabNew> {
                     'p_date': DateTime.now().toIso8601String(),
                     'p_notes': null,
                     'p_goal_id': goal.id,
+                    'p_fee': fee,
                   },
                 );
 
@@ -204,6 +225,7 @@ class _GoalsTabNewState extends State<GoalsTabNew> {
     }
 
     amountController.dispose();
+    feeController.dispose();
   }
 
   @override
diff --git a/lib/features/finance/presentation/state/debt_controller.dart b/lib/features/finance/presentation/state/debt_controller.dart
index 63e0ea6..e52b13a 100644
--- a/lib/features/finance/presentation/state/debt_controller.dart
+++ b/lib/features/finance/presentation/state/debt_controller.dart
@@ -1,4 +1,8 @@
+import 'package:keep_track/core/di/service_locator.dart';
 import 'package:keep_track/core/error/result.dart';
+import 'package:keep_track/core/logging/app_logger.dart';
+import 'package:keep_track/core/services/notification/notification_scheduler.dart';
+import 'package:keep_track/core/services/notification/platform_notification_helper.dart';
 import 'package:keep_track/core/state/stream_state.dart';
 import 'package:keep_track/shared/infrastructure/supabase/supabase_service.dart';
 import '../../modules/debt/domain/entities/debt.dart';
@@ -17,10 +21,39 @@ class DebtController extends StreamState<AsyncState<List<Debt>>> {
   /// Load all debts
   Future<void> loadDebts() async {
     await execute(() async {
-      return await _debtRepository.getDebts().then((r) => r.unwrap());
+      final debts = await _debtRepository.getDebts().then((r) => r.unwrap());
+      // Schedule notifications for debts with due dates
+      _scheduleDebtNotifications(debts);
+      return debts;
     });
   }
 
+  /// Schedule notifications for all active debts with due dates
+  Future<void> _scheduleDebtNotifications(List<Debt> debts) async {
+    if (!PlatformNotificationHelper.instance.isSupportedPlatform) return;
+
+    try {
+      final scheduler = locator.get<NotificationScheduler>();
+      final activeDebts = debts.where((d) =>
+          d.status == DebtStatus.active &&
+          d.dueDate != null &&
+          d.dueDate!.isAfter(DateTime.now()));
+
+      for (final debt in activeDebts) {
+        if (debt.id == null || debt.dueDate == null) continue;
+
+        await scheduler.scheduleDebtDueNotifications(
+          debtId: debt.id!,
+          personName: debt.personName,
+          amount: debt.remainingAmount,
+          dueDate: debt.dueDate!,
+        );
+      }
+    } catch (e) {
+      AppLogger.warning('DebtController: Failed to schedule notifications: $e');
+    }
+  }
+
   /// Create a new debt with category and automatically create associated transaction
   /// Uses RPC function for atomic operation
   Future<void> createDebtWithCategory(Debt debt, String? categoryId) async {
diff --git a/lib/features/finance/presentation/state/planned_payment_controller.dart b/lib/features/finance/presentation/state/planned_payment_controller.dart
index 8100fc8..e8324d6 100644
--- a/lib/features/finance/presentation/state/planned_payment_controller.dart
+++ b/lib/features/finance/presentation/state/planned_payment_controller.dart
@@ -1,4 +1,8 @@
+import 'package:keep_track/core/di/service_locator.dart';
 import 'package:keep_track/core/error/result.dart';
+import 'package:keep_track/core/logging/app_logger.dart';
+import 'package:keep_track/core/services/notification/notification_scheduler.dart';
+import 'package:keep_track/core/services/notification/platform_notification_helper.dart';
 import 'package:keep_track/core/state/stream_state.dart';
 import '../../modules/planned_payment/domain/entities/payment_enums.dart';
 import '../../modules/planned_payment/domain/entities/planned_payment.dart';
@@ -19,10 +23,37 @@ class PlannedPaymentController
       final result = await _repository.getPlannedPayments().then(
         (r) => r.unwrap(),
       );
+      // Schedule notifications for upcoming payments
+      _schedulePaymentNotifications(result);
       return result;
     });
   }
 
+  /// Schedule notifications for all active planned payments
+  Future<void> _schedulePaymentNotifications(List<PlannedPayment> payments) async {
+    if (!PlatformNotificationHelper.instance.isSupportedPlatform) return;
+
+    try {
+      final scheduler = locator.get<NotificationScheduler>();
+      final activePayments = payments.where((p) =>
+          p.status == PaymentStatus.active &&
+          p.nextPaymentDate.isAfter(DateTime.now()));
+
+      for (final payment in activePayments) {
+        if (payment.id == null) continue;
+
+        await scheduler.schedulePaymentDueNotifications(
+          paymentId: payment.id!,
+          name: payment.name,
+          amount: payment.amount,
+          dueDate: payment.nextPaymentDate,
+        );
+      }
+    } catch (e) {
+      AppLogger.warning('PlannedPaymentController: Failed to schedule notifications: $e');
+    }
+  }
+
   /// Create a new planned payment
   Future<void> createPlannedPayment(PlannedPayment payment) async {
     await execute(() async {
diff --git a/lib/features/home/home_screen.dart b/lib/features/home/home_screen.dart
index 5069f64..4a90b88 100644
--- a/lib/features/home/home_screen.dart
+++ b/lib/features/home/home_screen.dart
@@ -10,8 +10,10 @@ import 'package:keep_track/core/ui/ui.dart';
 import 'package:keep_track/core/routing/app_router.dart';
 import 'package:keep_track/features/finance/modules/account/domain/entities/account.dart';
 import 'package:keep_track/features/finance/modules/budget/domain/entities/budget.dart';
+import 'package:keep_track/features/finance/modules/transaction/domain/entities/transaction.dart';
 import 'package:keep_track/features/finance/presentation/state/account_controller.dart';
 import 'package:keep_track/features/finance/presentation/state/budget_controller.dart';
+import 'package:keep_track/features/finance/presentation/state/transaction_controller.dart';
 import 'package:keep_track/features/home/widgets/admin_panel_widget.dart';
 
 class HomeScreen extends ScopedScreen {
@@ -25,11 +27,15 @@ class _HomeScreenState extends ScopedScreenState<HomeScreen>
     with AppLayoutControlled {
   late final AccountController _accountController;
   late final BudgetController _budgetController;
+  late final TransactionController _transactionController;
+  int _daysToShow = 15; // Adjustable days for bar graph
+  Set<String> _selectedTypes = {'income', 'expense', 'transfer'};
 
   @override
   void registerServices() {
     _accountController = locator.get<AccountController>();
     _budgetController = locator.get<BudgetController>();
+    _transactionController = locator.get<TransactionController>();
   }
 
   @override
@@ -37,6 +43,13 @@ class _HomeScreenState extends ScopedScreenState<HomeScreen>
     configureLayout(title: 'Home', showBottomNav: true);
     _accountController.loadAccounts();
     _budgetController.loadBudgets();
+    _loadTransactionsForGraph();
+  }
+
+  void _loadTransactionsForGraph() {
+    final endDate = DateTime.now();
+    final startDate = endDate.subtract(Duration(days: _daysToShow));
+    _transactionController.loadTransactionsByDateRange(startDate, endDate);
   }
 
   String _getGreeting() {
@@ -74,6 +87,10 @@ class _HomeScreenState extends ScopedScreenState<HomeScreen>
                     _buildWelcomeSection(isDesktop),
                     SizedBox(height: isDesktop ? AppSpacing.xl : AppSpacing.lg),
 
+                    // Income/Expense Bar Graph
+                    _buildIncomeExpenseGraph(isDesktop),
+                    SizedBox(height: isDesktop ? AppSpacing.xl : AppSpacing.lg),
+
                     // Desktop: Two-column layout, Mobile: Single column
                     if (isDesktop)
                       Row(
@@ -130,6 +147,432 @@ class _HomeScreenState extends ScopedScreenState<HomeScreen>
     return Icons.nightlight_round;
   }
 
+  Widget _buildIncomeExpenseGraph(bool isDesktop) {
+    return AsyncStreamBuilder<List<Transaction>>(
+      state: _transactionController,
+      loadingBuilder: (_) => Card(
+        elevation: 0,
+        margin: EdgeInsets.zero,
+        child: Container(
+          height: isDesktop ? 350 : 300,
+          alignment: Alignment.center,
+          child: const CircularProgressIndicator(),
+        ),
+      ),
+      errorBuilder: (context, message) => Card(
+        elevation: 0,
+        margin: EdgeInsets.zero,
+        child: Padding(
+          padding: const EdgeInsets.all(20),
+          child: Text('Error loading transactions: $message'),
+        ),
+      ),
+      builder: (context, transactions) {
+        // Process real transaction data into daily aggregates
+        final List<DailyFinanceData> data = _processTransactionsToDaily(transactions);
+        final maxAmount = data.fold<double>(
+          0,
+          (max, d) {
+            final dayMax = [d.income, d.expense, d.transfer].reduce((a, b) => a > b ? a : b);
+            return dayMax > max ? dayMax : max;
+          },
+        );
+
+        return Card(
+          elevation: 0,
+          margin: EdgeInsets.zero,
+          child: Padding(
+            padding: const EdgeInsets.all(20),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                // Header with title and days selector
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: [
+                    const Text(
+                      'Daily Income & Expense',
+                      style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+                    ),
+                    // Days selector
+                    Container(
+                      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+                      decoration: BoxDecoration(
+                        color: Theme.of(context).colorScheme.surfaceContainerHighest,
+                        borderRadius: BorderRadius.circular(8),
+                      ),
+                      child: DropdownButton<int>(
+                        value: _daysToShow,
+                        isDense: true,
+                        underline: const SizedBox(),
+                        items: [7, 15, 30].map((days) {
+                          return DropdownMenuItem<int>(
+                            value: days,
+                            child: Text(
+                              '$days days',
+                              style: const TextStyle(fontSize: 12),
+                            ),
+                          );
+                        }).toList(),
+                        onChanged: (value) {
+                          if (value != null) {
+                            setState(() {
+                              _daysToShow = value;
+                              _loadTransactionsForGraph();
+                            });
+                          }
+                        },
+                      ),
+                    ),
+                  ],
+                ),
+                const SizedBox(height: 12),
+                // Transaction type filter chips
+                Wrap(
+                  spacing: 8,
+                  runSpacing: 8,
+                  children: [
+                    _buildFilterChip('income', 'Income', Colors.green),
+                    _buildFilterChip('expense', 'Expense', Colors.red),
+                    _buildFilterChip('transfer', 'Transfer', Colors.blue),
+                  ],
+                ),
+                const SizedBox(height: 16),
+                // Bar Graph
+                SizedBox(
+                  height: isDesktop ? 200 : 160,
+                  child: data.isEmpty
+                      ? Center(
+                          child: Column(
+                            mainAxisAlignment: MainAxisAlignment.center,
+                            children: [
+                              Icon(
+                                Icons.bar_chart,
+                                size: 48,
+                                color: Theme.of(context).colorScheme.onSurface.withOpacity(0.3),
+                              ),
+                              const SizedBox(height: 8),
+                              Text(
+                                'No transactions in this period',
+                                style: TextStyle(
+                                  color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
+                                ),
+                              ),
+                            ],
+                          ),
+                        )
+                      : LayoutBuilder(
+                          builder: (context, constraints) {
+                            final barWidth = (constraints.maxWidth - (data.length - 1) * 6) / (data.length * 3);
+                            final clampedBarWidth = barWidth.clamp(3.0, 16.0);
+
+                            final selectedCount = _selectedTypes.length;
+                            final adjustedBarWidth = selectedCount > 0
+                                ? (constraints.maxWidth - (data.length - 1) * 6) / (data.length * selectedCount)
+                                : clampedBarWidth;
+                            final adjustedClampedBarWidth = adjustedBarWidth.clamp(3.0, 20.0);
+
+                            return Row(
+                              crossAxisAlignment: CrossAxisAlignment.end,
+                              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                              children: data.map((dayData) {
+                                final incomeHeight = maxAmount > 0 && _selectedTypes.contains('income')
+                                    ? (dayData.income / maxAmount) * (isDesktop ? 160 : 120)
+                                    : 0.0;
+                                final expenseHeight = maxAmount > 0 && _selectedTypes.contains('expense')
+                                    ? (dayData.expense / maxAmount) * (isDesktop ? 160 : 120)
+                                    : 0.0;
+                                final transferHeight = maxAmount > 0 && _selectedTypes.contains('transfer')
+                                    ? (dayData.transfer / maxAmount) * (isDesktop ? 160 : 120)
+                                    : 0.0;
+
+                                final tooltipLines = <String>[DateFormat('MMM d').format(dayData.date)];
+                                if (_selectedTypes.contains('income')) {
+                                  tooltipLines.add('Income: ${currencyFormatter.currencySymbol}${NumberFormat('#,##0').format(dayData.income)}');
+                                }
+                                if (_selectedTypes.contains('expense')) {
+                                  tooltipLines.add('Expense: ${currencyFormatter.currencySymbol}${NumberFormat('#,##0').format(dayData.expense)}');
+                                }
+                                if (_selectedTypes.contains('transfer')) {
+                                  tooltipLines.add('Transfer: ${currencyFormatter.currencySymbol}${NumberFormat('#,##0').format(dayData.transfer)}');
+                                }
+
+                                return Tooltip(
+                                  message: tooltipLines.join('\n'),
+                                  child: Column(
+                                    mainAxisAlignment: MainAxisAlignment.end,
+                                    children: [
+                                      Row(
+                                        crossAxisAlignment: CrossAxisAlignment.end,
+                                        children: [
+                                          // Income bar
+                                          if (_selectedTypes.contains('income'))
+                                            AnimatedContainer(
+                                              duration: const Duration(milliseconds: 300),
+                                              width: adjustedClampedBarWidth,
+                                              height: incomeHeight,
+                                              decoration: BoxDecoration(
+                                                color: Colors.green.withValues(alpha: 0.8),
+                                                borderRadius: const BorderRadius.vertical(
+                                                  top: Radius.circular(3),
+                                                ),
+                                              ),
+                                            ),
+                                          if (_selectedTypes.contains('income') && _selectedTypes.length > 1)
+                                            const SizedBox(width: 1),
+                                          // Expense bar
+                                          if (_selectedTypes.contains('expense'))
+                                            AnimatedContainer(
+                                              duration: const Duration(milliseconds: 300),
+                                              width: adjustedClampedBarWidth,
+                                              height: expenseHeight,
+                                              decoration: BoxDecoration(
+                                                color: Colors.red.withValues(alpha: 0.8),
+                                                borderRadius: const BorderRadius.vertical(
+                                                  top: Radius.circular(3),
+                                                ),
+                                              ),
+                                            ),
+                                          if (_selectedTypes.contains('expense') && _selectedTypes.contains('transfer'))
+                                            const SizedBox(width: 1),
+                                          // Transfer bar
+                                          if (_selectedTypes.contains('transfer'))
+                                            AnimatedContainer(
+                                              duration: const Duration(milliseconds: 300),
+                                              width: adjustedClampedBarWidth,
+                                              height: transferHeight,
+                                              decoration: BoxDecoration(
+                                                color: Colors.blue.withValues(alpha: 0.8),
+                                                borderRadius: const BorderRadius.vertical(
+                                                  top: Radius.circular(3),
+                                                ),
+                                              ),
+                                            ),
+                                        ],
+                                      ),
+                                      const SizedBox(height: 4),
+                                      // Date label
+                                      Text(
+                                        DateFormat('d').format(dayData.date),
+                                        style: TextStyle(
+                                          fontSize: 9,
+                                          color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
+                                        ),
+                                      ),
+                                    ],
+                                  ),
+                                );
+                              }).toList(),
+                            );
+                          },
+                        ),
+                ),
+                const SizedBox(height: 12),
+                // Summary row - only show selected types
+                Row(
+                  children: [
+                    if (_selectedTypes.contains('income'))
+                      Expanded(
+                        child: _buildSummaryCard(
+                          'Income',
+                          data.fold<double>(0, (sum, d) => sum + d.income),
+                          Colors.green,
+                        ),
+                      ),
+                    if (_selectedTypes.contains('income') && _selectedTypes.length > 1)
+                      const SizedBox(width: 8),
+                    if (_selectedTypes.contains('expense'))
+                      Expanded(
+                        child: _buildSummaryCard(
+                          'Expense',
+                          data.fold<double>(0, (sum, d) => sum + d.expense),
+                          Colors.red,
+                        ),
+                      ),
+                    if (_selectedTypes.contains('expense') && _selectedTypes.contains('transfer'))
+                      const SizedBox(width: 8),
+                    if (_selectedTypes.contains('transfer'))
+                      Expanded(
+                        child: _buildSummaryCard(
+                          'Transfer',
+                          data.fold<double>(0, (sum, d) => sum + d.transfer),
+                          Colors.blue,
+                        ),
+                      ),
+                  ],
+                ),
+              ],
+            ),
+          ),
+        );
+      },
+    );
+  }
+
+  /// Process transactions into daily income/expense/transfer aggregates
+  List<DailyFinanceData> _processTransactionsToDaily(List<Transaction> transactions) {
+    final Map<String, DailyFinanceData> dailyMap = {};
+
+    // Initialize all days in the range with zero values
+    for (int i = _daysToShow - 1; i >= 0; i--) {
+      final date = DateTime.now().subtract(Duration(days: i));
+      final dateKey = DateFormat('yyyy-MM-dd').format(date);
+      dailyMap[dateKey] = DailyFinanceData(
+        date: DateTime(date.year, date.month, date.day),
+        income: 0,
+        expense: 0,
+        transfer: 0,
+      );
+    }
+
+    // Aggregate transactions by day
+    for (final transaction in transactions) {
+      final dateKey = DateFormat('yyyy-MM-dd').format(transaction.date);
+      if (dailyMap.containsKey(dateKey)) {
+        final existing = dailyMap[dateKey]!;
+        switch (transaction.type) {
+          case TransactionType.income:
+            dailyMap[dateKey] = DailyFinanceData(
+              date: existing.date,
+              income: existing.income + transaction.amount,
+              expense: existing.expense,
+              transfer: existing.transfer,
+            );
+            break;
+          case TransactionType.expense:
+            dailyMap[dateKey] = DailyFinanceData(
+              date: existing.date,
+              income: existing.income,
+              expense: existing.expense + transaction.totalCost,
+              transfer: existing.transfer,
+            );
+            break;
+          case TransactionType.transfer:
+            dailyMap[dateKey] = DailyFinanceData(
+              date: existing.date,
+              income: existing.income,
+              expense: existing.expense,
+              transfer: existing.transfer + transaction.amount,
+            );
+            break;
+        }
+      }
+    }
+
+    // Convert to sorted list
+    final result = dailyMap.values.toList();
+    result.sort((a, b) => a.date.compareTo(b.date));
+    return result;
+  }
+
+  Widget _buildLegendIndicator(Color color, String label) {
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Container(
+          width: 12,
+          height: 12,
+          decoration: BoxDecoration(
+            color: color.withValues(alpha: 0.8),
+            borderRadius: BorderRadius.circular(2),
+          ),
+        ),
+        const SizedBox(width: 4),
+        Text(
+          label,
+          style: TextStyle(
+            fontSize: 12,
+            color: Theme.of(context).colorScheme.onSurface.withOpacity(0.7),
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildFilterChip(String type, String label, Color color) {
+    final isSelected = _selectedTypes.contains(type);
+    return FilterChip(
+      label: Text(
+        label,
+        style: TextStyle(
+          fontSize: 12,
+          color: isSelected ? Colors.white : color,
+          fontWeight: isSelected ? FontWeight.w600 : FontWeight.normal,
+        ),
+      ),
+      selected: isSelected,
+      onSelected: (selected) {
+        setState(() {
+          if (selected) {
+            _selectedTypes.add(type);
+          } else {
+            if (_selectedTypes.length > 1) {
+              _selectedTypes.remove(type);
+            }
+          }
+        });
+      },
+      selectedColor: color,
+      backgroundColor: color.withValues(alpha: 0.1),
+      checkmarkColor: Colors.white,
+      side: BorderSide(color: color.withValues(alpha: 0.3)),
+      padding: const EdgeInsets.symmetric(horizontal: 4),
+      visualDensity: VisualDensity.compact,
+    );
+  }
+
+  Widget _buildSummaryCard(String title, double amount, Color color) {
+    return Container(
+      padding: const EdgeInsets.all(12),
+      decoration: BoxDecoration(
+        color: color.withValues(alpha: 0.1),
+        borderRadius: BorderRadius.circular(8),
+        border: Border.all(color: color.withValues(alpha: 0.2)),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            title,
+            style: TextStyle(
+              fontSize: 11,
+              color: color.withValues(alpha: 0.8),
+              fontWeight: FontWeight.w500,
+            ),
+          ),
+          const SizedBox(height: 4),
+          Text(
+            '${currencyFormatter.currencySymbol}${NumberFormat('#,##0.00').format(amount)}',
+            style: TextStyle(
+              fontSize: 16,
+              fontWeight: FontWeight.bold,
+              color: color,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  List<DailyFinanceData> _generateDummyFinanceData() {
+    final random = DateTime.now().millisecondsSinceEpoch;
+    final List<DailyFinanceData> data = [];
+
+    for (int i = _daysToShow - 1; i >= 0; i--) {
+      final date = DateTime.now().subtract(Duration(days: i));
+      // Generate somewhat realistic dummy data
+      final baseIncome = (random + i * 1000) % 500 + 100;
+      final baseExpense = (random + i * 500) % 400 + 50;
+      data.add(DailyFinanceData(
+        date: date,
+        income: baseIncome.toDouble() * (1 + (i % 3) * 0.3),
+        expense: baseExpense.toDouble() * (1 + (i % 4) * 0.25),
+      ));
+    }
+
+    return data;
+  }
+
   Widget _buildFinanceSnapshot(bool isDesktop) {
     return AsyncStreamBuilder<List<Account>>(
       state: _accountController,
@@ -705,3 +1148,18 @@ class _HomeScreenState extends ScopedScreenState<HomeScreen>
     );
   }
 }
+
+// Data class for daily finance data
+class DailyFinanceData {
+  final DateTime date;
+  final double income;
+  final double expense;
+  final double transfer;
+
+  DailyFinanceData({
+    required this.date,
+    required this.income,
+    required this.expense,
+    this.transfer = 0,
+  });
+}
diff --git a/lib/features/home/task_home_screen.dart b/lib/features/home/task_home_screen.dart
index 7881159..f20568d 100644
--- a/lib/features/home/task_home_screen.dart
+++ b/lib/features/home/task_home_screen.dart
@@ -18,9 +18,11 @@ import '../module_selection/task_module_screen.dart';
 import 'package:keep_track/core/theme/app_theme.dart';
 import 'package:keep_track/core/ui/responsive/desktop_aware_screen.dart';
 
+import '../tasks/modules/buckets/domain/entities/bucket.dart';
 import '../tasks/presentation/screens/tabs/task/create_task_page.dart';
+import '../tasks/presentation/state/bucket_controller.dart';
 
-enum TaskTimeFilter { current, week, month, noDate }
+enum TaskTimeFilter { today, sevenDays, thirtyDays, all }
 
 enum TaskSortOption { priority, dueDate, status }
 
@@ -36,16 +38,19 @@ class _TaskHomeScreenState extends ScopedScreenState<TaskHomeScreen>
     with AppLayoutControlled {
   late final TaskController _taskController;
   late final ProjectController _projectController;
+  late final BucketController _bucketController;
   late final SupabaseService _supabaseService;
 
-  TaskTimeFilter _timeFilter = TaskTimeFilter.current;
+  TaskTimeFilter _timeFilter = TaskTimeFilter.today;
   TaskSortOption _sortOption = TaskSortOption.priority;
-
   @override
   void registerServices() {
     _taskController = locator.get<TaskController>();
     _projectController = locator.get<ProjectController>();
     _supabaseService = locator.get<SupabaseService>();
+    _bucketController = locator.get<BucketController>();
+
+    _bucketController.loadBuckets();
   }
 
   @override
@@ -80,98 +85,106 @@ class _TaskHomeScreenState extends ScopedScreenState<TaskHomeScreen>
               .where((p) => p.status == ProjectStatus.active && !p.isArchived)
               .toList();
 
-          return Dialog(
-            child: Container(
-              width: 600,
-              constraints: const BoxConstraints(maxHeight: 700),
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  // Header
-                  Container(
-                    padding: const EdgeInsets.all(16),
-                    decoration: BoxDecoration(
-                      border: Border(
-                        bottom: BorderSide(color: Colors.grey[300]!),
-                      ),
-                    ),
-                    child: Row(
-                      children: [
-                        const Expanded(
-                          child: Text(
-                            'Create Task',
-                            style: TextStyle(
-                              fontSize: 20,
-                              fontWeight: FontWeight.bold,
-                            ),
+          return AsyncStreamBuilder<List<Bucket>>(
+            state: _bucketController,
+            builder: (context, buckets) {
+              return Dialog(
+                child: Container(
+                  width: 600,
+                  constraints: const BoxConstraints(maxHeight: 700),
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      // Header
+                      Container(
+                        padding: const EdgeInsets.all(16),
+                        decoration: BoxDecoration(
+                          border: Border(
+                            bottom: BorderSide(color: Colors.grey[300]!),
                           ),
                         ),
-                        IconButton(
-                          icon: const Icon(Icons.close),
-                          onPressed: () => Navigator.pop(context),
+                        child: Row(
+                          children: [
+                            const Expanded(
+                              child: Text(
+                                'Create Task',
+                                style: TextStyle(
+                                  fontSize: 20,
+                                  fontWeight: FontWeight.bold,
+                                ),
+                              ),
+                            ),
+                            IconButton(
+                              icon: const Icon(Icons.close),
+                              onPressed: () => Navigator.pop(context),
+                            ),
+                          ],
                         ),
-                      ],
-                    ),
-                  ),
+                      ),
 
-                  // Content
-                  Expanded(
-                    child: TaskManagementDialog(
-                      userId: _supabaseService.userId!,
-                      projects: activeProjects,
-                      useDialogContent: true,
-                      onSave: (newTask) async {
-                        try {
-                          await _taskController.createTask(newTask);
-                          if (mounted) {
-                            ScaffoldMessenger.of(context).showSnackBar(
-                              const SnackBar(
-                                content: Text('Task created successfully'),
-                                backgroundColor: Colors.green,
-                              ),
-                            );
-                            Navigator.pop(context);
-                          }
-                        } catch (e) {
-                          if (mounted) {
-                            ScaffoldMessenger.of(context).showSnackBar(
-                              SnackBar(
-                                content: Text('Error: ${e.toString()}'),
-                                backgroundColor: Colors.red,
-                              ),
-                            );
-                          }
-                        }
-                      },
-                    ),
-                  ),
+                      // Content
+                      Expanded(
+                        child: TaskManagementDialog(
+                          userId: _supabaseService.userId!,
+                          projects: activeProjects,
+                          buckets: buckets,
+                          useDialogContent: true,
+                          onSave: (newTask) async {
+                            try {
+                              await _taskController.createTask(newTask);
+                              if (mounted) {
+                                ScaffoldMessenger.of(context).showSnackBar(
+                                  const SnackBar(
+                                    content: Text('Task created successfully'),
+                                    backgroundColor: Colors.green,
+                                  ),
+                                );
+                                Navigator.pop(context);
+                              }
+                            } catch (e) {
+                              if (mounted) {
+                                ScaffoldMessenger.of(context).showSnackBar(
+                                  SnackBar(
+                                    content: Text('Error: ${e.toString()}'),
+                                    backgroundColor: Colors.red,
+                                  ),
+                                );
+                              }
+                            }
+                          },
+                        ),
+                      ),
 
-                  // Footer with "View Full Page" button
-                  Container(
-                    padding: const EdgeInsets.all(16),
-                    decoration: BoxDecoration(
-                      border: Border(top: BorderSide(color: Colors.grey[300]!)),
-                    ),
-                    child: SizedBox(
-                      width: double.infinity,
-                      child: OutlinedButton.icon(
-                        icon: const Icon(Icons.open_in_full),
-                        label: const Text('View Full Page'),
-                        onPressed: () {
-                          Navigator.pop(context);
-                          Navigator.push(
-                            context,
-                            MaterialPageRoute(
-                              builder: (context) => const CreateTaskPage(),
-                            ),
-                          );
-                        },
+                      // Footer with "View Full Page" button
+                      Container(
+                        padding: const EdgeInsets.all(16),
+                        decoration: BoxDecoration(
+                          border: Border(
+                            top: BorderSide(color: Colors.grey[300]!),
+                          ),
+                        ),
+                        child: SizedBox(
+                          width: double.infinity,
+                          child: OutlinedButton.icon(
+                            icon: const Icon(Icons.open_in_full),
+                            label: const Text('View Full Page'),
+                            onPressed: () {
+                              Navigator.pop(context);
+                              Navigator.push(
+                                context,
+                                MaterialPageRoute(
+                                  builder: (context) => const CreateTaskPage(),
+                                ),
+                              );
+                            },
+                          ),
+                        ),
                       ),
-                    ),
+                    ],
                   ),
-                ],
-              ),
-            ),
+                ),
+              );
+            },
           );
         },
       ),
@@ -198,7 +211,11 @@ class _TaskHomeScreenState extends ScopedScreenState<TaskHomeScreen>
     return DesktopAwareScreen(
       builder: (context, isDesktop) {
         return Scaffold(
-          backgroundColor: isDesktop ? (Theme.of(context).brightness == Brightness.dark ? const Color(0xFF09090B) : AppColors.backgroundSecondary) : null,
+          backgroundColor: isDesktop
+              ? (Theme.of(context).brightness == Brightness.dark
+                    ? const Color(0xFF09090B)
+                    : AppColors.backgroundSecondary)
+              : null,
           body: SingleChildScrollView(
             padding: EdgeInsets.all(isDesktop ? AppSpacing.xl : 16),
             child: Center(
@@ -220,17 +237,8 @@ class _TaskHomeScreenState extends ScopedScreenState<TaskHomeScreen>
                       Row(
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
-                          // Left Column - Task Snapshot & Current Tasks
-                          Expanded(
-                            flex: 2,
-                            child: Column(
-                              children: [
-                                _buildTaskSnapshot(isDesktop),
-                                const SizedBox(height: AppSpacing.xl),
-                                _buildCurrentTasks(),
-                              ],
-                            ),
-                          ),
+                          // Left Column - Tasks
+                          Expanded(flex: 2, child: _buildCurrentTasks()),
                           const SizedBox(width: AppSpacing.xl),
                           // Right Column - Projects & Quick Actions
                           Expanded(
@@ -247,8 +255,6 @@ class _TaskHomeScreenState extends ScopedScreenState<TaskHomeScreen>
                       )
                     else ...[
                       // Mobile: Stack vertically
-                      _buildTaskSnapshot(isDesktop),
-                      const SizedBox(height: 24),
                       _buildCurrentTasks(),
                       const SizedBox(height: 24),
                       _buildProjectOverview(),
@@ -464,193 +470,54 @@ class _TaskHomeScreenState extends ScopedScreenState<TaskHomeScreen>
     );
   }
 
-  Widget _buildTaskSnapshot(bool isDesktop) {
-    return AsyncStreamBuilder(
-      state: _taskController,
-      builder: (context, tasks) {
-        final totalTasks = tasks.where((t) => !t.isArchived).length;
-        final completedTasks = tasks
-            .where((t) => t.isCompleted && !t.isArchived)
-            .length;
-        final inProgressTasks = tasks
-            .where((t) => t.status == TaskStatus.inProgress && !t.isArchived)
-            .length;
-        final todayTasks = tasks.where((t) {
-          if (t.dueDate == null || t.isArchived) return false;
-          final today = DateTime.now();
-          return t.dueDate!.year == today.year &&
-              t.dueDate!.month == today.month &&
-              t.dueDate!.day == today.day;
-        }).length;
-        final overdueTasks = tasks.where((t) {
-          if (t.dueDate == null || t.isArchived || t.isCompleted) return false;
-          return t.dueDate!.isBefore(DateTime.now());
-        }).length;
-        final noDateTasks = tasks
-            .where((t) => t.dueDate == null && !t.isArchived && !t.isCompleted)
-            .length;
-
-        return Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            if (isDesktop)
-              Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  const Text(
-                    'Task Overview',
-                    style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
-                  ),
-                  ElevatedButton.icon(
-                    onPressed: _handleCreateTask,
-                    icon: const Icon(Icons.add, size: 20),
-                    label: const Text('New Task'),
-                    style: ElevatedButton.styleFrom(
-                      padding: const EdgeInsets.symmetric(
-                        horizontal: 20,
-                        vertical: 12,
-                      ),
-                    ),
-                  ),
-                ],
-              )
-            else
-              const Text(
-                'Task Overview',
-                style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
-              ),
-            const SizedBox(height: 16),
-            Row(
-              children: [
-                Expanded(
-                  child: _buildStatCard(
-                    'Total Tasks',
-                    totalTasks.toString(),
-                    Icons.task_alt,
-                    Colors.blue,
-                  ),
-                ),
-                const SizedBox(width: 12),
-                Expanded(
-                  child: _buildStatCard(
-                    'In Progress',
-                    inProgressTasks.toString(),
-                    Icons.play_circle_outline,
-                    Colors.blue[700]!,
-                  ),
-                ),
-              ],
-            ),
-            const SizedBox(height: 12),
-            Row(
-              children: [
-                Expanded(
-                  child: _buildStatCard(
-                    'Completed',
-                    completedTasks.toString(),
-                    Icons.check_circle,
-                    Colors.green,
-                  ),
-                ),
-                const SizedBox(width: 12),
-                Expanded(
-                  child: _buildStatCard(
-                    'Due Today',
-                    todayTasks.toString(),
-                    Icons.today,
-                    Colors.purple,
-                  ),
-                ),
-              ],
-            ),
-            const SizedBox(height: 12),
-            Row(
-              children: [
-                Expanded(
-                  child: _buildStatCard(
-                    'Overdue',
-                    overdueTasks.toString(),
-                    Icons.warning_amber_rounded,
-                    Colors.red,
-                  ),
-                ),
-                const SizedBox(width: 12),
-                Expanded(
-                  child: _buildStatCard(
-                    'No Date',
-                    noDateTasks.toString(),
-                    Icons.event_busy,
-                    Colors.grey,
-                  ),
-                ),
-              ],
-            ),
-          ],
-        );
-      },
-    );
-  }
-
-  Widget _buildStatCard(
-    String title,
-    String value,
-    IconData icon,
-    Color color,
-  ) {
-    return Container(
-      padding: const EdgeInsets.all(16),
-      decoration: BoxDecoration(
-        color: color.withOpacity(0.1),
-        borderRadius: BorderRadius.circular(12),
-        border: Border.all(color: color.withOpacity(0.3)),
-      ),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Icon(icon, color: color, size: 24),
-          const SizedBox(height: 8),
-          Text(
-            value,
-            style: TextStyle(
-              fontSize: 24,
-              fontWeight: FontWeight.bold,
-              color: color,
-            ),
-          ),
-          const SizedBox(height: 4),
-          Text(title, style: TextStyle(fontSize: 12, color: Colors.grey[700])),
-        ],
-      ),
-    );
-  }
-
   List<Task> _filterTasks(List<Task> tasks) {
     final now = DateTime.now();
     final today = DateTime(now.year, now.month, now.day);
+    final todayEnd = today.add(const Duration(days: 1));
 
     switch (_timeFilter) {
-      case TaskTimeFilter.current:
-        return tasks
-            .where((t) => t.status == TaskStatus.inProgress && !t.isArchived)
-            .toList();
-      case TaskTimeFilter.week:
-        final weekEnd = today.add(const Duration(days: 7));
+      case TaskTimeFilter.today:
         return tasks.where((t) {
-          if (t.isArchived || t.isCompleted) return false;
+          if (t.isArchived) return false;
           if (t.dueDate == null) return false;
-          return t.dueDate!.isAfter(today) && t.dueDate!.isBefore(weekEnd);
+          final taskDate = DateTime(
+            t.dueDate!.year,
+            t.dueDate!.month,
+            t.dueDate!.day,
+          );
+          return taskDate.isAtSameMomentAs(today) ||
+              (t.dueDate!.isAfter(today) && t.dueDate!.isBefore(todayEnd));
         }).toList();
-      case TaskTimeFilter.month:
-        final monthEnd = today.add(const Duration(days: 30));
+      case TaskTimeFilter.sevenDays:
+        final endDate = today.add(const Duration(days: 7));
         return tasks.where((t) {
-          if (t.isArchived || t.isCompleted) return false;
+          if (t.isArchived) return false;
           if (t.dueDate == null) return false;
-          return t.dueDate!.isAfter(today) && t.dueDate!.isBefore(monthEnd);
+          final taskDate = DateTime(
+            t.dueDate!.year,
+            t.dueDate!.month,
+            t.dueDate!.day,
+          );
+          return (taskDate.isAtSameMomentAs(today) ||
+                  taskDate.isAfter(today)) &&
+              taskDate.isBefore(endDate);
         }).toList();
-      case TaskTimeFilter.noDate:
-        return tasks
-            .where((t) => t.dueDate == null && !t.isArchived && !t.isCompleted)
-            .toList();
+      case TaskTimeFilter.thirtyDays:
+        final endDate = today.add(const Duration(days: 30));
+        return tasks.where((t) {
+          if (t.isArchived) return false;
+          if (t.dueDate == null) return false;
+          final taskDate = DateTime(
+            t.dueDate!.year,
+            t.dueDate!.month,
+            t.dueDate!.day,
+          );
+          return (taskDate.isAtSameMomentAs(today) ||
+                  taskDate.isAfter(today)) &&
+              taskDate.isBefore(endDate);
+        }).toList();
+      case TaskTimeFilter.all:
+        return tasks.where((t) => !t.isArchived).toList();
     }
   }
 
@@ -698,12 +565,12 @@ class _TaskHomeScreenState extends ScopedScreenState<TaskHomeScreen>
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
                 const Text(
                   'Tasks',
                   style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
                 ),
+                const SizedBox(width: 12),
                 Text(
                   '${sortedTasks.length} task${sortedTasks.length != 1 ? 's' : ''}',
                   style: TextStyle(
@@ -712,6 +579,18 @@ class _TaskHomeScreenState extends ScopedScreenState<TaskHomeScreen>
                     ).colorScheme.onSurface.withOpacity(0.6),
                   ),
                 ),
+                const Spacer(),
+                ElevatedButton.icon(
+                  onPressed: _handleCreateTask,
+                  icon: const Icon(Icons.add, size: 18),
+                  label: const Text('New Task'),
+                  style: ElevatedButton.styleFrom(
+                    padding: const EdgeInsets.symmetric(
+                      horizontal: 16,
+                      vertical: 10,
+                    ),
+                  ),
+                ),
               ],
             ),
             const SizedBox(height: 12),
@@ -728,20 +607,20 @@ class _TaskHomeScreenState extends ScopedScreenState<TaskHomeScreen>
                   underline: const SizedBox(),
                   items: const [
                     DropdownMenuItem(
-                      value: TaskTimeFilter.current,
-                      child: Text('Current'),
+                      value: TaskTimeFilter.today,
+                      child: Text('Today'),
                     ),
                     DropdownMenuItem(
-                      value: TaskTimeFilter.week,
-                      child: Text('This Week'),
+                      value: TaskTimeFilter.sevenDays,
+                      child: Text('7 Days'),
                     ),
                     DropdownMenuItem(
-                      value: TaskTimeFilter.month,
-                      child: Text('This Month'),
+                      value: TaskTimeFilter.thirtyDays,
+                      child: Text('30 Days'),
                     ),
                     DropdownMenuItem(
-                      value: TaskTimeFilter.noDate,
-                      child: Text('No Date'),
+                      value: TaskTimeFilter.all,
+                      child: Text('All Tasks'),
                     ),
                   ],
                   onChanged: (value) {
@@ -853,40 +732,23 @@ class _TaskHomeScreenState extends ScopedScreenState<TaskHomeScreen>
   }
 
   Widget _buildTaskItem(Task task, List<Task> allTasks) {
-    Color priorityColor;
-    switch (task.priority) {
-      case TaskPriority.urgent:
-        priorityColor = Colors.red[700]!;
-        break;
-      case TaskPriority.high:
-        priorityColor = Colors.orange[700]!;
-        break;
-      case TaskPriority.medium:
-        priorityColor = Colors.blue[700]!;
-        break;
-      case TaskPriority.low:
-        priorityColor = Colors.grey[700]!;
-        break;
-    }
-
     final isOverdue =
         task.dueDate != null &&
         task.dueDate!.isBefore(DateTime.now()) &&
         !task.isCompleted;
+    final subtasks = allTasks.where((t) => t.parentTaskId == task.id).toList();
+    final subtaskCount = subtasks.length;
 
     return Container(
-      margin: const EdgeInsets.only(bottom: 12),
+      margin: const EdgeInsets.only(bottom: 8),
       decoration: BoxDecoration(
         color: isOverdue
             ? Colors.red.withOpacity(0.05)
             : Theme.of(context).colorScheme.surface.withOpacity(0.3),
         borderRadius: BorderRadius.circular(8),
-        border: Border.all(
-          color: isOverdue
-              ? Colors.red.withOpacity(0.5)
-              : Theme.of(context).colorScheme.outline.withOpacity(0.2),
-          width: isOverdue ? 1.5 : 1,
-        ),
+        border: isOverdue
+            ? Border.all(color: Colors.red.withOpacity(0.5), width: 1.5)
+            : null,
       ),
       child: InkWell(
         onTap: () {
@@ -907,79 +769,46 @@ class _TaskHomeScreenState extends ScopedScreenState<TaskHomeScreen>
           padding: const EdgeInsets.all(12.0),
           child: Row(
             children: [
-              // Checkbox to mark task as complete
+              // Priority indicator
+              Container(
+                width: 4,
+                height: 50,
+                decoration: BoxDecoration(
+                  color: _getPriorityColor(task.priority),
+                  borderRadius: BorderRadius.circular(2),
+                ),
+              ),
+              const SizedBox(width: 12),
+
+              // Checkbox
               Checkbox(
                 value: task.isCompleted,
                 onChanged: (value) async {
                   if (value != null) {
                     final updatedTask = task.copyWith(
-                      status: value
-                          ? TaskStatus.completed
-                          : TaskStatus.inProgress,
+                      status: value ? TaskStatus.completed : TaskStatus.todo,
                       completedAt: value ? DateTime.now() : null,
                     );
                     await _taskController.updateTask(updatedTask);
                   }
                 },
-                shape: RoundedRectangleBorder(
-                  borderRadius: BorderRadius.circular(4),
-                ),
               ),
               const SizedBox(width: 8),
-              Container(
-                width: 4,
-                height: 50,
-                decoration: BoxDecoration(
-                  color: priorityColor,
-                  borderRadius: BorderRadius.circular(2),
-                ),
-              ),
-              const SizedBox(width: 12),
+
+              // Task info
               Expanded(
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
-                    Row(
-                      children: [
-                        Expanded(
-                          child: Text(
-                            task.title,
-                            style: TextStyle(
-                              fontSize: 16,
-                              fontWeight: FontWeight.w600,
-                              decoration: task.isCompleted
-                                  ? TextDecoration.lineThrough
-                                  : null,
-                              color: task.isCompleted
-                                  ? Theme.of(
-                                      context,
-                                    ).colorScheme.onSurface.withOpacity(0.5)
-                                  : null,
-                            ),
-                            maxLines: 1,
-                            overflow: TextOverflow.ellipsis,
-                          ),
-                        ),
-                        if (isOverdue)
-                          Container(
-                            padding: const EdgeInsets.symmetric(
-                              horizontal: 6,
-                              vertical: 2,
-                            ),
-                            decoration: BoxDecoration(
-                              color: Colors.red,
-                              borderRadius: BorderRadius.circular(4),
-                            ),
-                            child: const Text(
-                              'OVERDUE',
-                              style: TextStyle(
-                                color: Colors.white,
-                                fontSize: 10,
-                                fontWeight: FontWeight.bold,
-                              ),
-                            ),
-                          ),
-                      ],
+                    Text(
+                      task.title,
+                      style: TextStyle(
+                        fontSize: 15,
+                        fontWeight: FontWeight.w600,
+                        decoration: task.isCompleted
+                            ? TextDecoration.lineThrough
+                            : null,
+                      ),
                     ),
                     if (task.description != null &&
                         task.description!.isNotEmpty) ...[
@@ -987,47 +816,96 @@ class _TaskHomeScreenState extends ScopedScreenState<TaskHomeScreen>
                       Text(
                         task.description!,
                         style: TextStyle(
-                          fontSize: 14,
+                          fontSize: 12,
                           color: Theme.of(
                             context,
                           ).colorScheme.onSurface.withOpacity(0.6),
-                          decoration: task.isCompleted
-                              ? TextDecoration.lineThrough
-                              : null,
                         ),
-                        maxLines: 1,
+                        maxLines: 2,
                         overflow: TextOverflow.ellipsis,
                       ),
                     ],
-                    if (task.dueDate != null) ...[
-                      const SizedBox(height: 4),
-                      Row(
-                        children: [
-                          Icon(
-                            Icons.calendar_today,
-                            size: 12,
-                            color: isOverdue
-                                ? Colors.red
-                                : Theme.of(
-                                    context,
-                                  ).colorScheme.onSurface.withOpacity(0.6),
+                    const SizedBox(height: 8),
+                    Wrap(
+                      spacing: 8,
+                      runSpacing: 4,
+                      children: [
+                        if (isOverdue)
+                          _buildTaskBadge(
+                            'OVERDUE',
+                            Colors.red,
+                            Icons.warning_amber_rounded,
                           ),
-                          const SizedBox(width: 4),
-                          Text(
-                            'Due: ${_formatDate(task.dueDate!)}',
-                            style: TextStyle(
-                              fontSize: 12,
-                              color: isOverdue
-                                  ? Colors.red
-                                  : Theme.of(
-                                      context,
-                                    ).colorScheme.onSurface.withOpacity(0.6),
-                              fontWeight: isOverdue ? FontWeight.w600 : null,
-                            ),
+                        _buildTaskBadge(
+                          task.priority.displayName,
+                          _getPriorityColor(task.priority),
+                          Icons.flag,
+                        ),
+                        _buildTaskBadge(
+                          task.status.displayName,
+                          _getStatusColor(task.status),
+                          Icons.circle,
+                        ),
+                        _buildTaskBadge(
+                          task.dueDate != null
+                              ? DateFormat(
+                                  'MMM d, h:mm a',
+                                ).format(task.dueDate!)
+                              : 'No date',
+                          task.dueDate != null
+                              ? (isOverdue ? Colors.red : Colors.grey[700]!)
+                              : Colors.grey[400]!,
+                          Icons.calendar_today,
+                        ),
+                        if (subtaskCount > 0)
+                          _buildTaskBadge(
+                            '$subtaskCount subtask${subtaskCount > 1 ? 's' : ''}',
+                            Colors.blue[700]!,
+                            Icons.list,
                           ),
-                        ],
-                      ),
-                    ],
+                        // Project badge
+                        if (task.projectId != null)
+                          Builder(
+                            builder: (context) {
+                              final project = _projectController.currentProjects
+                                  ?.where((p) => p.id == task.projectId)
+                                  .firstOrNull;
+                              if (project == null)
+                                return const SizedBox.shrink();
+                              final projectColor = project.color != null
+                                  ? Color(
+                                      int.parse(
+                                        project.color!.replaceFirst(
+                                          '#',
+                                          '0xff',
+                                        ),
+                                      ),
+                                    )
+                                  : Colors.blue[700]!;
+                              return _buildTaskBadge(
+                                project.name,
+                                projectColor,
+                                Icons.folder,
+                              );
+                            },
+                          ),
+                        // Bucket badge
+                        if (task.bucketId != null)
+                          Builder(
+                            builder: (context) {
+                              final bucket = _bucketController
+                                  .getBucketFromCurrentState(task.bucketId!);
+                              if (bucket == null)
+                                return const SizedBox.shrink();
+                              return _buildTaskBadge(
+                                bucket.name,
+                                Colors.purple[700]!,
+                                Icons.inbox,
+                              );
+                            },
+                          ),
+                      ],
+                    ),
                   ],
                 ),
               ),
@@ -1038,6 +916,58 @@ class _TaskHomeScreenState extends ScopedScreenState<TaskHomeScreen>
     );
   }
 
+  Widget _buildTaskBadge(String label, Color color, IconData icon) {
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+      decoration: BoxDecoration(
+        color: color.withOpacity(0.1),
+        borderRadius: BorderRadius.circular(12),
+        border: Border.all(color: color.withOpacity(0.3)),
+      ),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Icon(icon, size: 12, color: color),
+          const SizedBox(width: 4),
+          Text(
+            label,
+            style: TextStyle(
+              fontSize: 11,
+              fontWeight: FontWeight.w500,
+              color: color,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Color _getPriorityColor(TaskPriority priority) {
+    switch (priority) {
+      case TaskPriority.urgent:
+        return Colors.red[700]!;
+      case TaskPriority.high:
+        return Colors.orange[700]!;
+      case TaskPriority.medium:
+        return Colors.blue[700]!;
+      case TaskPriority.low:
+        return Colors.grey[600]!;
+    }
+  }
+
+  Color _getStatusColor(TaskStatus status) {
+    switch (status) {
+      case TaskStatus.todo:
+        return Colors.orange[700]!;
+      case TaskStatus.inProgress:
+        return Colors.purple[700]!;
+      case TaskStatus.completed:
+        return Colors.green[700]!;
+      case TaskStatus.cancelled:
+        return Colors.red[700]!;
+    }
+  }
+
   void _showTaskDrawer(Task task, List<Task> allTasks) {
     showGeneralDialog(
       context: context,
@@ -1058,14 +988,6 @@ class _TaskHomeScreenState extends ScopedScreenState<TaskHomeScreen>
         return SlideTransition(position: animation.drive(tween), child: child);
       },
       pageBuilder: (context, animation, secondaryAnimation) {
-        final subtasks = allTasks
-            .where((t) => t.parentTaskId == task.id)
-            .toList();
-        final isOverdue =
-            task.dueDate != null &&
-            task.dueDate!.isBefore(DateTime.now()) &&
-            !task.isCompleted;
-
         return Align(
           alignment: Alignment.centerRight,
           child: Container(
@@ -1081,130 +1003,7 @@ class _TaskHomeScreenState extends ScopedScreenState<TaskHomeScreen>
                 width: MediaQuery.of(context).size.width > 600
                     ? 500
                     : MediaQuery.of(context).size.width * 0.85,
-                decoration: BoxDecoration(
-                  color: Theme.of(context).scaffoldBackgroundColor,
-                ),
-                child: Column(
-                  children: [
-                    // Header
-                    Container(
-                      padding: const EdgeInsets.all(16),
-                      decoration: BoxDecoration(
-                        color: Theme.of(context).colorScheme.surface,
-                        border: Border(
-                          bottom: BorderSide(
-                            color: Theme.of(
-                              context,
-                            ).colorScheme.outline.withOpacity(0.2),
-                          ),
-                        ),
-                      ),
-                      child: Row(
-                        children: [
-                          Expanded(
-                            child: Text(
-                              'Task Details',
-                              style: Theme.of(context).textTheme.titleLarge
-                                  ?.copyWith(fontWeight: FontWeight.bold),
-                            ),
-                          ),
-                          IconButton(
-                            icon: const Icon(Icons.edit),
-                            onPressed: () {
-                              Navigator.pop(context);
-                              _showTaskEditDialog(task);
-                            },
-                            tooltip: 'Edit Task',
-                          ),
-                          IconButton(
-                            icon: const Icon(Icons.close),
-                            onPressed: () => Navigator.pop(context),
-                          ),
-                        ],
-                      ),
-                    ),
-
-                    // Quick task details preview
-                    Expanded(
-                      child: SingleChildScrollView(
-                        padding: const EdgeInsets.all(16),
-                        child: Column(
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            Text(
-                              task.title,
-                              style: Theme.of(context).textTheme.headlineSmall
-                                  ?.copyWith(fontWeight: FontWeight.bold),
-                            ),
-                            const SizedBox(height: 16),
-                            if (isOverdue)
-                              Chip(
-                                avatar: const Icon(
-                                  Icons.warning_amber_rounded,
-                                  color: Colors.red,
-                                  size: 18,
-                                ),
-                                label: const Text('OVERDUE'),
-                                backgroundColor: Colors.red.withOpacity(0.1),
-                                side: BorderSide(
-                                  color: Colors.red.withOpacity(0.5),
-                                ),
-                              ),
-                            if (task.description != null)
-                              Padding(
-                                padding: const EdgeInsets.only(top: 16),
-                                child: Text(task.description!),
-                              ),
-                            if (subtasks.isNotEmpty) ...[
-                              const SizedBox(height: 16),
-                              Text(
-                                '${subtasks.length} Subtask${subtasks.length > 1 ? 's' : ''}',
-                                style: const TextStyle(
-                                  fontWeight: FontWeight.w600,
-                                ),
-                              ),
-                            ],
-                          ],
-                        ),
-                      ),
-                    ),
-
-                    // Action Buttons
-                    Container(
-                      padding: const EdgeInsets.all(16),
-                      decoration: BoxDecoration(
-                        color: Theme.of(context).colorScheme.surface,
-                        border: Border(
-                          top: BorderSide(
-                            color: Theme.of(
-                              context,
-                            ).colorScheme.outline.withOpacity(0.2),
-                          ),
-                        ),
-                      ),
-                      child: SizedBox(
-                        width: double.infinity,
-                        child: OutlinedButton.icon(
-                          icon: const Icon(Icons.open_in_full),
-                          label: const Text('View Full Details'),
-                          onPressed: () {
-                            Navigator.pop(context);
-                            Navigator.push(
-                              context,
-                              MaterialPageRoute(
-                                builder: (context) =>
-                                    TaskDetailsPage(task: task),
-                              ),
-                            );
-                          },
-                          style: OutlinedButton.styleFrom(
-                            padding: const EdgeInsets.symmetric(vertical: 12),
-                          ),
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
+                child: TaskDetailsPage(task: task, isDrawerMode: true),
               ),
             ),
           ),
@@ -1385,12 +1184,13 @@ class _TaskHomeScreenState extends ScopedScreenState<TaskHomeScreen>
                   'Active Projects',
                   style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
                 ),
-                Text(
-                  '${activeProjects.length} project${activeProjects.length != 1 ? 's' : ''}',
-                  style: TextStyle(
-                    color: Theme.of(
-                      context,
-                    ).colorScheme.onSurface.withOpacity(0.6),
+                TextButton.icon(
+                  onPressed: () {
+                    Navigator.pushNamed(context, AppRoutes.projectManagement);
+                  },
+                  icon: const Icon(Icons.arrow_forward, size: 16),
+                  label: Text(
+                    '${activeProjects.length} project${activeProjects.length != 1 ? 's' : ''}',
                   ),
                 ),
               ],
@@ -1427,16 +1227,18 @@ class _TaskHomeScreenState extends ScopedScreenState<TaskHomeScreen>
                 ),
               )
             else
-              SizedBox(
-                height: 140,
-                child: ListView.builder(
-                  scrollDirection: Axis.horizontal,
-                  itemCount: activeProjects.length,
-                  itemBuilder: (context, index) {
-                    final project = activeProjects[index];
-                    return _buildProjectCard(project);
-                  },
-                ),
+              // Simplified list layout for projects
+              ListView.separated(
+                shrinkWrap: true,
+                physics: const NeverScrollableScrollPhysics(),
+                itemCount: activeProjects.length > 5
+                    ? 5
+                    : activeProjects.length,
+                separatorBuilder: (context, index) => const SizedBox(height: 8),
+                itemBuilder: (context, index) {
+                  final project = activeProjects[index];
+                  return _buildProjectCard(project);
+                },
               ),
           ],
         );
@@ -1444,64 +1246,122 @@ class _TaskHomeScreenState extends ScopedScreenState<TaskHomeScreen>
     );
   }
 
-  Widget _buildProjectCard(project) {
+  Widget _buildProjectCard(Project project) {
     final projectColor = project.color != null
         ? Color(int.parse(project.color!.replaceFirst('#', '0xff')))
         : Colors.blue[700]!;
 
-    return Container(
-      width: 160,
-      margin: const EdgeInsets.only(right: 12),
-      decoration: BoxDecoration(
-        gradient: LinearGradient(
-          colors: [projectColor, projectColor.withOpacity(0.7)],
-          begin: Alignment.topLeft,
-          end: Alignment.bottomRight,
-        ),
+    // Get bucket info
+    final bucket = _bucketController.getBucketFromCurrentState(
+      project.bucketId ?? '',
+    );
+
+    return Card(
+      elevation: 0,
+      shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.circular(12),
+        side: BorderSide(color: projectColor.withOpacity(0.3)),
       ),
-      child: Material(
-        color: Colors.transparent,
-        child: InkWell(
-          borderRadius: BorderRadius.circular(12),
-          onTap: () {
-            Navigator.pushNamed(
-              context,
-              AppRoutes.projectDetail,
-              arguments: project,
-            );
-          },
-          child: Padding(
-            padding: const EdgeInsets.all(16),
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Icon(Icons.folder, color: Colors.white, size: 32),
-                const SizedBox(height: 12),
-                Text(
-                  project.name,
-                  style: const TextStyle(
-                    color: Colors.white,
-                    fontSize: 16,
-                    fontWeight: FontWeight.bold,
-                  ),
-                  maxLines: 2,
-                  overflow: TextOverflow.ellipsis,
+      child: InkWell(
+        onTap: () {
+          Navigator.pushNamed(
+            context,
+            AppRoutes.projectDetail,
+            arguments: project,
+          );
+        },
+        borderRadius: BorderRadius.circular(12),
+        child: Padding(
+          padding: const EdgeInsets.all(16),
+          child: Row(
+            children: [
+              // Project Icon
+              Container(
+                padding: const EdgeInsets.all(12),
+                decoration: BoxDecoration(
+                  color: projectColor.withOpacity(0.1),
+                  borderRadius: BorderRadius.circular(10),
                 ),
-                const Spacer(),
-                if (project.description != null &&
-                    project.description!.isNotEmpty)
-                  Text(
-                    project.description!,
-                    style: TextStyle(
-                      color: Colors.white.withOpacity(0.9),
-                      fontSize: 12,
+                child: Icon(Icons.folder, color: projectColor, size: 24),
+              ),
+              const SizedBox(width: 16),
+              // Project Info
+              Expanded(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      project.name,
+                      style: const TextStyle(
+                        fontWeight: FontWeight.w600,
+                        fontSize: 16,
+                      ),
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
                     ),
-                    maxLines: 2,
-                    overflow: TextOverflow.ellipsis,
-                  ),
-              ],
-            ),
+                    const SizedBox(height: 4),
+                    Row(
+                      children: [
+                        // Status chip
+                        Container(
+                          padding: const EdgeInsets.symmetric(
+                            horizontal: 8,
+                            vertical: 3,
+                          ),
+                          decoration: BoxDecoration(
+                            color: Colors.green.withOpacity(0.1),
+                            borderRadius: BorderRadius.circular(6),
+                          ),
+                          child: Text(
+                            project.status.displayName,
+                            style: const TextStyle(
+                              fontSize: 12,
+                              color: Colors.green,
+                              fontWeight: FontWeight.w500,
+                            ),
+                          ),
+                        ),
+                        if (bucket != null) ...[
+                          const SizedBox(width: 8),
+                          // Bucket chip
+                          Container(
+                            padding: const EdgeInsets.symmetric(
+                              horizontal: 8,
+                              vertical: 3,
+                            ),
+                            decoration: BoxDecoration(
+                              color: Colors.purple.withOpacity(0.1),
+                              borderRadius: BorderRadius.circular(6),
+                            ),
+                            child: Row(
+                              mainAxisSize: MainAxisSize.min,
+                              children: [
+                                Icon(
+                                  Icons.inbox,
+                                  size: 12,
+                                  color: Colors.purple[700],
+                                ),
+                                const SizedBox(width: 4),
+                                Text(
+                                  bucket.name,
+                                  style: TextStyle(
+                                    fontSize: 12,
+                                    color: Colors.purple[700],
+                                    fontWeight: FontWeight.w500,
+                                  ),
+                                ),
+                              ],
+                            ),
+                          ),
+                        ],
+                      ],
+                    ),
+                  ],
+                ),
+              ),
+              // Arrow icon
+              Icon(Icons.chevron_right, color: Colors.grey[400]),
+            ],
           ),
         ),
       ),
diff --git a/lib/features/module_selection/finance_module_screen.dart b/lib/features/module_selection/finance_module_screen.dart
index 105a824..832ec01 100644
--- a/lib/features/module_selection/finance_module_screen.dart
+++ b/lib/features/module_selection/finance_module_screen.dart
@@ -16,7 +16,9 @@ import 'package:keep_track/features/finance/presentation/screens/tabs/planned_pa
 import 'package:keep_track/features/home/home_screen.dart';
 import 'package:keep_track/features/logs/logs_screen.dart';
 import 'package:keep_track/features/module_selection/module_selection_screen.dart';
+import 'package:keep_track/features/module_selection/task_module_screen.dart';
 import 'package:keep_track/features/profile/presentation/profile_screen.dart';
+import 'package:keep_track/features/tasks/presentation/widgets/pomodoro_nav_indicator.dart';
 
 import '../auth/presentation/screens/auth_settings_screen.dart';
 
@@ -59,8 +61,22 @@ class _FinanceModuleScreenState extends State<FinanceModuleScreen> {
     );
   }
 
+  void _navigateToTaskModulePomodoro() {
+    Navigator.pushReplacement(
+      context,
+      MaterialPageRoute(
+        builder: (context) => const TaskModuleScreen(initialTabIndex: 3),
+      ),
+    );
+  }
+
   List<Widget> _buildActions() {
     return [
+      // Pomodoro timer indicator (shows when session is active)
+      PomodoroNavIndicator(
+        onTap: _navigateToTaskModulePomodoro,
+      ),
+      const SizedBox(width: 8),
       // Theme toggle button
       IconButton(
         icon: Icon(
diff --git a/lib/features/module_selection/module_selection_screen.dart b/lib/features/module_selection/module_selection_screen.dart
index 29dce05..60c571a 100644
--- a/lib/features/module_selection/module_selection_screen.dart
+++ b/lib/features/module_selection/module_selection_screen.dart
@@ -1,13 +1,159 @@
+import 'package:flutter/foundation.dart' show kDebugMode;
 import 'package:flutter/material.dart';
 import 'package:keep_track/core/di/service_locator.dart';
+import 'package:keep_track/core/config/app_info.dart';
+import 'package:keep_track/core/services/notification/notification_service.dart';
+import 'package:keep_track/core/services/version_checker_service.dart';
 import 'package:keep_track/features/auth/presentation/state/auth_controller.dart';
 import 'package:keep_track/features/auth/presentation/screens/auth_settings_screen.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 /// Netflix-style module selection screen after login
 /// Users can choose between Task Management and Finance Management
-class ModuleSelectionScreen extends StatelessWidget {
+class ModuleSelectionScreen extends StatefulWidget {
   const ModuleSelectionScreen({super.key});
 
+  @override
+  State<ModuleSelectionScreen> createState() => _ModuleSelectionScreenState();
+}
+
+class _ModuleSelectionScreenState extends State<ModuleSelectionScreen> {
+  @override
+  void initState() {
+    super.initState();
+    _checkForUpdates();
+  }
+
+  Future<void> _checkForUpdates() async {
+    final result = await VersionCheckerService.instance.checkForUpdates();
+
+    if (!mounted) return;
+
+    if (result.updateAvailable) {
+      _showUpdateDialog(result);
+    }
+  }
+
+  Future<void> _triggerTestNotification() async {
+    final notificationService = NotificationService.instance;
+
+    if (!notificationService.isInitialized) {
+      if (!mounted) return;
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(
+          content: Text('Notification service not initialized'),
+          backgroundColor: Colors.orange,
+        ),
+      );
+      return;
+    }
+
+    await notificationService.showNotification(
+      id: 99999,
+      title: 'Test Notification',
+      body: 'This is a test notification from KeepTrack!',
+      payload: 'test',
+    );
+
+    if (!mounted) return;
+    ScaffoldMessenger.of(context).showSnackBar(
+      const SnackBar(
+        content: Text('Test notification triggered!'),
+        backgroundColor: Colors.green,
+      ),
+    );
+  }
+
+  void _showUpdateDialog(VersionCheckResult result) {
+    showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        icon: const Icon(Icons.system_update, size: 48, color: Colors.blue),
+        title: const Text('Update Available'),
+        content: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              'A new version of KeepTrack is available!',
+              style: Theme.of(context).textTheme.bodyLarge,
+            ),
+            const SizedBox(height: 16),
+            _buildVersionRow('Current:', result.currentVersion),
+            _buildVersionRow('Latest:', result.latestVersion ?? 'Unknown'),
+            if (result.releaseNotes != null && result.releaseNotes!.isNotEmpty) ...[
+              const SizedBox(height: 16),
+              Text(
+                'What\'s new:',
+                style: Theme.of(context).textTheme.titleSmall?.copyWith(
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+              const SizedBox(height: 8),
+              ConstrainedBox(
+                constraints: const BoxConstraints(maxHeight: 150),
+                child: SingleChildScrollView(
+                  child: Text(
+                    result.releaseNotes!,
+                    style: Theme.of(context).textTheme.bodySmall,
+                  ),
+                ),
+              ),
+            ],
+          ],
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(context),
+            child: const Text('Later'),
+          ),
+          FilledButton.icon(
+            onPressed: () async {
+              Navigator.pop(context);
+              // Try custom download URL first, fallback to GitHub releases
+              final primaryUrl = Uri.parse(AppInfo.downloadUrl);
+              final fallbackUrl = Uri.parse(result.releaseUrl ?? AppInfo.releasesUrl);
+
+              if (await canLaunchUrl(primaryUrl)) {
+                await launchUrl(primaryUrl, mode: LaunchMode.externalApplication);
+              } else if (await canLaunchUrl(fallbackUrl)) {
+                await launchUrl(fallbackUrl, mode: LaunchMode.externalApplication);
+              }
+            },
+            icon: const Icon(Icons.download, size: 18),
+            label: const Text('Download'),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildVersionRow(String label, String version) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 4),
+      child: Row(
+        children: [
+          SizedBox(
+            width: 70,
+            child: Text(
+              label,
+              style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
+              ),
+            ),
+          ),
+          Text(
+            version,
+            style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+              fontWeight: FontWeight.bold,
+              fontFamily: 'monospace',
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -34,6 +180,19 @@ class ModuleSelectionScreen extends StatelessWidget {
                     Row(
                       mainAxisAlignment: MainAxisAlignment.end,
                       children: [
+                        // Debug notification test button (only in debug mode)
+                        if (kDebugMode) ...[
+                          IconButton(
+                            onPressed: _triggerTestNotification,
+                            icon: const Icon(Icons.notifications_active),
+                            tooltip: 'Test Notification',
+                            style: IconButton.styleFrom(
+                              backgroundColor: Colors.orange.withOpacity(0.1),
+                              foregroundColor: Colors.orange,
+                            ),
+                          ),
+                          const SizedBox(width: 8),
+                        ],
                         _buildUserProfile(context),
                       ],
                     ),
diff --git a/lib/features/module_selection/task_module_screen.dart b/lib/features/module_selection/task_module_screen.dart
index 0ae7dc0..989b6ab 100644
--- a/lib/features/module_selection/task_module_screen.dart
+++ b/lib/features/module_selection/task_module_screen.dart
@@ -13,22 +13,31 @@ import 'package:keep_track/features/profile/presentation/profile_screen.dart';
 import 'package:keep_track/features/tasks/presentation/screens/tabs/task/tasks_tab_new.dart';
 import 'package:keep_track/features/tasks/presentation/screens/tabs/projects_tab.dart';
 import 'package:keep_track/features/tasks/presentation/screens/tabs/pomodoro_tab.dart';
+import 'package:keep_track/features/tasks/presentation/widgets/pomodoro_nav_indicator.dart';
 
 import '../auth/presentation/screens/auth_settings_screen.dart';
 
 /// Task Module Screen - Wraps the task management functionality
 /// This is what users see when they select "Task Management" from module selection
 class TaskModuleScreen extends StatefulWidget {
-  const TaskModuleScreen({super.key});
+  final int initialTabIndex;
+
+  const TaskModuleScreen({super.key, this.initialTabIndex = 0});
 
   @override
   State<TaskModuleScreen> createState() => _TaskModuleScreenState();
 }
 
 class _TaskModuleScreenState extends State<TaskModuleScreen> {
-  int _currentIndex = 0;
+  late int _currentIndex;
   final _layoutController = AppLayoutController();
 
+  @override
+  void initState() {
+    super.initState();
+    _currentIndex = widget.initialTabIndex;
+  }
+
   void _changeTab(int index) {
     setState(() => _currentIndex = index);
   }
@@ -56,6 +65,11 @@ class _TaskModuleScreenState extends State<TaskModuleScreen> {
 
   List<Widget> _buildActions() {
     return [
+      // Pomodoro timer indicator (shows when session is active)
+      PomodoroNavIndicator(
+        onTap: () => _changeTab(3), // Navigate to Pomodoro tab
+      ),
+      const SizedBox(width: 8),
       // Theme toggle button
       IconButton(
         icon: Icon(
diff --git a/lib/features/notifications/data/repositories/notification_settings_repository.dart b/lib/features/notifications/data/repositories/notification_settings_repository.dart
new file mode 100644
index 0000000..d20ce2f
--- /dev/null
+++ b/lib/features/notifications/data/repositories/notification_settings_repository.dart
@@ -0,0 +1,61 @@
+import 'dart:convert';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:keep_track/core/logging/app_logger.dart';
+import 'package:keep_track/features/notifications/domain/entities/notification_settings.dart';
+
+/// Repository for persisting notification settings to SharedPreferences
+class NotificationSettingsRepository {
+  static const String _key = 'notification_settings';
+
+  final SharedPreferences _prefs;
+
+  NotificationSettingsRepository(this._prefs);
+
+  /// Load notification settings from storage
+  NotificationSettings load() {
+    try {
+      final json = _prefs.getString(_key);
+      if (json == null) {
+        AppLogger.info('NotificationSettingsRepository: No saved settings, using defaults');
+        return const NotificationSettings();
+      }
+
+      final data = jsonDecode(json) as Map<String, dynamic>;
+      final settings = NotificationSettings.fromJson(data);
+      AppLogger.info('NotificationSettingsRepository: Settings loaded');
+      return settings;
+    } catch (e) {
+      AppLogger.error('NotificationSettingsRepository: Error loading settings', e);
+      return const NotificationSettings();
+    }
+  }
+
+  /// Save notification settings to storage
+  Future<bool> save(NotificationSettings settings) async {
+    try {
+      final json = jsonEncode(settings.toJson());
+      final success = await _prefs.setString(_key, json);
+      if (success) {
+        AppLogger.info('NotificationSettingsRepository: Settings saved');
+      }
+      return success;
+    } catch (e) {
+      AppLogger.error('NotificationSettingsRepository: Error saving settings', e);
+      return false;
+    }
+  }
+
+  /// Clear notification settings
+  Future<bool> clear() async {
+    try {
+      final success = await _prefs.remove(_key);
+      if (success) {
+        AppLogger.info('NotificationSettingsRepository: Settings cleared');
+      }
+      return success;
+    } catch (e) {
+      AppLogger.error('NotificationSettingsRepository: Error clearing settings', e);
+      return false;
+    }
+  }
+}
diff --git a/lib/features/notifications/domain/entities/notification_settings.dart b/lib/features/notifications/domain/entities/notification_settings.dart
new file mode 100644
index 0000000..2f37000
--- /dev/null
+++ b/lib/features/notifications/domain/entities/notification_settings.dart
@@ -0,0 +1,167 @@
+import 'package:flutter/material.dart';
+
+/// User preferences for notifications
+class NotificationSettings {
+  // Finance reminder settings
+  final bool financeReminderEnabled;
+  final TimeOfDay financeReminderTime;
+
+  // Morning task reminder settings
+  final bool morningReminderEnabled;
+  final TimeOfDay morningReminderTime;
+
+  // Evening task reminder settings
+  final bool eveningReminderEnabled;
+  final TimeOfDay eveningReminderTime;
+
+  // Task due reminder settings
+  final bool taskDueReminderEnabled;
+  final TaskDueReminderDuration taskDueReminderDuration;
+
+  // Pomodoro session notification settings
+  final bool pomodoroNotificationsEnabled;
+
+  const NotificationSettings({
+    this.financeReminderEnabled = false,
+    this.financeReminderTime = const TimeOfDay(hour: 20, minute: 0), // 8:00 PM
+    this.morningReminderEnabled = false,
+    this.morningReminderTime = const TimeOfDay(hour: 8, minute: 0), // 8:00 AM
+    this.eveningReminderEnabled = false,
+    this.eveningReminderTime = const TimeOfDay(hour: 18, minute: 0), // 6:00 PM
+    this.taskDueReminderEnabled = false,
+    this.taskDueReminderDuration = TaskDueReminderDuration.oneHour,
+    this.pomodoroNotificationsEnabled = true, // Enabled by default
+  });
+
+  /// Copy with method for immutability
+  NotificationSettings copyWith({
+    bool? financeReminderEnabled,
+    TimeOfDay? financeReminderTime,
+    bool? morningReminderEnabled,
+    TimeOfDay? morningReminderTime,
+    bool? eveningReminderEnabled,
+    TimeOfDay? eveningReminderTime,
+    bool? taskDueReminderEnabled,
+    TaskDueReminderDuration? taskDueReminderDuration,
+    bool? pomodoroNotificationsEnabled,
+  }) {
+    return NotificationSettings(
+      financeReminderEnabled: financeReminderEnabled ?? this.financeReminderEnabled,
+      financeReminderTime: financeReminderTime ?? this.financeReminderTime,
+      morningReminderEnabled: morningReminderEnabled ?? this.morningReminderEnabled,
+      morningReminderTime: morningReminderTime ?? this.morningReminderTime,
+      eveningReminderEnabled: eveningReminderEnabled ?? this.eveningReminderEnabled,
+      eveningReminderTime: eveningReminderTime ?? this.eveningReminderTime,
+      taskDueReminderEnabled: taskDueReminderEnabled ?? this.taskDueReminderEnabled,
+      taskDueReminderDuration: taskDueReminderDuration ?? this.taskDueReminderDuration,
+      pomodoroNotificationsEnabled: pomodoroNotificationsEnabled ?? this.pomodoroNotificationsEnabled,
+    );
+  }
+
+  /// Convert to JSON for storage
+  Map<String, dynamic> toJson() {
+    return {
+      'financeReminderEnabled': financeReminderEnabled,
+      'financeReminderHour': financeReminderTime.hour,
+      'financeReminderMinute': financeReminderTime.minute,
+      'morningReminderEnabled': morningReminderEnabled,
+      'morningReminderHour': morningReminderTime.hour,
+      'morningReminderMinute': morningReminderTime.minute,
+      'eveningReminderEnabled': eveningReminderEnabled,
+      'eveningReminderHour': eveningReminderTime.hour,
+      'eveningReminderMinute': eveningReminderTime.minute,
+      'taskDueReminderEnabled': taskDueReminderEnabled,
+      'taskDueReminderDuration': taskDueReminderDuration.name,
+      'pomodoroNotificationsEnabled': pomodoroNotificationsEnabled,
+    };
+  }
+
+  /// Create from JSON
+  factory NotificationSettings.fromJson(Map<String, dynamic> json) {
+    return NotificationSettings(
+      financeReminderEnabled: json['financeReminderEnabled'] as bool? ?? false,
+      financeReminderTime: TimeOfDay(
+        hour: json['financeReminderHour'] as int? ?? 20,
+        minute: json['financeReminderMinute'] as int? ?? 0,
+      ),
+      morningReminderEnabled: json['morningReminderEnabled'] as bool? ?? false,
+      morningReminderTime: TimeOfDay(
+        hour: json['morningReminderHour'] as int? ?? 8,
+        minute: json['morningReminderMinute'] as int? ?? 0,
+      ),
+      eveningReminderEnabled: json['eveningReminderEnabled'] as bool? ?? false,
+      eveningReminderTime: TimeOfDay(
+        hour: json['eveningReminderHour'] as int? ?? 18,
+        minute: json['eveningReminderMinute'] as int? ?? 0,
+      ),
+      taskDueReminderEnabled: json['taskDueReminderEnabled'] as bool? ?? false,
+      taskDueReminderDuration: TaskDueReminderDuration.values.firstWhere(
+        (e) => e.name == json['taskDueReminderDuration'],
+        orElse: () => TaskDueReminderDuration.oneHour,
+      ),
+      pomodoroNotificationsEnabled: json['pomodoroNotificationsEnabled'] as bool? ?? true,
+    );
+  }
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is NotificationSettings &&
+          runtimeType == other.runtimeType &&
+          financeReminderEnabled == other.financeReminderEnabled &&
+          financeReminderTime == other.financeReminderTime &&
+          morningReminderEnabled == other.morningReminderEnabled &&
+          morningReminderTime == other.morningReminderTime &&
+          eveningReminderEnabled == other.eveningReminderEnabled &&
+          eveningReminderTime == other.eveningReminderTime &&
+          taskDueReminderEnabled == other.taskDueReminderEnabled &&
+          taskDueReminderDuration == other.taskDueReminderDuration &&
+          pomodoroNotificationsEnabled == other.pomodoroNotificationsEnabled;
+
+  @override
+  int get hashCode => Object.hash(
+        financeReminderEnabled,
+        financeReminderTime,
+        morningReminderEnabled,
+        morningReminderTime,
+        eveningReminderEnabled,
+        eveningReminderTime,
+        taskDueReminderEnabled,
+        taskDueReminderDuration,
+        pomodoroNotificationsEnabled,
+      );
+}
+
+/// Duration before task due date to send reminder
+enum TaskDueReminderDuration {
+  thirtyMinutes,
+  oneHour,
+  twoHours,
+  oneDay;
+
+  String get displayName {
+    switch (this) {
+      case TaskDueReminderDuration.thirtyMinutes:
+        return '30 minutes';
+      case TaskDueReminderDuration.oneHour:
+        return '1 hour';
+      case TaskDueReminderDuration.twoHours:
+        return '2 hours';
+      case TaskDueReminderDuration.oneDay:
+        return '1 day';
+    }
+  }
+
+  Duration get duration {
+    switch (this) {
+      case TaskDueReminderDuration.thirtyMinutes:
+        return const Duration(minutes: 30);
+      case TaskDueReminderDuration.oneHour:
+        return const Duration(hours: 1);
+      case TaskDueReminderDuration.twoHours:
+        return const Duration(hours: 2);
+      case TaskDueReminderDuration.oneDay:
+        return const Duration(days: 1);
+    }
+  }
+}
diff --git a/lib/features/notifications/finance_notification_helper.dart b/lib/features/notifications/finance_notification_helper.dart
new file mode 100644
index 0000000..16ae06b
--- /dev/null
+++ b/lib/features/notifications/finance_notification_helper.dart
@@ -0,0 +1,147 @@
+import 'package:keep_track/core/di/service_locator.dart';
+import 'package:keep_track/core/logging/app_logger.dart';
+import 'package:keep_track/core/services/notification/notification_scheduler.dart';
+import 'package:keep_track/core/state/stream_state.dart';
+import 'package:keep_track/features/finance/modules/debt/domain/entities/debt.dart';
+import 'package:keep_track/features/finance/modules/planned_payment/domain/entities/planned_payment.dart';
+import 'package:keep_track/features/finance/modules/planned_payment/domain/entities/payment_enums.dart';
+import 'package:keep_track/features/finance/presentation/state/debt_controller.dart';
+import 'package:keep_track/features/finance/presentation/state/planned_payment_controller.dart';
+
+/// Helper class for scheduling finance-related notifications
+/// Handles notifications for:
+/// - Planned payments due dates
+/// - Debt due dates
+class FinanceNotificationHelper {
+  final NotificationScheduler _scheduler;
+  final PlannedPaymentController _paymentController;
+  final DebtController _debtController;
+
+  FinanceNotificationHelper({
+    NotificationScheduler? scheduler,
+    PlannedPaymentController? paymentController,
+    DebtController? debtController,
+  })  : _scheduler = scheduler ?? locator.get<NotificationScheduler>(),
+        _paymentController = paymentController ?? locator.get<PlannedPaymentController>(),
+        _debtController = debtController ?? locator.get<DebtController>();
+
+  /// Schedule notifications for all active planned payments and debts
+  /// Should be called on app startup and when payments/debts are updated
+  Future<void> scheduleAllFinanceNotifications() async {
+    AppLogger.info('FinanceNotificationHelper: Scheduling all finance notifications...');
+
+    await _schedulePaymentNotifications();
+    await _scheduleDebtNotifications();
+
+    AppLogger.info('FinanceNotificationHelper: All finance notifications scheduled');
+  }
+
+  /// Schedule notifications for all active planned payments
+  Future<void> _schedulePaymentNotifications() async {
+    try {
+      // Get current payments from controller state
+      final payments = _paymentController.data;
+      if (payments == null || payments.isEmpty) {
+        AppLogger.info('FinanceNotificationHelper: No planned payments to schedule');
+        return;
+      }
+
+      // Filter active payments with future due dates
+      final activePayments = payments.where((p) =>
+          p.status == PaymentStatus.active &&
+          p.nextPaymentDate.isAfter(DateTime.now()));
+
+      for (final payment in activePayments) {
+        if (payment.id == null) continue;
+
+        await _scheduler.schedulePaymentDueNotifications(
+          paymentId: payment.id!,
+          name: payment.name,
+          amount: payment.amount,
+          dueDate: payment.nextPaymentDate,
+        );
+      }
+
+      AppLogger.info('FinanceNotificationHelper: Scheduled notifications for ${activePayments.length} payments');
+    } catch (e, stackTrace) {
+      AppLogger.error('FinanceNotificationHelper: Failed to schedule payment notifications', e, stackTrace);
+    }
+  }
+
+  /// Schedule notifications for all active debts with due dates
+  Future<void> _scheduleDebtNotifications() async {
+    try {
+      // Get current debts from controller state
+      final debts = _debtController.data;
+      if (debts == null || debts.isEmpty) {
+        AppLogger.info('FinanceNotificationHelper: No debts to schedule');
+        return;
+      }
+
+      // Filter active debts with future due dates
+      final activeDebts = debts.where((d) =>
+          d.status == DebtStatus.active &&
+          d.dueDate != null &&
+          d.dueDate!.isAfter(DateTime.now()));
+
+      for (final debt in activeDebts) {
+        if (debt.id == null || debt.dueDate == null) continue;
+
+        await _scheduler.scheduleDebtDueNotifications(
+          debtId: debt.id!,
+          personName: debt.personName,
+          amount: debt.remainingAmount,
+          dueDate: debt.dueDate!,
+        );
+      }
+
+      AppLogger.info('FinanceNotificationHelper: Scheduled notifications for ${activeDebts.length} debts');
+    } catch (e, stackTrace) {
+      AppLogger.error('FinanceNotificationHelper: Failed to schedule debt notifications', e, stackTrace);
+    }
+  }
+
+  /// Schedule notifications for a single planned payment
+  Future<void> schedulePaymentNotification(PlannedPayment payment) async {
+    if (payment.id == null) return;
+    if (payment.status != PaymentStatus.active) return;
+    if (payment.nextPaymentDate.isBefore(DateTime.now())) return;
+
+    await _scheduler.schedulePaymentDueNotifications(
+      paymentId: payment.id!,
+      name: payment.name,
+      amount: payment.amount,
+      dueDate: payment.nextPaymentDate,
+    );
+  }
+
+  /// Cancel notifications for a single planned payment
+  Future<void> cancelPaymentNotification(String paymentId) async {
+    await _scheduler.cancelPaymentDueNotifications(paymentId);
+  }
+
+  /// Schedule notifications for a single debt
+  Future<void> scheduleDebtNotification(Debt debt) async {
+    if (debt.id == null || debt.dueDate == null) return;
+    if (debt.status != DebtStatus.active) return;
+    if (debt.dueDate!.isBefore(DateTime.now())) return;
+
+    await _scheduler.scheduleDebtDueNotifications(
+      debtId: debt.id!,
+      personName: debt.personName,
+      amount: debt.remainingAmount,
+      dueDate: debt.dueDate!,
+    );
+  }
+
+  /// Cancel notifications for a single debt
+  Future<void> cancelDebtNotification(String debtId) async {
+    await _scheduler.cancelDebtDueNotifications(debtId);
+  }
+
+  /// Reschedule all notifications (cancel existing and schedule new)
+  Future<void> rescheduleAllNotifications() async {
+    AppLogger.info('FinanceNotificationHelper: Rescheduling all finance notifications...');
+    await scheduleAllFinanceNotifications();
+  }
+}
diff --git a/lib/features/notifications/notifications_di.dart b/lib/features/notifications/notifications_di.dart
new file mode 100644
index 0000000..479f904
--- /dev/null
+++ b/lib/features/notifications/notifications_di.dart
@@ -0,0 +1,70 @@
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:keep_track/core/di/service_locator.dart';
+import 'package:keep_track/core/services/notification/notification_scheduler.dart';
+import 'package:keep_track/core/services/notification/notification_service.dart';
+import 'package:keep_track/core/services/notification/platform_notification_helper.dart';
+import 'package:keep_track/features/notifications/data/repositories/notification_settings_repository.dart';
+import 'package:keep_track/features/notifications/finance_notification_helper.dart';
+import 'package:keep_track/features/notifications/presentation/state/notification_settings_controller.dart';
+
+/// Setup notification dependencies
+/// Only registers on supported platforms (mobile)
+void setupNotificationDependencies() {
+  final helper = PlatformNotificationHelper.instance;
+
+  // Only register notification services on supported platforms
+  if (!helper.isSupportedPlatform) {
+    return;
+  }
+
+  // Register notification service (singleton instance)
+  locator.registerLazySingleton<NotificationService>(() {
+    return NotificationService.instance;
+  });
+
+  // Register notification scheduler
+  locator.registerLazySingleton<NotificationScheduler>(() {
+    return NotificationScheduler(locator.get<NotificationService>());
+  });
+
+  // Register notification settings repository
+  locator.registerLazySingleton<NotificationSettingsRepository>(() {
+    return NotificationSettingsRepository(locator.get<SharedPreferences>());
+  });
+
+  // Register notification settings controller
+  locator.registerLazySingleton<NotificationSettingsController>(() {
+    return NotificationSettingsController(
+      locator.get<NotificationSettingsRepository>(),
+      locator.get<NotificationScheduler>(),
+    );
+  });
+
+  // Register finance notification helper
+  // Note: This depends on finance controllers which are registered separately
+  locator.registerLazySingleton<FinanceNotificationHelper>(() {
+    return FinanceNotificationHelper();
+  });
+}
+
+/// Initialize notification services after DI setup
+/// Call this in main.dart after _setupDependencies
+Future<void> initializeNotifications() async {
+  final helper = PlatformNotificationHelper.instance;
+
+  // Skip on unsupported platforms
+  if (!helper.isSupportedPlatform) {
+    return;
+  }
+
+  // Initialize notification service
+  final service = locator.get<NotificationService>();
+  await service.initialize();
+
+  // Request permissions
+  await helper.requestPermissions();
+
+  // Load and apply saved notification settings
+  final controller = locator.get<NotificationSettingsController>();
+  await controller.loadAndApplySettings();
+}
diff --git a/lib/features/notifications/pomodoro_notification_helper.dart b/lib/features/notifications/pomodoro_notification_helper.dart
new file mode 100644
index 0000000..6abfad0
--- /dev/null
+++ b/lib/features/notifications/pomodoro_notification_helper.dart
@@ -0,0 +1,79 @@
+import 'package:keep_track/core/di/service_locator.dart';
+import 'package:keep_track/core/logging/app_logger.dart';
+import 'package:keep_track/core/services/notification/notification_service.dart';
+import 'package:keep_track/core/services/notification/platform_notification_helper.dart';
+import 'package:keep_track/features/notifications/data/repositories/notification_settings_repository.dart';
+import 'package:keep_track/features/tasks/modules/pomodoro/domain/entities/pomodoro_session.dart';
+
+/// Helper class for managing pomodoro session notifications
+/// Safe to use on any platform - no-ops on unsupported platforms
+class PomodoroNotificationHelper {
+  PomodoroNotificationHelper._();
+
+  static final PomodoroNotificationHelper _instance = PomodoroNotificationHelper._();
+  static PomodoroNotificationHelper get instance => _instance;
+
+  /// Notification ID for pomodoro session completion
+  static const int _pomodoroNotificationId = 50000;
+
+  /// Show notification when a pomodoro session completes
+  Future<void> showSessionCompleteNotification(PomodoroSession session) async {
+    // Skip on unsupported platforms
+    if (!PlatformNotificationHelper.instance.isSupportedPlatform) {
+      return;
+    }
+
+    // Skip for stopwatch sessions (no auto-complete notification needed)
+    if (session.isStopwatch) {
+      return;
+    }
+
+    try {
+      // Check if pomodoro notifications are enabled
+      final settingsRepo = locator.get<NotificationSettingsRepository>();
+      final settings = settingsRepo.load();
+
+      if (!settings.pomodoroNotificationsEnabled) {
+        AppLogger.info('PomodoroNotificationHelper: Pomodoro notifications disabled, skipping');
+        return;
+      }
+
+      // Get notification details based on session type
+      final (title, body) = _getNotificationContent(session.type);
+
+      // Show the notification
+      final notificationService = NotificationService.instance;
+      if (!notificationService.isInitialized) {
+        AppLogger.warning('PomodoroNotificationHelper: Notification service not initialized');
+        return;
+      }
+
+      await notificationService.showNotification(
+        id: _pomodoroNotificationId + session.type.index,
+        title: title,
+        body: body,
+        channelId: 'task_reminders',
+        payload: 'pomodoro_complete:${session.type.name}',
+      );
+
+      AppLogger.info('PomodoroNotificationHelper: Notification shown for ${session.type.displayName}');
+    } catch (e) {
+      // Silently fail - notification services might not be registered on this platform
+      AppLogger.warning('PomodoroNotificationHelper: Could not show notification - $e');
+    }
+  }
+
+  /// Get notification content based on session type
+  (String title, String body) _getNotificationContent(PomodoroSessionType type) {
+    switch (type) {
+      case PomodoroSessionType.pomodoro:
+        return ('Pomodoro Complete!', 'Great work! Time for a break.');
+      case PomodoroSessionType.shortBreak:
+        return ('Short Break Over', 'Ready to get back to work?');
+      case PomodoroSessionType.longBreak:
+        return ('Long Break Over', 'Feeling refreshed? Let\'s continue!');
+      case PomodoroSessionType.stopwatch:
+        return ('Session Complete', 'Your session has ended.');
+    }
+  }
+}
diff --git a/lib/features/notifications/presentation/screens/notification_settings_screen.dart b/lib/features/notifications/presentation/screens/notification_settings_screen.dart
new file mode 100644
index 0000000..ea3ada4
--- /dev/null
+++ b/lib/features/notifications/presentation/screens/notification_settings_screen.dart
@@ -0,0 +1,481 @@
+import 'package:flutter/material.dart';
+import 'package:keep_track/core/di/service_locator.dart';
+import 'package:keep_track/core/services/notification/platform_notification_helper.dart';
+import 'package:keep_track/core/state/stream_state.dart';
+import 'package:keep_track/core/theme/gcash_theme.dart';
+import 'package:keep_track/features/notifications/domain/entities/notification_settings.dart';
+import 'package:keep_track/features/notifications/presentation/state/notification_settings_controller.dart';
+
+/// Screen for managing notification settings
+/// Only available on mobile platforms
+class NotificationSettingsScreen extends StatefulWidget {
+  const NotificationSettingsScreen({super.key});
+
+  @override
+  State<NotificationSettingsScreen> createState() =>
+      _NotificationSettingsScreenState();
+}
+
+class _NotificationSettingsScreenState
+    extends State<NotificationSettingsScreen> {
+  late final NotificationSettingsController _controller;
+  bool _permissionsGranted = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = locator.get<NotificationSettingsController>();
+    _checkPermissions();
+  }
+
+  Future<void> _checkPermissions() async {
+    final granted =
+        await PlatformNotificationHelper.instance.areNotificationsEnabled();
+    if (mounted) {
+      setState(() {
+        _permissionsGranted = granted;
+      });
+    }
+  }
+
+  Future<void> _requestPermissions() async {
+    final granted =
+        await PlatformNotificationHelper.instance.requestPermissions();
+    if (mounted) {
+      setState(() {
+        _permissionsGranted = granted;
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Notification Settings'),
+        backgroundColor: GCashColors.primary,
+        foregroundColor: Colors.white,
+      ),
+      body: StreamBuilder<AsyncState<NotificationSettings>>(
+        stream: _controller.stream,
+        initialData: _controller.state,
+        builder: (context, snapshot) {
+          final state = snapshot.data;
+
+          if (state is AsyncLoading) {
+            return const Center(child: CircularProgressIndicator());
+          }
+
+          if (state is AsyncError<NotificationSettings>) {
+            return Center(
+              child: Text('Error loading settings: ${state.error}'),
+            );
+          }
+
+          final settings = _controller.settings;
+
+          return SingleChildScrollView(
+            padding: const EdgeInsets.all(16),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                // Permission status card
+                if (!_permissionsGranted) _buildPermissionCard(),
+                if (!_permissionsGranted) const SizedBox(height: 16),
+
+                // Finance reminder section
+                _buildSectionCard(
+                  icon: Icons.account_balance_wallet,
+                  title: 'Finance Reminder',
+                  subtitle: 'Daily reminder to track your transactions',
+                  enabled: settings.financeReminderEnabled,
+                  time: settings.financeReminderTime,
+                  onToggle: (value) {
+                    _controller.updateFinanceReminder(enabled: value);
+                  },
+                  onTimeChange: (time) {
+                    _controller.updateFinanceReminder(time: time);
+                  },
+                ),
+                const SizedBox(height: 16),
+
+                // Morning task reminder section
+                _buildSectionCard(
+                  icon: Icons.wb_sunny,
+                  title: 'Morning Task Reminder',
+                  subtitle: 'Start your day with your task list',
+                  enabled: settings.morningReminderEnabled,
+                  time: settings.morningReminderTime,
+                  onToggle: (value) {
+                    _controller.updateMorningReminder(enabled: value);
+                  },
+                  onTimeChange: (time) {
+                    _controller.updateMorningReminder(time: time);
+                  },
+                ),
+                const SizedBox(height: 16),
+
+                // Evening task reminder section
+                _buildSectionCard(
+                  icon: Icons.nightlight_round,
+                  title: 'Evening Task Reminder',
+                  subtitle: 'Review your progress at the end of the day',
+                  enabled: settings.eveningReminderEnabled,
+                  time: settings.eveningReminderTime,
+                  onToggle: (value) {
+                    _controller.updateEveningReminder(enabled: value);
+                  },
+                  onTimeChange: (time) {
+                    _controller.updateEveningReminder(time: time);
+                  },
+                ),
+                const SizedBox(height: 16),
+
+                // Task due reminder section
+                _buildTaskDueCard(
+                  enabled: settings.taskDueReminderEnabled,
+                  duration: settings.taskDueReminderDuration,
+                  onToggle: (value) {
+                    _controller.updateTaskDueReminder(enabled: value);
+                  },
+                  onDurationChange: (duration) {
+                    _controller.updateTaskDueReminder(duration: duration);
+                  },
+                ),
+                const SizedBox(height: 16),
+
+                // Pomodoro notifications section
+                _buildPomodoroCard(
+                  enabled: settings.pomodoroNotificationsEnabled,
+                  onToggle: (value) {
+                    _controller.updatePomodoroNotifications(enabled: value);
+                  },
+                ),
+                const SizedBox(height: 24),
+
+                // Reset button
+                Center(
+                  child: TextButton.icon(
+                    onPressed: () => _showResetConfirmation(context),
+                    icon: const Icon(Icons.restore),
+                    label: const Text('Reset to Defaults'),
+                  ),
+                ),
+              ],
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  Widget _buildPermissionCard() {
+    return Card(
+      color: Colors.orange.shade50,
+      child: Padding(
+        padding: const EdgeInsets.all(16),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Icon(Icons.warning_amber_rounded, color: Colors.orange.shade700),
+                const SizedBox(width: 8),
+                Text(
+                  'Notifications Disabled',
+                  style: TextStyle(
+                    fontSize: 16,
+                    fontWeight: FontWeight.bold,
+                    color: Colors.orange.shade900,
+                  ),
+                ),
+              ],
+            ),
+            const SizedBox(height: 8),
+            Text(
+              'Enable notifications to receive reminders for your tasks and finances.',
+              style: TextStyle(color: Colors.orange.shade900),
+            ),
+            const SizedBox(height: 12),
+            Row(
+              children: [
+                ElevatedButton(
+                  onPressed: _requestPermissions,
+                  style: ElevatedButton.styleFrom(
+                    backgroundColor: Colors.orange,
+                    foregroundColor: Colors.white,
+                  ),
+                  child: const Text('Enable Notifications'),
+                ),
+                const SizedBox(width: 8),
+                TextButton(
+                  onPressed: () {
+                    PlatformNotificationHelper.instance.openNotificationSettings();
+                  },
+                  child: const Text('Open Settings'),
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildSectionCard({
+    required IconData icon,
+    required String title,
+    required String subtitle,
+    required bool enabled,
+    required TimeOfDay time,
+    required ValueChanged<bool> onToggle,
+    required ValueChanged<TimeOfDay> onTimeChange,
+  }) {
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(16),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Icon(icon, color: GCashColors.primary),
+                const SizedBox(width: 8),
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        title,
+                        style: const TextStyle(
+                          fontSize: 16,
+                          fontWeight: FontWeight.bold,
+                        ),
+                      ),
+                      Text(
+                        subtitle,
+                        style: TextStyle(
+                          fontSize: 12,
+                          color: Colors.grey.shade600,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+                Switch(
+                  value: enabled,
+                  onChanged: _permissionsGranted ? onToggle : null,
+                  activeTrackColor: GCashColors.primary.withValues(alpha: 0.5),
+                  activeThumbColor: GCashColors.primary,
+                ),
+              ],
+            ),
+            if (enabled) ...[
+              const Divider(height: 24),
+              InkWell(
+                onTap: _permissionsGranted
+                    ? () => _showTimePicker(context, time, onTimeChange)
+                    : null,
+                child: Row(
+                  children: [
+                    Icon(
+                      Icons.access_time,
+                      size: 20,
+                      color: Colors.grey.shade600,
+                    ),
+                    const SizedBox(width: 8),
+                    Text(
+                      'Reminder time: ${_formatTime(time)}',
+                      style: const TextStyle(fontSize: 14),
+                    ),
+                    const Spacer(),
+                    Icon(
+                      Icons.chevron_right,
+                      color: Colors.grey.shade400,
+                    ),
+                  ],
+                ),
+              ),
+            ],
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildTaskDueCard({
+    required bool enabled,
+    required TaskDueReminderDuration duration,
+    required ValueChanged<bool> onToggle,
+    required ValueChanged<TaskDueReminderDuration> onDurationChange,
+  }) {
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(16),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Icon(Icons.alarm, color: GCashColors.primary),
+                const SizedBox(width: 8),
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      const Text(
+                        'Task Due Reminders',
+                        style: TextStyle(
+                          fontSize: 16,
+                          fontWeight: FontWeight.bold,
+                        ),
+                      ),
+                      Text(
+                        'Get notified before tasks are due',
+                        style: TextStyle(
+                          fontSize: 12,
+                          color: Colors.grey.shade600,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+                Switch(
+                  value: enabled,
+                  onChanged: _permissionsGranted ? onToggle : null,
+                  activeTrackColor: GCashColors.primary.withValues(alpha: 0.5),
+                  activeThumbColor: GCashColors.primary,
+                ),
+              ],
+            ),
+            if (enabled) ...[
+              const Divider(height: 24),
+              const Text(
+                'Remind me before:',
+                style: TextStyle(
+                  fontSize: 14,
+                  fontWeight: FontWeight.w500,
+                ),
+              ),
+              const SizedBox(height: 8),
+              Wrap(
+                spacing: 8,
+                children: TaskDueReminderDuration.values.map((d) {
+                  final isSelected = d == duration;
+                  return ChoiceChip(
+                    label: Text(d.displayName),
+                    selected: isSelected,
+                    onSelected: _permissionsGranted
+                        ? (selected) {
+                            if (selected) onDurationChange(d);
+                          }
+                        : null,
+                    selectedColor: GCashColors.primary.withValues(alpha: 0.2),
+                    labelStyle: TextStyle(
+                      color: isSelected ? GCashColors.primary : null,
+                      fontWeight: isSelected ? FontWeight.bold : null,
+                    ),
+                  );
+                }).toList(),
+              ),
+            ],
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildPomodoroCard({
+    required bool enabled,
+    required ValueChanged<bool> onToggle,
+  }) {
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(16),
+        child: Row(
+          children: [
+            Icon(Icons.timer, color: GCashColors.primary),
+            const SizedBox(width: 8),
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  const Text(
+                    'Pomodoro Session Alerts',
+                    style: TextStyle(
+                      fontSize: 16,
+                      fontWeight: FontWeight.bold,
+                    ),
+                  ),
+                  Text(
+                    'Get notified when pomodoro, short break, or long break ends',
+                    style: TextStyle(
+                      fontSize: 12,
+                      color: Colors.grey.shade600,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+            Switch(
+              value: enabled,
+              onChanged: _permissionsGranted ? onToggle : null,
+              activeTrackColor: GCashColors.primary.withValues(alpha: 0.5),
+              activeThumbColor: GCashColors.primary,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  String _formatTime(TimeOfDay time) {
+    final hour = time.hourOfPeriod == 0 ? 12 : time.hourOfPeriod;
+    final minute = time.minute.toString().padLeft(2, '0');
+    final period = time.period == DayPeriod.am ? 'AM' : 'PM';
+    return '$hour:$minute $period';
+  }
+
+  Future<void> _showTimePicker(
+    BuildContext context,
+    TimeOfDay initialTime,
+    ValueChanged<TimeOfDay> onTimeChange,
+  ) async {
+    final time = await showTimePicker(
+      context: context,
+      initialTime: initialTime,
+    );
+    if (time != null) {
+      onTimeChange(time);
+    }
+  }
+
+  void _showResetConfirmation(BuildContext context) {
+    showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: const Text('Reset to Defaults?'),
+        content: const Text(
+          'This will reset all notification settings to their default values.',
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(context),
+            child: const Text('Cancel'),
+          ),
+          ElevatedButton(
+            onPressed: () {
+              Navigator.pop(context);
+              _controller.resetToDefaults();
+            },
+            style: ElevatedButton.styleFrom(
+              backgroundColor: Colors.red,
+              foregroundColor: Colors.white,
+            ),
+            child: const Text('Reset'),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/features/notifications/presentation/state/notification_settings_controller.dart b/lib/features/notifications/presentation/state/notification_settings_controller.dart
new file mode 100644
index 0000000..c038e9c
--- /dev/null
+++ b/lib/features/notifications/presentation/state/notification_settings_controller.dart
@@ -0,0 +1,130 @@
+import 'package:flutter/material.dart';
+import 'package:keep_track/core/logging/app_logger.dart';
+import 'package:keep_track/core/services/notification/notification_scheduler.dart';
+import 'package:keep_track/core/state/stream_state.dart';
+import 'package:keep_track/features/notifications/data/repositories/notification_settings_repository.dart';
+import 'package:keep_track/features/notifications/domain/entities/notification_settings.dart';
+
+/// Controller for managing notification settings state
+class NotificationSettingsController
+    extends StreamState<AsyncState<NotificationSettings>> {
+  final NotificationSettingsRepository _repository;
+  final NotificationScheduler _scheduler;
+
+  NotificationSettingsController(this._repository, this._scheduler)
+      : super(const AsyncLoading());
+
+  /// Get current settings or defaults
+  NotificationSettings get settings {
+    final currentState = state;
+    if (currentState is AsyncData<NotificationSettings>) {
+      return currentState.data;
+    }
+    return const NotificationSettings();
+  }
+
+  /// Load settings from storage and apply to scheduler
+  Future<void> loadAndApplySettings() async {
+    await execute(() async {
+      final settings = _repository.load();
+      await _applySettings(settings);
+      return settings;
+    });
+  }
+
+  /// Load settings from storage without applying
+  Future<void> loadSettings() async {
+    await execute(() async {
+      return _repository.load();
+    });
+  }
+
+  /// Update finance reminder settings
+  Future<void> updateFinanceReminder({
+    bool? enabled,
+    TimeOfDay? time,
+  }) async {
+    final newSettings = settings.copyWith(
+      financeReminderEnabled: enabled,
+      financeReminderTime: time,
+    );
+    await _saveAndApply(newSettings);
+  }
+
+  /// Update morning task reminder settings
+  Future<void> updateMorningReminder({
+    bool? enabled,
+    TimeOfDay? time,
+  }) async {
+    final newSettings = settings.copyWith(
+      morningReminderEnabled: enabled,
+      morningReminderTime: time,
+    );
+    await _saveAndApply(newSettings);
+  }
+
+  /// Update evening task reminder settings
+  Future<void> updateEveningReminder({
+    bool? enabled,
+    TimeOfDay? time,
+  }) async {
+    final newSettings = settings.copyWith(
+      eveningReminderEnabled: enabled,
+      eveningReminderTime: time,
+    );
+    await _saveAndApply(newSettings);
+  }
+
+  /// Update task due reminder settings
+  Future<void> updateTaskDueReminder({
+    bool? enabled,
+    TaskDueReminderDuration? duration,
+  }) async {
+    final newSettings = settings.copyWith(
+      taskDueReminderEnabled: enabled,
+      taskDueReminderDuration: duration,
+    );
+    await _saveAndApply(newSettings);
+  }
+
+  /// Update pomodoro notifications settings
+  Future<void> updatePomodoroNotifications({bool? enabled}) async {
+    final newSettings = settings.copyWith(
+      pomodoroNotificationsEnabled: enabled,
+    );
+    await _saveAndApply(newSettings);
+  }
+
+  /// Save and apply new settings
+  Future<void> _saveAndApply(NotificationSettings newSettings) async {
+    await execute(() async {
+      await _repository.save(newSettings);
+      await _applySettings(newSettings);
+      return newSettings;
+    });
+  }
+
+  /// Apply settings to scheduler
+  Future<void> _applySettings(NotificationSettings settings) async {
+    await _scheduler.rescheduleAllDailyReminders(
+      financeEnabled: settings.financeReminderEnabled,
+      financeTime: settings.financeReminderTime,
+      morningEnabled: settings.morningReminderEnabled,
+      morningTime: settings.morningReminderTime,
+      eveningEnabled: settings.eveningReminderEnabled,
+      eveningTime: settings.eveningReminderTime,
+    );
+
+    AppLogger.info('NotificationSettingsController: Settings applied');
+  }
+
+  /// Reset all settings to defaults
+  Future<void> resetToDefaults() async {
+    await execute(() async {
+      await _repository.clear();
+      const defaults = NotificationSettings();
+      await _applySettings(defaults);
+      return defaults;
+    });
+  }
+}
diff --git a/lib/features/notifications/task_notification_helper.dart b/lib/features/notifications/task_notification_helper.dart
new file mode 100644
index 0000000..c060de3
--- /dev/null
+++ b/lib/features/notifications/task_notification_helper.dart
@@ -0,0 +1,82 @@
+import 'package:keep_track/core/di/service_locator.dart';
+import 'package:keep_track/core/logging/app_logger.dart';
+import 'package:keep_track/core/services/notification/notification_scheduler.dart';
+import 'package:keep_track/core/services/notification/platform_notification_helper.dart';
+import 'package:keep_track/features/notifications/data/repositories/notification_settings_repository.dart';
+import 'package:keep_track/features/tasks/modules/tasks/domain/entities/task.dart';
+
+/// Helper class for managing task-related notifications
+/// Safe to use on any platform - no-ops on unsupported platforms
+class TaskNotificationHelper {
+  TaskNotificationHelper._();
+
+  static final TaskNotificationHelper _instance = TaskNotificationHelper._();
+  static TaskNotificationHelper get instance => _instance;
+
+  /// Schedule a notification for a task's due date
+  /// Call this when a task is created or updated with a due date
+  Future<void> scheduleTaskDueNotification(Task task) async {
+    // Skip on unsupported platforms
+    if (!PlatformNotificationHelper.instance.isSupportedPlatform) {
+      return;
+    }
+
+    // Skip if task has no id, no due date, or is already completed
+    if (task.id == null || task.dueDate == null || task.isCompleted) {
+      return;
+    }
+
+    try {
+      // Check if task due notifications are enabled
+      final settingsRepo = locator.get<NotificationSettingsRepository>();
+      final settings = settingsRepo.load();
+
+      if (!settings.taskDueReminderEnabled) {
+        AppLogger.info('TaskNotificationHelper: Task due reminders disabled, skipping');
+        return;
+      }
+
+      // Get the scheduler and schedule the notification
+      final scheduler = locator.get<NotificationScheduler>();
+      await scheduler.scheduleTaskDueNotification(
+        taskId: task.id!,
+        title: task.title,
+        dueDate: task.dueDate!,
+        reminderBefore: settings.taskDueReminderDuration.duration,
+      );
+    } catch (e) {
+      // Silently fail - notification services might not be registered on this platform
+      AppLogger.warning('TaskNotificationHelper: Could not schedule notification - $e');
+    }
+  }
+
+  /// Cancel a task's due notification
+  /// Call this when a task is completed or deleted
+  Future<void> cancelTaskDueNotification(String taskId) async {
+    // Skip on unsupported platforms
+    if (!PlatformNotificationHelper.instance.isSupportedPlatform) {
+      return;
+    }
+
+    try {
+      final scheduler = locator.get<NotificationScheduler>();
+      await scheduler.cancelTaskDueNotification(taskId);
+    } catch (e) {
+      // Silently fail
+      AppLogger.warning('TaskNotificationHelper: Could not cancel notification - $e');
+    }
+  }
+
+  /// Update notification for a task (reschedule or cancel based on task state)
+  Future<void> updateTaskNotification(Task task) async {
+    if (task.id == null) return;
+
+    if (task.isCompleted || task.dueDate == null) {
+      // Cancel notification if task is completed or has no due date
+      await cancelTaskDueNotification(task.id!);
+    } else {
+      // Reschedule notification
+      await scheduleTaskDueNotification(task);
+    }
+  }
+}
diff --git a/lib/features/settings/subpages/app_configuration_task_page.dart b/lib/features/settings/subpages/app_configuration_task_page.dart
index e206ed3..f9a4832 100644
--- a/lib/features/settings/subpages/app_configuration_task_page.dart
+++ b/lib/features/settings/subpages/app_configuration_task_page.dart
@@ -32,6 +32,33 @@ class AppConfigurationTaskPage extends StatelessWidget {
               onTap: () => Navigator.pushNamed(context, '/project-create'),
             ),
           ]),
+          const SizedBox(height: 24),
+          _buildSection(context, 'Management', [
+            _buildTile(
+              context,
+              icon: Icons.folder,
+              title: 'Manage Projects',
+              subtitle: 'View, edit, and organize projects',
+              color: Colors.purple,
+              onTap: () => Navigator.pushNamed(context, '/project-management'),
+            ),
+            _buildTile(
+              context,
+              icon: Icons.inbox,
+              title: 'Manage Buckets',
+              subtitle: 'Create and organize task buckets',
+              color: Colors.deepPurple,
+              onTap: () => Navigator.pushNamed(context, '/bucket-management'),
+            ),
+            _buildTile(
+              context,
+              icon: Icons.task_alt,
+              title: 'Manage Tasks',
+              subtitle: 'View and manage all tasks',
+              color: Colors.blue,
+              onTap: () => Navigator.pushNamed(context, '/task-management'),
+            ),
+          ]),
         ],
       ),
     );
diff --git a/lib/features/tasks/data/sevices/bucket_initialization_service.dart b/lib/features/tasks/data/sevices/bucket_initialization_service.dart
new file mode 100644
index 0000000..6badb01
--- /dev/null
+++ b/lib/features/tasks/data/sevices/bucket_initialization_service.dart
@@ -0,0 +1,85 @@
+import 'package:keep_track/core/error/result.dart';
+import 'package:keep_track/core/error/failure.dart';
+import 'package:keep_track/core/logging/app_logger.dart';
+import 'package:keep_track/features/tasks/modules/buckets/domain/entities/bucket.dart';
+import 'package:keep_track/features/tasks/modules/buckets/domain/repositories/bucket_repository.dart';
+
+/// Service to initialize default bucket data for new users
+class BucketInitializationService {
+  final BucketRepository _bucketRepository;
+
+  BucketInitializationService(this._bucketRepository);
+
+  /// Initialize default buckets for a new user
+  /// Returns true if initialization was successful, false if user already has buckets
+  Future<Result<bool>> initializeDefaultCategories(String userId) async {
+    try {
+      AppLogger.info('Initializing default buckets for user: $userId');
+
+      // Check if user already has buckets
+      final existingResult = await _bucketRepository.getBuckets();
+      if (existingResult.isSuccess) {
+        final existing = existingResult.dataOrNull ?? [];
+        if (existing.isNotEmpty) {
+          AppLogger.info(
+            'User already has ${existing.length} buckets, skipping initialization',
+          );
+          return Result.success(false);
+        }
+      }
+
+      // Define default buckets
+      final defaultBuckets = _getDefaultCategories(userId);
+
+      // Create all buckets
+      int successCount = 0;
+      for (final bucket in defaultBuckets) {
+        final result = await _bucketRepository.createBucket(bucket);
+        if (result.isSuccess) {
+          successCount++;
+          AppLogger.info('Created bucket: ${bucket.name}');
+        } else {
+          AppLogger.warning(
+            'Failed to create bucket: ${bucket.name}',
+            result.failureOrNull,
+          );
+        }
+      }
+
+      AppLogger.info(
+        'Default buckets initialized: $successCount/${defaultBuckets.length} created',
+      );
+      return Result.success(true);
+    } catch (e, stackTrace) {
+      AppLogger.error('Failed to initialize default buckets', e, stackTrace);
+      return Result.error(
+        UnknownFailure(
+          message: 'Failed to initialize default buckets',
+          stackTrace: stackTrace,
+          originalError: e,
+        ),
+      );
+    }
+  }
+
+  /// Get list of default buckets
+  List<Bucket> _getDefaultCategories(String userId) {
+    return [
+      Bucket(name: 'Work', userId: userId),
+      Bucket(name: 'Personal', userId: userId),
+      Bucket(name: 'Shopping', userId: userId),
+      Bucket(name: 'Home', userId: userId),
+      Bucket(name: 'Health & Fitness', userId: userId),
+      Bucket(name: 'Finance', userId: userId),
+      Bucket(name: 'Learning', userId: userId),
+      Bucket(name: 'Projects', userId: userId),
+      Bucket(name: 'Family', userId: userId),
+      Bucket(name: 'Social', userId: userId),
+      Bucket(name: 'Travel', userId: userId),
+      Bucket(name: 'Goals', userId: userId),
+      Bucket(name: 'Ideas', userId: userId),
+      Bucket(name: 'Errands', userId: userId),
+      Bucket(name: 'Other', userId: userId),
+    ];
+  }
+}
diff --git a/lib/features/tasks/modules/buckets/data/datasources/bucket_datasource.dart b/lib/features/tasks/modules/buckets/data/datasources/bucket_datasource.dart
new file mode 100644
index 0000000..051deb2
--- /dev/null
+++ b/lib/features/tasks/modules/buckets/data/datasources/bucket_datasource.dart
@@ -0,0 +1,24 @@
+import 'package:keep_track/features/tasks/modules/buckets/data/models/bucket_model.dart';
+
+import '../../domain/entities/bucket.dart';
+
+/// Data source interface for bucket operations
+abstract class BucketDataSource {
+  /// Get all buckets for a user
+  Future<List<Bucket>> getBuckets();
+
+  /// Get a specific bucket by ID
+  Future<Bucket?> getBucketById(String id);
+
+  /// Get multiple buckets by IDs
+  Future<List<Bucket>> getByIds(List<String> ids);
+
+  /// Create a new bucket
+  Future<Bucket> createBucket(BucketModel bucket);
+
+  /// Update an existing bucket
+  Future<Bucket> updateBucket(BucketModel bucket);
+
+  /// Delete a bucket
+  Future<void> deleteBucket(String id);
+}
diff --git a/lib/features/tasks/modules/buckets/data/datasources/supabase/bucket_datasource_supabase.dart b/lib/features/tasks/modules/buckets/data/datasources/supabase/bucket_datasource_supabase.dart
new file mode 100644
index 0000000..71fe9bc
--- /dev/null
+++ b/lib/features/tasks/modules/buckets/data/datasources/supabase/bucket_datasource_supabase.dart
@@ -0,0 +1,94 @@
+import 'package:keep_track/shared/infrastructure/supabase/supabase_service.dart';
+
+import '../../../domain/entities/bucket.dart';
+import '../bucket_datasource.dart';
+import '../../models/bucket_model.dart';
+
+/// Supabase implementation of bucket data source
+class BucketDataSourceSupabase implements BucketDataSource {
+  final SupabaseService supabaseService;
+  static const String tableName = 'buckets';
+
+  BucketDataSourceSupabase(this.supabaseService);
+
+  @override
+  Future<List<Bucket>> getBuckets() async {
+    final response = await supabaseService.client
+        .from(tableName)
+        .select()
+        .eq('user_id', supabaseService.userId!)
+        .eq('is_archive', false)
+        .order('created_at', ascending: false);
+
+    return (response as List)
+        .map((doc) => BucketModel.fromJson(doc as Map<String, dynamic>))
+        .toList();
+  }
+
+  @override
+  Future<Bucket?> getBucketById(String id) async {
+    final response = await supabaseService.client
+        .from(tableName)
+        .select()
+        .eq('id', id)
+        .eq('user_id', supabaseService.userId!)
+        .maybeSingle();
+
+    return response != null
+        ? BucketModel.fromJson(response as Map<String, dynamic>)
+        : null;
+  }
+
+  @override
+  Future<List<Bucket>> getByIds(List<String> ids) async {
+    final response = await supabaseService.client
+        .from(tableName)
+        .select()
+        .filter('id', 'in', ids)
+        .eq('user_id', supabaseService.userId!)
+        .order('created_at', ascending: false);
+
+    return (response as List)
+        .map((doc) => BucketModel.fromJson(doc as Map<String, dynamic>))
+        .toList();
+  }
+
+  @override
+  Future<Bucket> createBucket(BucketModel bucket) async {
+    final doc = bucket.toJson();
+    final response = await supabaseService.client
+        .from(tableName)
+        .insert(doc)
+        .select()
+        .single();
+
+    return BucketModel.fromJson(response as Map<String, dynamic>);
+  }
+
+  @override
+  Future<Bucket> updateBucket(BucketModel bucket) async {
+    if (bucket.id == null) {
+      throw Exception('Cannot update bucket without an ID');
+    }
+
+    final doc = bucket.toJson();
+    final response = await supabaseService.client
+        .from(tableName)
+        .update(doc)
+        .eq('id', bucket.id!)
+        .eq('user_id', supabaseService.userId!)
+        .select()
+        .single();
+
+    return BucketModel.fromJson(response as Map<String, dynamic>);
+  }
+
+  @override
+  Future<void> deleteBucket(String id) async {
+    await supabaseService.client
+        .from(tableName)
+        .delete()
+        .eq('id', id)
+        .eq('user_id', supabaseService.userId!);
+  }
+}
\ No newline at end of file
diff --git a/lib/features/tasks/modules/buckets/data/models/bucket_model.dart b/lib/features/tasks/modules/buckets/data/models/bucket_model.dart
new file mode 100644
index 0000000..47a6fbc
--- /dev/null
+++ b/lib/features/tasks/modules/buckets/data/models/bucket_model.dart
@@ -0,0 +1,60 @@
+import '../../domain/entities/bucket.dart';
+
+class BucketModel extends Bucket {
+  BucketModel({
+    required super.id,
+    required super.name,
+    super.isArchive = false,
+    required super.userId,
+    super.createdAt,
+    super.updatedAt,
+  });
+
+  /// Convert from JSON (Supabase response)
+  factory BucketModel.fromJson(Map<String, dynamic> json) {
+    return BucketModel(
+      id: json['id'] as String?,
+      name: json['name'] as String,
+      isArchive: json['is_archive'] as bool? ?? false,
+      userId: json['user_id'] as String,
+      createdAt: json['created_at'] != null
+          ? DateTime.parse(json['created_at'] as String)
+          : null,
+      updatedAt: json['updated_at'] != null
+          ? DateTime.parse(json['updated_at'] as String)
+          : null,
+    );
+  }
+
+  /// Convert to JSON (for Supabase insert/update)
+  Map<String, dynamic> toJson() {
+    return {
+      if (id != null) 'id': id,
+      'name': name,
+      'is_archive': isArchive,
+      'user_id': userId,
+    };
+  }
+
+  /// Convert entity to model
+  factory BucketModel.fromEntity(Bucket bucket) {
+    return BucketModel(
+      id: bucket.id,
+      name: bucket.name,
+      isArchive: bucket.isArchive,
+      userId: bucket.userId,
+      createdAt: bucket.createdAt,
+      updatedAt: bucket.updatedAt,
+    );
+  }
+
+  /// Convert model back to entity
+  Bucket toEntity() {
+    return Bucket(
+      id: id,
+      name: name,
+      isArchive: isArchive,
+      userId: userId,
+    );
+  }
+}
\ No newline at end of file
diff --git a/lib/features/tasks/modules/buckets/data/repositories/bucket_repository_impl.dart b/lib/features/tasks/modules/buckets/data/repositories/bucket_repository_impl.dart
new file mode 100644
index 0000000..71f0c71
--- /dev/null
+++ b/lib/features/tasks/modules/buckets/data/repositories/bucket_repository_impl.dart
@@ -0,0 +1,75 @@
+import 'package:keep_track/core/error/failure.dart';
+import 'package:keep_track/core/error/result.dart';
+
+import '../../domain/entities/bucket.dart';
+import '../../domain/repositories/bucket_repository.dart';
+import '../datasources/bucket_datasource.dart';
+import '../datasources/supabase/bucket_datasource_supabase.dart';
+import '../models/bucket_model.dart';
+import 'package:keep_track/shared/infrastructure/supabase/supabase_service.dart';
+
+/// Repository implementation for buckets
+class BucketRepositoryImpl implements BucketRepository {
+  final BucketDataSource dataSource;
+
+  BucketRepositoryImpl(this.dataSource);
+
+  /// Create repository with Supabase data source
+  factory BucketRepositoryImpl.withSupabase(SupabaseService supabase) {
+    return BucketRepositoryImpl(BucketDataSourceSupabase(supabase));
+  }
+
+  @override
+  Future<Result<List<Bucket>>> getBuckets() async {
+    final bucketModels = await dataSource.getBuckets();
+    final buckets = bucketModels.cast<Bucket>();
+    return Result.success(buckets);
+  }
+
+  @override
+  Future<Result<Bucket>> getBucketById(String id) async {
+    final bucket = await dataSource.getBucketById(id);
+    if (bucket == null) {
+      return Result.error(
+        NotFoundFailure(
+          resourceType: 'Bucket',
+          resourceId: id,
+        ),
+      );
+    }
+    return Result.success(bucket);
+  }
+
+  @override
+  Future<Result<List<Bucket>>> getByIds(List<String> ids) async {
+    final bucketModels = await dataSource.getByIds(ids);
+    final buckets = bucketModels.cast<Bucket>();
+    return Result.success(buckets);
+  }
+
+  @override
+  Future<Result<Bucket>> createBucket(Bucket bucket) async {
+    final model = BucketModel.fromEntity(bucket);
+    final created = await dataSource.createBucket(model);
+    return Result.success(created);
+  }
+
+  @override
+  Future<Result<Bucket>> updateBucket(Bucket bucket) async {
+    if (bucket.id == null) {
+      return Result.error(
+        ValidationFailure('Bucket ID is required for updates'),
+      );
+    }
+
+    final model = BucketModel.fromEntity(bucket);
+    final updated = await dataSource.updateBucket(model);
+    return Result.success(updated);
+  }
+
+  @override
+  Future<Result<void>> deleteBucket(String id) async {
+    await dataSource.deleteBucket(id);
+    return Result.success(null);
+  }
+}
\ No newline at end of file
diff --git a/lib/features/tasks/modules/buckets/domain/entities/bucket.dart b/lib/features/tasks/modules/buckets/domain/entities/bucket.dart
new file mode 100644
index 0000000..0d9a761
--- /dev/null
+++ b/lib/features/tasks/modules/buckets/domain/entities/bucket.dart
@@ -0,0 +1,51 @@
+/// Bucket entity - Task categorization similar to FinanceCategory
+class Bucket {
+  final String? id;
+  final String name;
+  final bool isArchive;
+  final String? userId;
+  final DateTime? createdAt; // Optional - Supabase auto-generates
+  final DateTime? updatedAt; // Optional - Supabase auto-generates
+
+  Bucket({
+    this.id,
+    required this.name,
+    this.isArchive = false,
+    this.userId,
+    this.createdAt,
+    this.updatedAt,
+  });
+
+  Bucket copyWith({
+    String? id,
+    String? name,
+    bool? isArchive,
+    String? userId,
+    DateTime? createdAt,
+    DateTime? updatedAt,
+  }) {
+    return Bucket(
+      id: id ?? this.id,
+      name: name ?? this.name,
+      isArchive: isArchive ?? this.isArchive,
+      userId: userId ?? this.userId,
+      createdAt: createdAt ?? this.createdAt,
+      updatedAt: updatedAt ?? this.updatedAt,
+    );
+  }
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is Bucket &&
+          runtimeType == other.runtimeType &&
+          id == other.id;
+
+  @override
+  int get hashCode => id.hashCode;
+
+  @override
+  String toString() {
+    return 'Bucket(id: $id, name: $name, isArchive: $isArchive, userId: $userId, createdAt: $createdAt, updatedAt: $updatedAt)';
+  }
+}
\ No newline at end of file
diff --git a/lib/features/tasks/modules/buckets/domain/repositories/bucket_repository.dart b/lib/features/tasks/modules/buckets/domain/repositories/bucket_repository.dart
new file mode 100644
index 0000000..986f070
--- /dev/null
+++ b/lib/features/tasks/modules/buckets/domain/repositories/bucket_repository.dart
@@ -0,0 +1,25 @@
+import 'package:keep_track/core/error/result.dart';
+
+import '../entities/bucket.dart';
+
+/// Repository contract for task buckets
+abstract class BucketRepository {
+  /// Get all buckets available to the current user
+  /// (system + user-created)
+  Future<Result<List<Bucket>>> getBuckets();
+
+  /// Get a specific bucket by ID
+  Future<Result<Bucket>> getBucketById(String id);
+
+  /// Get multiple buckets by IDs (used for hydration)
+  Future<Result<List<Bucket>>> getByIds(List<String> ids);
+
+  /// Create a new user-defined bucket
+  Future<Result<Bucket>> createBucket(Bucket bucket);
+
+  /// Update an existing bucket
+  Future<Result<Bucket>> updateBucket(Bucket bucket);
+
+  /// Delete a bucket
+  Future<Result<void>> deleteBucket(String id);
+}
\ No newline at end of file
diff --git a/lib/features/tasks/modules/pomodoro/domain/entities/pomodoro_session.dart b/lib/features/tasks/modules/pomodoro/domain/entities/pomodoro_session.dart
index 19c39e5..4741cbd 100644
--- a/lib/features/tasks/modules/pomodoro/domain/entities/pomodoro_session.dart
+++ b/lib/features/tasks/modules/pomodoro/domain/entities/pomodoro_session.dart
@@ -41,6 +41,8 @@ class PomodoroSession {
         return 'Short Break';
       case PomodoroSessionType.longBreak:
         return 'Long Break';
+      case PomodoroSessionType.stopwatch:
+        return 'Stopwatch Session';
     }
   }
 
@@ -116,6 +118,8 @@ class PomodoroSession {
 
   bool get isCanceled => status == PomodoroSessionStatus.canceled;
 
+  bool get isStopwatch => type == PomodoroSessionType.stopwatch;
+
   double get progress {
     if (durationSeconds == 0) return 1.0;
     final elapsed = elapsedSeconds;
@@ -124,7 +128,7 @@ class PomodoroSession {
   }
 }
 
-enum PomodoroSessionType { pomodoro, shortBreak, longBreak }
+enum PomodoroSessionType { pomodoro, shortBreak, longBreak, stopwatch }
 
 enum PomodoroSessionStatus { running, paused, completed, canceled }
 
@@ -137,6 +141,8 @@ extension PomodoroSessionTypeExtension on PomodoroSessionType {
         return 'short';
       case PomodoroSessionType.longBreak:
         return 'long';
+      case PomodoroSessionType.stopwatch:
+        return 'stopwatch';
     }
   }
 
@@ -148,6 +154,8 @@ extension PomodoroSessionTypeExtension on PomodoroSessionType {
         return 'Short Break';
       case PomodoroSessionType.longBreak:
         return 'Long Break';
+      case PomodoroSessionType.stopwatch:
+        return 'Stopwatch';
     }
   }
 
@@ -159,6 +167,8 @@ extension PomodoroSessionTypeExtension on PomodoroSessionType {
         return PomodoroSessionType.shortBreak;
       case 'long':
         return PomodoroSessionType.longBreak;
+      case 'stopwatch':
+        return PomodoroSessionType.stopwatch;
       default:
         return PomodoroSessionType.pomodoro;
     }
diff --git a/lib/features/tasks/modules/pomodoro/domain/entities/pomodoro_settings.dart b/lib/features/tasks/modules/pomodoro/domain/entities/pomodoro_settings.dart
index 11b07fe..69d62e7 100644
--- a/lib/features/tasks/modules/pomodoro/domain/entities/pomodoro_settings.dart
+++ b/lib/features/tasks/modules/pomodoro/domain/entities/pomodoro_settings.dart
@@ -30,6 +30,7 @@ class PomodoroSettings {
   }
 
   /// Get duration in seconds for a specific session type
+  /// Returns 0 for stopwatch type (indicates no limit/endless)
   int getDurationSeconds(PomodoroSessionType type) {
     switch (type) {
       case PomodoroSessionType.pomodoro:
@@ -38,6 +39,8 @@ class PomodoroSettings {
         return shortBreakDuration * 60;
       case PomodoroSessionType.longBreak:
         return longBreakDuration * 60;
+      case PomodoroSessionType.stopwatch:
+        return 0; // No limit for stopwatch
     }
   }
 
diff --git a/lib/features/tasks/modules/projects/data/datasources/project_datasource.dart b/lib/features/tasks/modules/projects/data/datasources/project_datasource.dart
index 75bce90..243a1a6 100644
--- a/lib/features/tasks/modules/projects/data/datasources/project_datasource.dart
+++ b/lib/features/tasks/modules/projects/data/datasources/project_datasource.dart
@@ -11,6 +11,9 @@ abstract class ProjectDataSource {
   /// Get project by ID
   Future<ProjectModel?> getProjectById(String id);
 
+  // Get Projects by bucketIDs
+  Future<List<ProjectModel>> getProjectsByBucketId(String bucketId);
+
   /// Create a new project
   Future<ProjectModel> createProject(ProjectModel project);
 
diff --git a/lib/features/tasks/modules/projects/data/datasources/supabase/project_datasource_supabase.dart b/lib/features/tasks/modules/projects/data/datasources/supabase/project_datasource_supabase.dart
index 5aa224c..2f742a7 100644
--- a/lib/features/tasks/modules/projects/data/datasources/supabase/project_datasource_supabase.dart
+++ b/lib/features/tasks/modules/projects/data/datasources/supabase/project_datasource_supabase.dart
@@ -50,6 +50,20 @@ class ProjectDataSourceSupabase implements ProjectDataSource {
         : null;
   }
 
+  @override
+  Future<List<ProjectModel>> getProjectsByBucketId(String bucketId) async {
+    final response = await supabaseService.client
+        .from(tableName)
+        .select()
+        .eq('user_id', supabaseService.userId!)
+        .eq('bucket_id', bucketId)
+        .order('created_at', ascending: false);
+
+    return (response as List)
+        .map((doc) => ProjectModel.fromJson(doc as Map<String, dynamic>))
+        .toList();
+  }
+
   @override
   Future<ProjectModel> createProject(ProjectModel project) async {
     final doc = project.toJson();
diff --git a/lib/features/tasks/modules/projects/data/models/project_model.dart b/lib/features/tasks/modules/projects/data/models/project_model.dart
index a8cf59f..aaa2d36 100644
--- a/lib/features/tasks/modules/projects/data/models/project_model.dart
+++ b/lib/features/tasks/modules/projects/data/models/project_model.dart
@@ -14,6 +14,7 @@ class ProjectModel extends Project {
     super.userId,
     super.status,
     super.metadata,
+    super.bucketId,
   });
 
   /// Convert from domain entity to model
@@ -29,6 +30,7 @@ class ProjectModel extends Project {
       userId: project.userId,
       status: project.status,
       metadata: project.metadata,
+      bucketId: project.bucketId,
     );
   }
 
@@ -70,6 +72,7 @@ class ProjectModel extends Project {
       userId: json['user_id'] as String?,
       status: status,
       metadata: metadata,
+      bucketId: json['bucket_id'] as String?,
     );
   }
 
@@ -84,6 +87,7 @@ class ProjectModel extends Project {
       if (userId != null) 'user_id': userId,
       'status': status.name,
       'metadata': metadata.isNotEmpty ? jsonEncode(metadata) : null,
+      if (bucketId != null) 'bucket_id': bucketId,
     };
   }
 }
diff --git a/lib/features/tasks/modules/projects/data/repositories/project_repository_impl.dart b/lib/features/tasks/modules/projects/data/repositories/project_repository_impl.dart
index d5c3b87..ad00396 100644
--- a/lib/features/tasks/modules/projects/data/repositories/project_repository_impl.dart
+++ b/lib/features/tasks/modules/projects/data/repositories/project_repository_impl.dart
@@ -35,6 +35,13 @@ class ProjectRepositoryImpl implements ProjectRepository {
     return Result.success(project);
   }
 
+  @override
+  Future<Result<List<Project>>> getProjectsByBucketID(String bucketId) async {
+    final taskModels = await dataSource.getProjectsByBucketId(bucketId);
+    final tasks = taskModels.cast<Project>();
+    return Result.success(tasks);
+  }
+
   @override
   Future<Result<Project>> createProject(Project project) async {
     final model = ProjectModel.fromEntity(project);
diff --git a/lib/features/tasks/modules/projects/domain/entities/project.dart b/lib/features/tasks/modules/projects/domain/entities/project.dart
index 6ac6a2e..e5ff3b0 100644
--- a/lib/features/tasks/modules/projects/domain/entities/project.dart
+++ b/lib/features/tasks/modules/projects/domain/entities/project.dart
@@ -9,7 +9,9 @@ class Project {
   final bool isArchived;
   final String? userId;
   final ProjectStatus status; // Project status: active, postponed, closed
-  final Map<String, String> metadata; // Dynamic metadata (e.g., links, ERD, etc.)
+  final Map<String, String>
+  metadata; // Dynamic metadata (e.g., links, ERD, etc.)
+  final String? bucketId;
 
   Project({
     this.id,
@@ -22,6 +24,7 @@ class Project {
     this.userId,
     this.status = ProjectStatus.active,
     this.metadata = const {},
+    this.bucketId,
   });
 
   /// Copy with method for immutability
@@ -36,6 +39,7 @@ class Project {
     String? userId,
     ProjectStatus? status,
     Map<String, String>? metadata,
+    String? bucketId,
   }) {
     return Project(
       id: id ?? this.id,
@@ -48,6 +52,7 @@ class Project {
       userId: userId ?? this.userId,
       status: status ?? this.status,
       metadata: metadata ?? this.metadata,
+      bucketId: bucketId ?? this.bucketId,
     );
   }
 
diff --git a/lib/features/tasks/modules/projects/domain/repositories/project_repository.dart b/lib/features/tasks/modules/projects/domain/repositories/project_repository.dart
index 4bc524f..c8ba1d8 100644
--- a/lib/features/tasks/modules/projects/domain/repositories/project_repository.dart
+++ b/lib/features/tasks/modules/projects/domain/repositories/project_repository.dart
@@ -13,6 +13,8 @@ abstract class ProjectRepository {
   /// Get project by ID
   Future<Result<Project>> getProjectById(String id);
 
+  Future<Result<List<Project>>> getProjectsByBucketID(String bucketId);
+
   /// Create a new project
   Future<Result<Project>> createProject(Project project);
 
diff --git a/lib/features/tasks/modules/tasks/data/datasources/mongodb/task_datasource_supabase.dart b/lib/features/tasks/modules/tasks/data/datasources/supabase/task_datasource_supabase.dart
similarity index 91%
rename from lib/features/tasks/modules/tasks/data/datasources/mongodb/task_datasource_supabase.dart
rename to lib/features/tasks/modules/tasks/data/datasources/supabase/task_datasource_supabase.dart
index 551f855..43dc90c 100644
--- a/lib/features/tasks/modules/tasks/data/datasources/mongodb/task_datasource_supabase.dart
+++ b/lib/features/tasks/modules/tasks/data/datasources/supabase/task_datasource_supabase.dart
@@ -78,6 +78,20 @@ class TaskDataSourceSupabase implements TaskDataSource {
         : null;
   }
 
+  @override
+  Future<List<TaskModel>> getTasksByBucketId(String bucketId) async {
+    final response = await supabaseService.client
+        .from(tableName)
+        .select()
+        .eq('user_id', supabaseService.userId!)
+        .eq('bucket_id', bucketId)
+        .order('created_at', ascending: false);
+
+    return (response as List)
+        .map((doc) => TaskModel.fromJson(doc as Map<String, dynamic>))
+        .toList();
+  }
+
   @override
   Future<TaskModel> createTask(TaskModel task) async {
     final doc = task.toJson();
@@ -186,7 +200,11 @@ class TaskDataSourceSupabase implements TaskDataSource {
       if (completedAtStr != null) {
         final completedAt = DateTime.parse(completedAtStr);
         // Normalize to day (remove time component)
-        final date = DateTime(completedAt.year, completedAt.month, completedAt.day);
+        final date = DateTime(
+          completedAt.year,
+          completedAt.month,
+          completedAt.day,
+        );
         activity[date] = (activity[date] ?? 0) + 1;
       }
     }
diff --git a/lib/features/tasks/modules/tasks/data/datasources/task_datasource.dart b/lib/features/tasks/modules/tasks/data/datasources/task_datasource.dart
index 480835d..e38b168 100644
--- a/lib/features/tasks/modules/tasks/data/datasources/task_datasource.dart
+++ b/lib/features/tasks/modules/tasks/data/datasources/task_datasource.dart
@@ -17,6 +17,8 @@ abstract class TaskDataSource {
   /// Get task by ID
   Future<TaskModel?> getTaskById(String id);
 
+  Future<List<TaskModel>> getTasksByBucketId(String bucketId);
+
   /// Create a new task
   Future<TaskModel> createTask(TaskModel task);
 
diff --git a/lib/features/tasks/modules/tasks/data/models/task_model.dart b/lib/features/tasks/modules/tasks/data/models/task_model.dart
index dcc74c6..99e9e5e 100644
--- a/lib/features/tasks/modules/tasks/data/models/task_model.dart
+++ b/lib/features/tasks/modules/tasks/data/models/task_model.dart
@@ -22,11 +22,12 @@ class TaskModel extends Task {
     super.financeCategoryId,
     super.actualTransactionId,
     super.userId,
+    super.bucketId,
   }) : super(
-          status: status,
-          priority: priority,
-          transactionType: transactionType,
-        );
+         status: status,
+         priority: priority,
+         transactionType: transactionType,
+       );
 
   /// Convert from domain entity to model
   factory TaskModel.fromEntity(Task task) {
@@ -50,6 +51,7 @@ class TaskModel extends Task {
       financeCategoryId: task.financeCategoryId,
       actualTransactionId: task.actualTransactionId,
       userId: task.userId,
+      bucketId: task.bucketId,
     );
   }
 
@@ -60,7 +62,9 @@ class TaskModel extends Task {
       title: json['title'] as String,
       description: json['description'] as String?,
       status: TaskStatus.values.firstWhere((e) => e.name == json['status']),
-      priority: TaskPriority.values.firstWhere((e) => e.name == json['priority']),
+      priority: TaskPriority.values.firstWhere(
+        (e) => e.name == json['priority'],
+      ),
       projectId: json['project_id'] as String?,
       parentTaskId: json['parent_task_id'] as String?,
       tags: (json['tags'] as List<dynamic>?)?.cast<String>() ?? [],
@@ -80,11 +84,14 @@ class TaskModel extends Task {
       isMoneyRelated: json['is_money_related'] as bool? ?? false,
       expectedAmount: (json['expected_amount'] as num?)?.toDouble(),
       transactionType: json['transaction_type'] != null
-          ? TaskTransactionType.values.firstWhere((e) => e.name == json['transaction_type'])
+          ? TaskTransactionType.values.firstWhere(
+              (e) => e.name == json['transaction_type'],
+            )
           : null,
       financeCategoryId: json['finance_category_id'] as String?,
       actualTransactionId: json['actual_transaction_id'] as String?,
       userId: json['user_id'] as String?,
+      bucketId: json['bucket_id'] as String?,
     );
   }
 
@@ -106,8 +113,10 @@ class TaskModel extends Task {
       if (expectedAmount != null) 'expected_amount': expectedAmount,
       if (transactionType != null) 'transaction_type': transactionType!.name,
       if (financeCategoryId != null) 'finance_category_id': financeCategoryId,
-      if (actualTransactionId != null) 'actual_transaction_id': actualTransactionId,
+      if (actualTransactionId != null)
+        'actual_transaction_id': actualTransactionId,
       if (userId != null) 'user_id': userId,
+      if (bucketId != null) 'bucket_id': bucketId,
     };
   }
 }
diff --git a/lib/features/tasks/modules/tasks/data/repositories/task_repository_impl.dart b/lib/features/tasks/modules/tasks/data/repositories/task_repository_impl.dart
index 291d647..22c4257 100644
--- a/lib/features/tasks/modules/tasks/data/repositories/task_repository_impl.dart
+++ b/lib/features/tasks/modules/tasks/data/repositories/task_repository_impl.dart
@@ -42,6 +42,13 @@ class TaskRepositoryImpl implements TaskRepository {
     return Result.success(task);
   }
 
+  @override
+  Future<Result<List<Task>>> getTasksByBucketID(String bucketId) async {
+    final taskModels = await dataSource.getTasksByBucketId(bucketId);
+    final tasks = taskModels.cast<Task>();
+    return Result.success(tasks);
+  }
+
   @override
   Future<Result<Task>> createTask(Task task) async {
     final model = TaskModel.fromEntity(task);
@@ -89,12 +96,16 @@ class TaskRepositoryImpl implements TaskRepository {
   }
 
   @override
-  Future<Result<Map<DateTime, int>>> getTaskActivityForLastMonths(int months) async {
+  Future<Result<Map<DateTime, int>>> getTaskActivityForLastMonths(
+    int months,
+  ) async {
     try {
       final activity = await dataSource.getTaskActivityForLastMonths(months);
       return Result.success(activity);
     } catch (e) {
-      return Result.error(ServerFailure(message: 'Failed to fetch task activity: $e'));
+      return Result.error(
+        ServerFailure(message: 'Failed to fetch task activity: $e'),
+      );
     }
   }
 }
diff --git a/lib/features/tasks/modules/tasks/domain/entities/task.dart b/lib/features/tasks/modules/tasks/domain/entities/task.dart
index d5b0917..b1824aa 100644
--- a/lib/features/tasks/modules/tasks/domain/entities/task.dart
+++ b/lib/features/tasks/modules/tasks/domain/entities/task.dart
@@ -1,3 +1,6 @@
+// Sentinel value for clearing nullable fields in copyWith
+const _sentinel = Object();
+
 /// Task entity - Pure domain model
 class Task {
   final String? id; // Optional - Supabase auto-generates
@@ -14,6 +17,7 @@ class Task {
   final DateTime? completedAt;
   final bool archived; // Soft delete flag
   final String? userId;
+  final String? bucketId;
 
   // Financial integration fields
   final bool
@@ -43,51 +47,79 @@ class Task {
     this.transactionType,
     this.financeCategoryId,
     this.actualTransactionId,
+    this.bucketId,
     this.userId,
   });
 
   /// Copy with method for immutability
+  /// Use Object? for nullable fields to allow explicitly setting them to null
   Task copyWith({
     String? id,
     String? title,
-    String? description,
+    Object? description = _sentinel,
     TaskStatus? status,
     TaskPriority? priority,
-    String? projectId,
-    String? parentTaskId,
+    Object? projectId = _sentinel,
+    Object? parentTaskId = _sentinel,
     List<String>? tags,
-    DateTime? createdAt,
-    DateTime? updatedAt,
-    DateTime? dueDate,
-    DateTime? completedAt,
+    Object? createdAt = _sentinel,
+    Object? updatedAt = _sentinel,
+    Object? dueDate = _sentinel,
+    Object? completedAt = _sentinel,
     bool? archived,
     bool? isMoneyRelated,
-    double? expectedAmount,
-    TaskTransactionType? transactionType,
-    String? financeCategoryId,
-    String? actualTransactionId,
+    Object? expectedAmount = _sentinel,
+    Object? transactionType = _sentinel,
+    Object? financeCategoryId = _sentinel,
+    Object? actualTransactionId = _sentinel,
     String? userId,
+    Object? bucketId = _sentinel,
   }) {
     return Task(
       id: id ?? this.id,
       title: title ?? this.title,
-      description: description ?? this.description,
+      description: description == _sentinel
+          ? this.description
+          : description as String?,
       status: status ?? this.status,
       priority: priority ?? this.priority,
-      projectId: projectId ?? this.projectId,
-      parentTaskId: parentTaskId ?? this.parentTaskId,
+      projectId: projectId == _sentinel
+          ? this.projectId
+          : projectId as String?,
+      parentTaskId: parentTaskId == _sentinel
+          ? this.parentTaskId
+          : parentTaskId as String?,
       tags: tags ?? this.tags,
-      createdAt: createdAt ?? this.createdAt,
-      updatedAt: updatedAt ?? this.updatedAt,
-      dueDate: dueDate ?? this.dueDate,
-      completedAt: completedAt ?? this.completedAt,
+      createdAt: createdAt == _sentinel
+          ? this.createdAt
+          : createdAt as DateTime?,
+      updatedAt: updatedAt == _sentinel
+          ? this.updatedAt
+          : updatedAt as DateTime?,
+      dueDate: dueDate == _sentinel
+          ? this.dueDate
+          : dueDate as DateTime?,
+      completedAt: completedAt == _sentinel
+          ? this.completedAt
+          : completedAt as DateTime?,
       archived: archived ?? this.archived,
       isMoneyRelated: isMoneyRelated ?? this.isMoneyRelated,
-      expectedAmount: expectedAmount ?? this.expectedAmount,
-      transactionType: transactionType ?? this.transactionType,
-      financeCategoryId: financeCategoryId ?? this.financeCategoryId,
-      actualTransactionId: actualTransactionId ?? this.actualTransactionId,
+      expectedAmount: expectedAmount == _sentinel
+          ? this.expectedAmount
+          : expectedAmount as double?,
+      transactionType: transactionType == _sentinel
+          ? this.transactionType
+          : transactionType as TaskTransactionType?,
+      financeCategoryId: financeCategoryId == _sentinel
+          ? this.financeCategoryId
+          : financeCategoryId as String?,
+      actualTransactionId: actualTransactionId == _sentinel
+          ? this.actualTransactionId
+          : actualTransactionId as String?,
       userId: userId ?? this.userId,
+      bucketId: bucketId == _sentinel
+          ? this.bucketId
+          : bucketId as String?,
     );
   }
 
diff --git a/lib/features/tasks/modules/tasks/domain/repositories/task_repository.dart b/lib/features/tasks/modules/tasks/domain/repositories/task_repository.dart
index 94fad88..e139a37 100644
--- a/lib/features/tasks/modules/tasks/domain/repositories/task_repository.dart
+++ b/lib/features/tasks/modules/tasks/domain/repositories/task_repository.dart
@@ -13,6 +13,9 @@ abstract class TaskRepository {
   /// Get tasks by status
   Future<Result<List<Task>>> getTasksByStatus(TaskStatus status);
 
+  // Get tasks by bucket
+  Future<Result<List<Task>>> getTasksByBucketID(String bucketId);
+
   /// Get task by ID
   Future<Result<Task>> getTaskById(String id);
 
diff --git a/lib/features/tasks/presentation/screens/configuration/bucket_management_screen.dart b/lib/features/tasks/presentation/screens/configuration/bucket_management_screen.dart
new file mode 100644
index 0000000..befa57e
--- /dev/null
+++ b/lib/features/tasks/presentation/screens/configuration/bucket_management_screen.dart
@@ -0,0 +1,544 @@
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:keep_track/core/di/service_locator.dart';
+import 'package:keep_track/core/state/stream_builder_widget.dart';
+import 'package:keep_track/core/ui/app_layout_controller.dart';
+import 'package:keep_track/core/ui/ui.dart';
+import 'package:keep_track/features/tasks/modules/buckets/domain/entities/bucket.dart';
+import 'package:keep_track/features/tasks/modules/tasks/domain/entities/task.dart';
+import 'package:keep_track/shared/infrastructure/supabase/supabase_service.dart';
+
+import '../../state/bucket_controller.dart';
+import '../../state/task_controller.dart';
+
+class BucketManagementScreen extends ScopedScreen {
+  const BucketManagementScreen({super.key});
+
+  @override
+  State<BucketManagementScreen> createState() => _BucketManagementScreenState();
+}
+
+class _BucketManagementScreenState extends ScopedScreenState<BucketManagementScreen>
+    with AppLayoutControlled {
+  late final BucketController _controller;
+  late final TaskController _taskController;
+  late final SupabaseService _supabaseService;
+
+  @override
+  void registerServices() {
+    _controller = locator.get<BucketController>();
+    _taskController = locator.get<TaskController>();
+    _supabaseService = locator.get<SupabaseService>();
+  }
+
+  @override
+  void onReady() {
+    configureLayout(title: 'Manage Buckets', showBottomNav: false);
+  }
+
+  void _showBucketDialog({Bucket? bucket, List<Task>? allTasks}) {
+    showDialog(
+      context: context,
+      builder: (context) => _BucketManagementDialog(
+        bucket: bucket,
+        userId: _supabaseService.userId!,
+        onSave: (updatedBucket) async {
+          try {
+            if (bucket != null) {
+              await _controller.updateBucket(updatedBucket);
+              if (mounted) {
+                ScaffoldMessenger.of(context).showSnackBar(
+                  const SnackBar(
+                    content: Text('Bucket updated successfully'),
+                    backgroundColor: Colors.green,
+                  ),
+                );
+              }
+            } else {
+              await _controller.createBucket(updatedBucket);
+              if (mounted) {
+                ScaffoldMessenger.of(context).showSnackBar(
+                  const SnackBar(
+                    content: Text('Bucket created successfully'),
+                    backgroundColor: Colors.green,
+                  ),
+                );
+              }
+            }
+          } catch (e) {
+            if (mounted) {
+              ScaffoldMessenger.of(context).showSnackBar(
+                SnackBar(
+                  content: Text('Error: ${e.toString()}'),
+                  backgroundColor: Colors.red,
+                ),
+              );
+            }
+          }
+        },
+        onDelete: bucket != null
+            ? () async {
+                try {
+                  // Check if bucket has tasks
+                  if (allTasks != null) {
+                    final tasksInBucket =
+                        allTasks.where((t) => t.bucketId == bucket.id).toList();
+                    if (tasksInBucket.isNotEmpty) {
+                      if (mounted) {
+                        ScaffoldMessenger.of(context).showSnackBar(
+                          SnackBar(
+                            content: Text(
+                              'Cannot delete bucket: ${tasksInBucket.length} task(s) associated. Remove tasks from bucket first.',
+                            ),
+                            backgroundColor: Colors.orange,
+                            duration: const Duration(seconds: 4),
+                          ),
+                        );
+                      }
+                      return;
+                    }
+                  }
+
+                  await _controller.deleteBucket(bucket.id!);
+                  if (mounted) {
+                    ScaffoldMessenger.of(context).showSnackBar(
+                      const SnackBar(
+                        content: Text('Bucket deleted successfully'),
+                        backgroundColor: Colors.green,
+                      ),
+                    );
+                  }
+                } catch (e) {
+                  if (mounted) {
+                    ScaffoldMessenger.of(context).showSnackBar(
+                      SnackBar(
+                        content: Text('Error deleting bucket: ${e.toString()}'),
+                        backgroundColor: Colors.red,
+                      ),
+                    );
+                  }
+                }
+              }
+            : null,
+        onArchive: bucket != null && !bucket.isArchive
+            ? () async {
+                try {
+                  await _controller.archiveBucket(bucket.id!);
+                  if (mounted) {
+                    Navigator.pop(context);
+                    ScaffoldMessenger.of(context).showSnackBar(
+                      const SnackBar(
+                        content: Text('Bucket archived successfully'),
+                        backgroundColor: Colors.green,
+                      ),
+                    );
+                  }
+                } catch (e) {
+                  if (mounted) {
+                    ScaffoldMessenger.of(context).showSnackBar(
+                      SnackBar(
+                        content: Text('Error archiving bucket: ${e.toString()}'),
+                        backgroundColor: Colors.red,
+                      ),
+                    );
+                  }
+                }
+              }
+            : null,
+        onUnarchive: bucket != null && bucket.isArchive
+            ? () async {
+                try {
+                  await _controller.unarchiveBucket(bucket.id!);
+                  if (mounted) {
+                    Navigator.pop(context);
+                    ScaffoldMessenger.of(context).showSnackBar(
+                      const SnackBar(
+                        content: Text('Bucket unarchived successfully'),
+                        backgroundColor: Colors.green,
+                      ),
+                    );
+                  }
+                } catch (e) {
+                  if (mounted) {
+                    ScaffoldMessenger.of(context).showSnackBar(
+                      SnackBar(
+                        content: Text('Error unarchiving bucket: ${e.toString()}'),
+                        backgroundColor: Colors.red,
+                      ),
+                    );
+                  }
+                }
+              }
+            : null,
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Buckets'),
+        actions: [
+          AsyncStreamBuilder<List<Task>>(
+            state: _taskController,
+            builder: (context, tasks) {
+              return IconButton(
+                onPressed: () => _showBucketDialog(allTasks: tasks),
+                icon: const Icon(Icons.add),
+              );
+            },
+            loadingBuilder: (_) => IconButton(
+              onPressed: () => _showBucketDialog(),
+              icon: const Icon(Icons.add),
+            ),
+            errorBuilder: (_, __) => IconButton(
+              onPressed: () => _showBucketDialog(),
+              icon: const Icon(Icons.add),
+            ),
+          ),
+        ],
+      ),
+      body: AsyncStreamBuilder<List<Task>>(
+        state: _taskController,
+        builder: (context, tasks) {
+          return AsyncStreamBuilder<List<Bucket>>(
+            state: _controller,
+            builder: (context, buckets) {
+              final activeBuckets = buckets.where((b) => !b.isArchive).length;
+
+              return Column(
+                children: [
+                  // Stats card
+                  Card(
+                    margin: const EdgeInsets.all(16),
+                    child: ListTile(
+                      title: const Text('Total Buckets'),
+                      subtitle: Text('$activeBuckets active'),
+                      trailing: Text(
+                        '${buckets.length}',
+                        style: const TextStyle(
+                          fontWeight: FontWeight.bold,
+                          fontSize: 18,
+                        ),
+                      ),
+                    ),
+                  ),
+
+                  // Buckets list or empty state
+                  Expanded(
+                    child: buckets.isEmpty
+                        ? const Center(
+                            child: Column(
+                              mainAxisAlignment: MainAxisAlignment.center,
+                              children: [
+                                Icon(
+                                  Icons.inbox_outlined,
+                                  size: 64,
+                                  color: Colors.grey,
+                                ),
+                                SizedBox(height: 16),
+                                Text('No buckets found.'),
+                                SizedBox(height: 8),
+                                Text(
+                                  'Tap + to create your first bucket',
+                                  style: TextStyle(color: Colors.grey),
+                                ),
+                              ],
+                            ),
+                          )
+                        : ListView.builder(
+                            padding: const EdgeInsets.symmetric(horizontal: 16),
+                            itemCount: buckets.length,
+                            itemBuilder: (context, index) {
+                              final bucket = buckets[index];
+                              final taskCount = tasks
+                                  .where((t) => t.bucketId == bucket.id)
+                                  .length;
+
+                              return Card(
+                                margin: const EdgeInsets.only(bottom: 12),
+                                child: ListTile(
+                                  leading: Container(
+                                    width: 40,
+                                    height: 40,
+                                    decoration: BoxDecoration(
+                                      color: Colors.purple.withOpacity(0.1),
+                                      borderRadius: BorderRadius.circular(8),
+                                    ),
+                                    child: Icon(
+                                      Icons.inbox,
+                                      color: bucket.isArchive
+                                          ? Colors.grey
+                                          : Colors.purple[700],
+                                    ),
+                                  ),
+                                  title: Text(
+                                    bucket.name,
+                                    style: TextStyle(
+                                      decoration: bucket.isArchive
+                                          ? TextDecoration.lineThrough
+                                          : null,
+                                    ),
+                                  ),
+                                  subtitle: Column(
+                                    crossAxisAlignment: CrossAxisAlignment.start,
+                                    children: [
+                                      Text('$taskCount task(s)'),
+                                      if (bucket.createdAt != null)
+                                        Text(
+                                          'Created: ${DateFormat('MMM d, yyyy').format(bucket.createdAt!)}',
+                                          style: TextStyle(
+                                            fontSize: 12,
+                                            color: Theme.of(context)
+                                                .colorScheme
+                                                .onSurface
+                                                .withOpacity(0.6),
+                                          ),
+                                        ),
+                                    ],
+                                  ),
+                                  trailing: Row(
+                                    mainAxisSize: MainAxisSize.min,
+                                    children: [
+                                      if (bucket.isArchive)
+                                        const Icon(
+                                          Icons.archive,
+                                          color: Colors.orange,
+                                        ),
+                                    ],
+                                  ),
+                                  onTap: () => _showBucketDialog(
+                                    bucket: bucket,
+                                    allTasks: tasks,
+                                  ),
+                                ),
+                              );
+                            },
+                          ),
+                  ),
+                ],
+              );
+            },
+            loadingBuilder: (_) =>
+                const Center(child: CircularProgressIndicator()),
+            errorBuilder: (context, message) => Center(child: Text(message)),
+          );
+        },
+        loadingBuilder: (_) => const Center(child: CircularProgressIndicator()),
+        errorBuilder: (context, message) => Center(child: Text(message)),
+      ),
+    );
+  }
+}
+
+/// Bucket Management Dialog
+class _BucketManagementDialog extends StatefulWidget {
+  final Bucket? bucket;
+  final String userId;
+  final Future<void> Function(Bucket) onSave;
+  final Future<void> Function()? onDelete;
+  final Future<void> Function()? onArchive;
+  final Future<void> Function()? onUnarchive;
+
+  const _BucketManagementDialog({
+    this.bucket,
+    required this.userId,
+    required this.onSave,
+    this.onDelete,
+    this.onArchive,
+    this.onUnarchive,
+  });
+
+  @override
+  State<_BucketManagementDialog> createState() =>
+      _BucketManagementDialogState();
+}
+
+class _BucketManagementDialogState extends State<_BucketManagementDialog> {
+  final _formKey = GlobalKey<FormState>();
+  late final TextEditingController _nameController;
+  bool _isSaving = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _nameController = TextEditingController(text: widget.bucket?.name ?? '');
+  }
+
+  @override
+  void dispose() {
+    _nameController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _save() async {
+    if (!_formKey.currentState!.validate()) return;
+
+    setState(() {
+      _isSaving = true;
+    });
+
+    try {
+      final bucket = Bucket(
+        id: widget.bucket?.id,
+        name: _nameController.text.trim(),
+        isArchive: widget.bucket?.isArchive ?? false,
+        userId: widget.userId,
+        createdAt: widget.bucket?.createdAt,
+        updatedAt: widget.bucket?.updatedAt,
+      );
+
+      await widget.onSave(bucket);
+      if (mounted) Navigator.pop(context);
+    } catch (e) {
+      if (mounted) {
+        setState(() {
+          _isSaving = false;
+        });
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text('Error: ${e.toString()}'),
+            backgroundColor: Colors.red,
+          ),
+        );
+      }
+    }
+  }
+
+  Future<void> _handleDelete() async {
+    final confirm = await showDialog<bool>(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: const Text('Delete Bucket'),
+        content: const Text(
+          'Are you sure you want to delete this bucket? This action cannot be undone.',
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(context, false),
+            child: const Text('Cancel'),
+          ),
+          TextButton(
+            onPressed: () => Navigator.pop(context, true),
+            child: const Text('Delete', style: TextStyle(color: Colors.red)),
+          ),
+        ],
+      ),
+    );
+
+    if (confirm == true && mounted) {
+      await widget.onDelete?.call();
+      if (mounted) Navigator.pop(context);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final isEdit = widget.bucket != null;
+
+    return Dialog(
+      child: Container(
+        width: 500,
+        constraints: const BoxConstraints(maxHeight: 400),
+        padding: const EdgeInsets.all(24),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            // Header
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Text(
+                  isEdit ? 'Edit Bucket' : 'Create Bucket',
+                  style: const TextStyle(
+                    fontSize: 20,
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
+                IconButton(
+                  icon: const Icon(Icons.close),
+                  onPressed: () => Navigator.pop(context),
+                ),
+              ],
+            ),
+            const SizedBox(height: 24),
+
+            // Form
+            Form(
+              key: _formKey,
+              child: Column(
+                children: [
+                  TextFormField(
+                    controller: _nameController,
+                    decoration: const InputDecoration(
+                      labelText: 'Bucket Name',
+                      border: OutlineInputBorder(),
+                      prefixIcon: Icon(Icons.inbox),
+                    ),
+                    validator: (value) {
+                      if (value == null || value.trim().isEmpty) {
+                        return 'Please enter a bucket name';
+                      }
+                      return null;
+                    },
+                    autofocus: true,
+                  ),
+                ],
+              ),
+            ),
+            const SizedBox(height: 24),
+
+            // Action buttons
+            Row(
+              mainAxisAlignment: MainAxisAlignment.end,
+              children: [
+                if (isEdit && widget.onDelete != null) ...[
+                  TextButton(
+                    onPressed: _isSaving ? null : _handleDelete,
+                    child: const Text(
+                      'Delete',
+                      style: TextStyle(color: Colors.red),
+                    ),
+                  ),
+                  const Spacer(),
+                ],
+                if (widget.onArchive != null)
+                  TextButton(
+                    onPressed: _isSaving ? null : widget.onArchive,
+                    child: const Text('Archive'),
+                  ),
+                if (widget.onUnarchive != null)
+                  TextButton(
+                    onPressed: _isSaving ? null : widget.onUnarchive,
+                    child: const Text('Unarchive'),
+                  ),
+                const SizedBox(width: 8),
+                TextButton(
+                  onPressed: _isSaving ? null : () => Navigator.pop(context),
+                  child: const Text('Cancel'),
+                ),
+                const SizedBox(width: 8),
+                ElevatedButton(
+                  onPressed: _isSaving ? null : _save,
+                  child: _isSaving
+                      ? const SizedBox(
+                          width: 16,
+                          height: 16,
+                          child: CircularProgressIndicator(
+                            strokeWidth: 2,
+                            valueColor:
+                                AlwaysStoppedAnimation<Color>(Colors.white),
+                          ),
+                        )
+                      : Text(isEdit ? 'Save' : 'Create'),
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/features/tasks/presentation/screens/configuration/project_management_screen.dart b/lib/features/tasks/presentation/screens/configuration/project_management_screen.dart
index 57d25e8..49238f9 100644
--- a/lib/features/tasks/presentation/screens/configuration/project_management_screen.dart
+++ b/lib/features/tasks/presentation/screens/configuration/project_management_screen.dart
@@ -4,10 +4,12 @@ import 'package:keep_track/core/di/service_locator.dart';
 import 'package:keep_track/core/state/stream_builder_widget.dart';
 import 'package:keep_track/core/ui/app_layout_controller.dart';
 import 'package:keep_track/core/ui/ui.dart';
+import 'package:keep_track/features/tasks/modules/buckets/domain/entities/bucket.dart';
 import 'package:keep_track/features/tasks/modules/projects/domain/entities/project.dart';
 import 'package:keep_track/features/tasks/modules/tasks/domain/entities/task.dart';
 import 'package:keep_track/shared/infrastructure/supabase/supabase_service.dart';
 
+import '../../state/bucket_controller.dart';
 import '../../state/project_controller.dart';
 import '../../state/task_controller.dart';
 import 'widgets/project_management_dialog.dart';
@@ -24,18 +26,21 @@ class _ProjectManagementScreenState extends ScopedScreenState<ProjectManagementS
     with AppLayoutControlled {
   late final ProjectController _controller;
   late final TaskController _taskController;
+  late final BucketController _bucketController;
   late final SupabaseService supabaseService;
 
   @override
   void registerServices() {
     _controller = locator.get<ProjectController>();
     _taskController = locator.get<TaskController>();
+    _bucketController = locator.get<BucketController>();
     supabaseService = locator.get<SupabaseService>();
   }
 
   @override
   void onReady() {
     configureLayout(title: 'Manage Projects', showBottomNav: false);
+    _bucketController.loadBuckets();
   }
 
   void _showMetadataEditor(Project project) async {
@@ -66,12 +71,13 @@ class _ProjectManagementScreenState extends ScopedScreenState<ProjectManagementS
     }
   }
 
-  void _showProjectDialog({Project? project, List<Task>? allTasks}) {
+  void _showProjectDialog({Project? project, List<Task>? allTasks, List<Bucket>? buckets}) {
     showDialog(
       context: context,
       builder: (context) => ProjectManagementDialog(
         project: project,
         userId: supabaseService.userId!,
+        buckets: buckets,
         onSave: (updatedProject) async {
           try {
             if (project != null) {
@@ -155,6 +161,19 @@ class _ProjectManagementScreenState extends ScopedScreenState<ProjectManagementS
 
   @override
   Widget build(BuildContext context) {
+    return AsyncStreamBuilder<List<Bucket>>(
+      state: _bucketController,
+      loadingBuilder: (_) => const Scaffold(
+        body: Center(child: CircularProgressIndicator()),
+      ),
+      errorBuilder: (_, __) => _buildScaffold(null, null, null),
+      builder: (context, buckets) {
+        return _buildScaffold(buckets, null, null);
+      },
+    );
+  }
+
+  Widget _buildScaffold(List<Bucket>? buckets, List<Task>? tasks, List<Project>? projects) {
     return Scaffold(
       appBar: AppBar(
         title: const Text('Projects'),
@@ -163,16 +182,16 @@ class _ProjectManagementScreenState extends ScopedScreenState<ProjectManagementS
             state: _taskController,
             builder: (context, tasks) {
               return IconButton(
-                onPressed: () => _showProjectDialog(allTasks: tasks),
+                onPressed: () => _showProjectDialog(allTasks: tasks, buckets: buckets),
                 icon: const Icon(Icons.add),
               );
             },
             loadingBuilder: (_) => IconButton(
-              onPressed: () => _showProjectDialog(),
+              onPressed: () => _showProjectDialog(buckets: buckets),
               icon: const Icon(Icons.add),
             ),
             errorBuilder: (_, __) => IconButton(
-              onPressed: () => _showProjectDialog(),
+              onPressed: () => _showProjectDialog(buckets: buckets),
               icon: const Icon(Icons.add),
             ),
           ),
@@ -291,6 +310,7 @@ class _ProjectManagementScreenState extends ScopedScreenState<ProjectManagementS
                               onTap: () => _showProjectDialog(
                                 project: project,
                                 allTasks: tasks,
+                                buckets: buckets,
                               ),
                             ),
                           );
diff --git a/lib/features/tasks/presentation/screens/configuration/widgets/project_management_dialog.dart b/lib/features/tasks/presentation/screens/configuration/widgets/project_management_dialog.dart
index e833b08..29db7bd 100644
--- a/lib/features/tasks/presentation/screens/configuration/widgets/project_management_dialog.dart
+++ b/lib/features/tasks/presentation/screens/configuration/widgets/project_management_dialog.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_colorpicker/flutter_colorpicker.dart';
+import 'package:keep_track/features/tasks/modules/buckets/domain/entities/bucket.dart';
 import 'package:keep_track/features/tasks/modules/projects/domain/entities/project.dart';
 
 class ProjectManagementDialog extends StatefulWidget {
@@ -7,6 +8,7 @@ class ProjectManagementDialog extends StatefulWidget {
   final String userId;
   final Future<void> Function(Project) onSave;
   final Future<void> Function()? onDelete;
+  final List<Bucket>? buckets;
 
   const ProjectManagementDialog({
     super.key,
@@ -14,6 +16,7 @@ class ProjectManagementDialog extends StatefulWidget {
     required this.userId,
     required this.onSave,
     this.onDelete,
+    this.buckets,
   });
 
   @override
@@ -28,6 +31,7 @@ class _ProjectManagementDialogState extends State<ProjectManagementDialog> {
 
   bool _isArchived = false;
   Color _selectedColor = Colors.blue;
+  String? _selectedBucketId;
 
   @override
   void initState() {
@@ -40,6 +44,7 @@ class _ProjectManagementDialogState extends State<ProjectManagementDialog> {
         ? Color(
             int.parse(widget.project!.color!.replaceFirst('#', '0xff')))
         : Colors.blue;
+    _selectedBucketId = widget.project?.bucketId;
   }
 
   @override
@@ -102,6 +107,31 @@ class _ProjectManagementDialogState extends State<ProjectManagementDialog> {
                 ),
                 const SizedBox(height: 16),
 
+                // Bucket Selection
+                if (widget.buckets != null && widget.buckets!.isNotEmpty) ...[
+                  DropdownButtonFormField<String?>(
+                    value: _selectedBucketId,
+                    decoration: const InputDecoration(
+                      labelText: 'Bucket',
+                      border: OutlineInputBorder(),
+                    ),
+                    items: [
+                      const DropdownMenuItem<String?>(
+                        value: null,
+                        child: Text('No Bucket'),
+                      ),
+                      ...widget.buckets!.where((b) => !b.isArchive).map(
+                        (bucket) => DropdownMenuItem<String?>(
+                          value: bucket.id,
+                          child: Text(bucket.name),
+                        ),
+                      ),
+                    ],
+                    onChanged: (v) => setState(() => _selectedBucketId = v),
+                  ),
+                  const SizedBox(height: 16),
+                ],
+
                 // Archived
                 SwitchListTile(
                   contentPadding: EdgeInsets.zero,
@@ -198,6 +228,7 @@ class _ProjectManagementDialogState extends State<ProjectManagementDialog> {
       userId: widget.userId,
       createdAt: widget.project?.createdAt,
       updatedAt: widget.project?.updatedAt,
+      bucketId: _selectedBucketId,
     );
 
     await widget.onSave(project);
diff --git a/lib/features/tasks/presentation/screens/create_project_page.dart b/lib/features/tasks/presentation/screens/create_project_page.dart
index 72ef4d9..af370f1 100644
--- a/lib/features/tasks/presentation/screens/create_project_page.dart
+++ b/lib/features/tasks/presentation/screens/create_project_page.dart
@@ -1,5 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:keep_track/core/di/service_locator.dart';
+import 'package:keep_track/core/state/stream_builder_widget.dart';
+import 'package:keep_track/features/tasks/modules/buckets/domain/entities/bucket.dart';
+import 'package:keep_track/features/tasks/presentation/state/bucket_controller.dart';
 import 'package:keep_track/features/tasks/presentation/state/project_controller.dart';
 import 'package:keep_track/features/tasks/presentation/screens/configuration/widgets/project_management_dialog.dart';
 import 'package:keep_track/shared/infrastructure/supabase/supabase_service.dart';
@@ -13,48 +16,61 @@ class CreateProjectPage extends StatefulWidget {
 
 class _CreateProjectPageState extends State<CreateProjectPage> {
   late final ProjectController _controller;
+  late final BucketController _bucketController;
   late final SupabaseService _supabaseService;
 
   @override
   void initState() {
     super.initState();
     _controller = locator.get<ProjectController>();
+    _bucketController = locator.get<BucketController>();
     _supabaseService = locator.get<SupabaseService>();
+    _bucketController.loadBuckets();
   }
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(title: const Text('Create Project')),
-      body: SingleChildScrollView(
-        child: Padding(
-          padding: const EdgeInsets.all(16.0),
-          child: ProjectManagementDialog(
-            userId: _supabaseService.userId!,
-            onSave: (newProject) async {
-              try {
-                await _controller.createProject(newProject);
-                if (mounted) {
-                  ScaffoldMessenger.of(context).showSnackBar(
-                    const SnackBar(
-                      content: Text('Project created successfully'),
-                      backgroundColor: Colors.green,
-                    ),
-                  );
-                  Navigator.pop(context);
-                }
-              } catch (e) {
-                if (mounted) {
-                  ScaffoldMessenger.of(context).showSnackBar(
-                    SnackBar(
-                      content: Text('Error: ${e.toString()}'),
-                      backgroundColor: Colors.red,
-                    ),
-                  );
-                }
+      body: AsyncStreamBuilder<List<Bucket>>(
+        state: _bucketController,
+        loadingBuilder: (_) => const Center(child: CircularProgressIndicator()),
+        errorBuilder: (_, __) => _buildForm(null),
+        builder: (context, buckets) => _buildForm(buckets),
+      ),
+    );
+  }
+
+  Widget _buildForm(List<Bucket>? buckets) {
+    return SingleChildScrollView(
+      child: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: ProjectManagementDialog(
+          userId: _supabaseService.userId!,
+          buckets: buckets,
+          onSave: (newProject) async {
+            try {
+              await _controller.createProject(newProject);
+              if (mounted) {
+                ScaffoldMessenger.of(context).showSnackBar(
+                  const SnackBar(
+                    content: Text('Project created successfully'),
+                    backgroundColor: Colors.green,
+                  ),
+                );
+                Navigator.pop(context);
+              }
+            } catch (e) {
+              if (mounted) {
+                ScaffoldMessenger.of(context).showSnackBar(
+                  SnackBar(
+                    content: Text('Error: ${e.toString()}'),
+                    backgroundColor: Colors.red,
+                  ),
+                );
               }
-            },
-          ),
+            }
+          },
         ),
       ),
     );
diff --git a/lib/features/tasks/presentation/screens/project_details_screen.dart b/lib/features/tasks/presentation/screens/project_details_screen.dart
index 3124fcb..3e8b880 100644
--- a/lib/features/tasks/presentation/screens/project_details_screen.dart
+++ b/lib/features/tasks/presentation/screens/project_details_screen.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
+import 'package:url_launcher/url_launcher.dart';
 import 'package:keep_track/core/di/service_locator.dart';
 import 'package:keep_track/core/routing/app_router.dart';
 import 'package:keep_track/core/state/stream_builder_widget.dart';
@@ -11,6 +12,7 @@ import 'package:keep_track/features/tasks/modules/pomodoro/domain/entities/pomod
 import 'package:keep_track/features/tasks/presentation/state/project_controller.dart';
 import 'package:keep_track/features/tasks/presentation/state/task_controller.dart';
 import 'package:keep_track/features/tasks/presentation/state/pomodoro_session_controller.dart';
+import 'package:flutter_colorpicker/flutter_colorpicker.dart';
 
 import 'package:keep_track/core/theme/app_theme.dart';
 import 'package:keep_track/core/ui/responsive/desktop_aware_screen.dart';
@@ -224,6 +226,13 @@ class _ProjectDetailsScreenState extends ScopedScreenState<ProjectDetailsScreen>
                   icon: const Icon(Icons.arrow_back),
                   onPressed: () => Navigator.pop(context),
                 ),
+                actions: [
+                  IconButton(
+                    icon: const Icon(Icons.edit),
+                    tooltip: 'Edit Project',
+                    onPressed: () => _showEditProjectDialog(currentProject),
+                  ),
+                ],
               ),
               body: SingleChildScrollView(
                 padding: EdgeInsets.all(isDesktop ? AppSpacing.xl : 16),
@@ -589,9 +598,7 @@ class _ProjectDetailsScreenState extends ScopedScreenState<ProjectDetailsScreen>
                     if (_isUrl(entry.value))
                       IconButton(
                         icon: const Icon(Icons.open_in_new, size: 18),
-                        onPressed: () {
-                          // TODO: Open URL in browser
-                        },
+                        onPressed: () => _launchUrl(entry.value),
                       ),
                   ],
                 ),
@@ -873,6 +880,46 @@ class _ProjectDetailsScreenState extends ScopedScreenState<ProjectDetailsScreen>
     return text.startsWith('http://') || text.startsWith('https://');
   }
 
+  Future<void> _launchUrl(String url) async {
+    final uri = Uri.parse(url);
+    if (await canLaunchUrl(uri)) {
+      await launchUrl(uri, mode: LaunchMode.externalApplication);
+    } else {
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text('Could not open $url'),
+            backgroundColor: Colors.red,
+          ),
+        );
+      }
+    }
+  }
+
+  void _showEditProjectDialog(Project project) async {
+    final result = await showDialog<bool>(
+      context: context,
+      builder: (context) => _ProjectEditorDialog(
+        project: project,
+        onSave: (updatedProject) async {
+          await _projectController.updateProject(updatedProject);
+          return true;
+        },
+      ),
+    );
+
+    if (result == true && mounted) {
+      await _projectController.loadProjects();
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(
+          content: Text('Project updated successfully'),
+          backgroundColor: Colors.green,
+          duration: Duration(seconds: 2),
+        ),
+      );
+    }
+  }
+
   void _showMetadataEditor(Project project) async {
     final result = await showDialog<bool>(
       context: context,
@@ -1464,3 +1511,274 @@ class _MetadataEditorDialogState extends State<_MetadataEditorDialog> {
     }
   }
 }
+
+/// Project Editor Dialog - Allows editing project name, description, status, and color
+class _ProjectEditorDialog extends StatefulWidget {
+  final Project project;
+  final Future<bool> Function(Project) onSave;
+
+  const _ProjectEditorDialog({required this.project, required this.onSave});
+
+  @override
+  State<_ProjectEditorDialog> createState() => _ProjectEditorDialogState();
+}
+
+class _ProjectEditorDialogState extends State<_ProjectEditorDialog> {
+  late TextEditingController _nameController;
+  late TextEditingController _descriptionController;
+  late ProjectStatus _status;
+  late Color _selectedColor;
+  bool _isSaving = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _nameController = TextEditingController(text: widget.project.name);
+    _descriptionController = TextEditingController(
+      text: widget.project.description ?? '',
+    );
+    _status = widget.project.status;
+    _selectedColor = widget.project.color != null
+        ? Color(int.parse(widget.project.color!.replaceFirst('#', '0xff')))
+        : Colors.blue[700]!;
+  }
+
+  @override
+  void dispose() {
+    _nameController.dispose();
+    _descriptionController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _saveProject() async {
+    if (_nameController.text.trim().isEmpty) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(
+          content: Text('Project name cannot be empty'),
+          backgroundColor: Colors.red,
+        ),
+      );
+      return;
+    }
+
+    setState(() {
+      _isSaving = true;
+    });
+
+    try {
+      final colorHex =
+          '#${_selectedColor.value.toRadixString(16).substring(2).toUpperCase()}';
+      final updatedProject = widget.project.copyWith(
+        name: _nameController.text.trim(),
+        description: _descriptionController.text.trim().isEmpty
+            ? null
+            : _descriptionController.text.trim(),
+        status: _status,
+        color: colorHex,
+      );
+
+      final success = await widget.onSave(updatedProject);
+      if (mounted) {
+        Navigator.pop(context, success);
+      }
+    } catch (e) {
+      if (mounted) {
+        setState(() {
+          _isSaving = false;
+        });
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text('Error saving project: $e'),
+            backgroundColor: Colors.red,
+          ),
+        );
+      }
+    }
+  }
+
+  void _showColorPicker() {
+    showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: const Text('Pick a Color'),
+        content: SingleChildScrollView(
+          child: BlockPicker(
+            pickerColor: _selectedColor,
+            onColorChanged: (color) {
+              setState(() {
+                _selectedColor = color;
+              });
+              Navigator.pop(context);
+            },
+          ),
+        ),
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Dialog(
+      child: Container(
+        width: 500,
+        constraints: const BoxConstraints(maxHeight: 600),
+        padding: const EdgeInsets.all(24),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            // Header
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                const Text(
+                  'Edit Project',
+                  style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
+                ),
+                IconButton(
+                  icon: const Icon(Icons.close),
+                  onPressed: () => Navigator.pop(context),
+                ),
+              ],
+            ),
+            const SizedBox(height: 24),
+
+            // Project Name
+            TextField(
+              controller: _nameController,
+              decoration: const InputDecoration(
+                labelText: 'Project Name',
+                border: OutlineInputBorder(),
+                prefixIcon: Icon(Icons.folder),
+              ),
+            ),
+            const SizedBox(height: 16),
+
+            // Description
+            TextField(
+              controller: _descriptionController,
+              maxLines: 3,
+              decoration: const InputDecoration(
+                labelText: 'Description (optional)',
+                border: OutlineInputBorder(),
+                prefixIcon: Icon(Icons.description),
+                alignLabelWithHint: true,
+              ),
+            ),
+            const SizedBox(height: 16),
+
+            // Status
+            DropdownButtonFormField<ProjectStatus>(
+              value: _status,
+              decoration: const InputDecoration(
+                labelText: 'Status',
+                border: OutlineInputBorder(),
+                prefixIcon: Icon(Icons.flag),
+              ),
+              items: ProjectStatus.values.map((status) {
+                return DropdownMenuItem(
+                  value: status,
+                  child: Row(
+                    children: [
+                      Icon(
+                        status == ProjectStatus.active
+                            ? Icons.play_circle
+                            : status == ProjectStatus.postponed
+                            ? Icons.pause_circle
+                            : Icons.check_circle,
+                        color: status == ProjectStatus.active
+                            ? Colors.green
+                            : status == ProjectStatus.postponed
+                            ? Colors.orange
+                            : Colors.grey,
+                        size: 20,
+                      ),
+                      const SizedBox(width: 8),
+                      Text(status.displayName),
+                    ],
+                  ),
+                );
+              }).toList(),
+              onChanged: (value) {
+                if (value != null) {
+                  setState(() {
+                    _status = value;
+                  });
+                }
+              },
+            ),
+            const SizedBox(height: 16),
+
+            // Color Picker
+            InkWell(
+              onTap: _showColorPicker,
+              child: Container(
+                padding: const EdgeInsets.all(16),
+                decoration: BoxDecoration(
+                  border: Border.all(
+                    color: Theme.of(context).colorScheme.outline,
+                  ),
+                  borderRadius: BorderRadius.circular(4),
+                ),
+                child: Row(
+                  children: [
+                    Icon(
+                      Icons.color_lens,
+                      color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
+                    ),
+                    const SizedBox(width: 12),
+                    Expanded(
+                      child: Text(
+                        'Project Color',
+                        style: TextStyle(
+                          color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
+                        ),
+                      ),
+                    ),
+                    Container(
+                      width: 40,
+                      height: 40,
+                      decoration: BoxDecoration(
+                        color: _selectedColor,
+                        borderRadius: BorderRadius.circular(8),
+                        border: Border.all(color: Colors.grey),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+            const SizedBox(height: 24),
+
+            // Action buttons
+            Row(
+              mainAxisAlignment: MainAxisAlignment.end,
+              children: [
+                TextButton(
+                  onPressed: _isSaving ? null : () => Navigator.pop(context, false),
+                  child: const Text('Cancel'),
+                ),
+                const SizedBox(width: 12),
+                ElevatedButton(
+                  onPressed: _isSaving ? null : _saveProject,
+                  child: _isSaving
+                      ? const SizedBox(
+                          width: 16,
+                          height: 16,
+                          child: CircularProgressIndicator(
+                            strokeWidth: 2,
+                            valueColor: AlwaysStoppedAnimation<Color>(
+                              Colors.white,
+                            ),
+                          ),
+                        )
+                      : const Text('Save Changes'),
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/features/tasks/presentation/screens/tabs/pomodoro_tab.dart b/lib/features/tasks/presentation/screens/tabs/pomodoro_tab.dart
index 0089888..7498347 100644
--- a/lib/features/tasks/presentation/screens/tabs/pomodoro_tab.dart
+++ b/lib/features/tasks/presentation/screens/tabs/pomodoro_tab.dart
@@ -246,6 +246,9 @@ class _PomodoroTabState extends ScopedScreenState<PomodoroTab>
             case PomodoroSessionType.longBreak:
               sessionColor = Colors.blue;
               break;
+            case PomodoroSessionType.stopwatch:
+              sessionColor = Colors.amber;
+              break;
           }
         }
 
@@ -353,16 +356,26 @@ class _PomodoroTabState extends ScopedScreenState<PomodoroTab>
     bool isRunning,
     Color sessionColor,
   ) {
-    int remainingSeconds = 0;
+    int displaySeconds = 0;
     double progress = 0.0;
+    bool isStopwatch = session?.isStopwatch ?? false;
 
     if (session != null) {
-      remainingSeconds = session.remainingSeconds;
-      progress = session.progress;
+      if (isStopwatch) {
+        // Stopwatch: show elapsed time (counting up)
+        displaySeconds = session.elapsedSeconds;
+        progress = 1.0; // Full circle for stopwatch
+      } else {
+        // Regular timer: show remaining time (counting down)
+        displaySeconds = session.remainingSeconds;
+        progress = session.progress;
+      }
     }
 
-    final minutes = remainingSeconds ~/ 60;
-    final seconds = remainingSeconds % 60;
+    // Handle hour display for long stopwatch sessions
+    final hours = displaySeconds ~/ 3600;
+    final minutes = (displaySeconds % 3600) ~/ 60;
+    final seconds = displaySeconds % 60;
 
     return SizedBox(
       width: 300,
@@ -384,10 +397,12 @@ class _PomodoroTabState extends ScopedScreenState<PomodoroTab>
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
               Text(
-                '${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}',
+                hours > 0
+                    ? '${hours.toString()}:${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}'
+                    : '${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}',
                 style: Theme.of(context).textTheme.displayLarge?.copyWith(
                   fontWeight: FontWeight.bold,
-                  fontSize: 72,
+                  fontSize: hours > 0 ? 56 : 72,
                   color: session != null ? sessionColor : null,
                 ),
               ),
@@ -453,6 +468,13 @@ class _PomodoroTabState extends ScopedScreenState<PomodoroTab>
           Colors.blue,
           '${_settings.longBreakDuration} min',
         ),
+        _buildSessionTypeChip(
+          'Stopwatch',
+          PomodoroSessionType.stopwatch,
+          Colors.amber,
+          'No limit',
+          icon: Icons.timer_outlined,
+        ),
       ],
     );
   }
@@ -461,12 +483,13 @@ class _PomodoroTabState extends ScopedScreenState<PomodoroTab>
     String label,
     PomodoroSessionType type,
     Color color,
-    String duration,
-  ) {
+    String duration, {
+    IconData icon = Icons.timer,
+  }) {
     return ActionChip(
       avatar: CircleAvatar(
         backgroundColor: color,
-        child: const Icon(Icons.timer, color: Colors.white, size: 18),
+        child: Icon(icon, color: Colors.white, size: 18),
       ),
       label: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
@@ -483,7 +506,8 @@ class _PomodoroTabState extends ScopedScreenState<PomodoroTab>
         ],
       ),
       onPressed: () {
-        if (type == PomodoroSessionType.pomodoro) {
+        if (type == PomodoroSessionType.pomodoro ||
+            type == PomodoroSessionType.stopwatch) {
           _showProjectSelectorDialog(type);
         } else {
           _controller.startSession(type);
@@ -562,6 +586,7 @@ class _PomodoroTabState extends ScopedScreenState<PomodoroTab>
                       horizontal: 16,
                       vertical: 16,
                     ),
+                    foregroundColor: Colors.green,
                   ),
                 ),
               ),
@@ -615,6 +640,7 @@ class _PomodoroTabState extends ScopedScreenState<PomodoroTab>
           label: const Text('Complete'),
           style: OutlinedButton.styleFrom(
             padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 16),
+            foregroundColor: Colors.green,
           ),
         ),
         const SizedBox(width: 12),
@@ -986,6 +1012,9 @@ class _PomodoroTabState extends ScopedScreenState<PomodoroTab>
       case PomodoroSessionType.longBreak:
         typeColor = Colors.blue;
         break;
+      case PomodoroSessionType.stopwatch:
+        typeColor = Colors.amber;
+        break;
     }
 
     IconData statusIcon;
@@ -1030,8 +1059,13 @@ class _PomodoroTabState extends ScopedScreenState<PomodoroTab>
         subtitle: Padding(
           padding: const EdgeInsets.only(top: 6),
           child: Text(
-            '${_formatDateTime(session.startedAt)} • ${session.durationSeconds ~/ 60} min',
-            style: TextStyle(fontSize: 13, color: Colors.grey[600]),
+            session.isStopwatch
+                ? '${_formatDateTime(session.startedAt)} • ${_formatElapsedTime(session.elapsedSeconds)}'
+                : '${_formatDateTime(session.startedAt)} • ${session.durationSeconds ~/ 60} min',
+            style: TextStyle(
+              fontSize: 13,
+              color: Theme.of(context).colorScheme.onSurfaceVariant,
+            ),
           ),
         ),
         trailing: Container(
@@ -1532,6 +1566,20 @@ class _PomodoroTabState extends ScopedScreenState<PomodoroTab>
       return '${dateTime.month}/${dateTime.day} at $timeStr';
     }
   }
+
+  String _formatElapsedTime(int totalSeconds) {
+    final hours = totalSeconds ~/ 3600;
+    final minutes = (totalSeconds % 3600) ~/ 60;
+    final seconds = totalSeconds % 60;
+
+    if (hours > 0) {
+      return '${hours}h ${minutes}m ${seconds}s';
+    } else if (minutes > 0) {
+      return '${minutes}m ${seconds}s';
+    } else {
+      return '${seconds}s';
+    }
+  }
 }
 
 /// Mobile bottom sheet for session start
diff --git a/lib/features/tasks/presentation/screens/tabs/projects_tab.dart b/lib/features/tasks/presentation/screens/tabs/projects_tab.dart
index 7482146..961f272 100644
--- a/lib/features/tasks/presentation/screens/tabs/projects_tab.dart
+++ b/lib/features/tasks/presentation/screens/tabs/projects_tab.dart
@@ -7,7 +7,9 @@ import 'package:keep_track/core/theme/app_theme.dart';
 import 'package:keep_track/core/ui/app_layout_controller.dart';
 import 'package:keep_track/core/ui/responsive/desktop_aware_screen.dart';
 import 'package:keep_track/core/ui/ui.dart';
+import 'package:keep_track/features/tasks/modules/buckets/domain/entities/bucket.dart';
 import 'package:keep_track/features/tasks/modules/projects/domain/entities/project.dart';
+import 'package:keep_track/features/tasks/presentation/state/bucket_controller.dart';
 import 'package:keep_track/features/tasks/presentation/state/project_controller.dart';
 
 enum ProjectStatusFilter { all, active, postponed, closed }
@@ -23,16 +25,19 @@ class ProjectsTab extends ScopedScreen {
 class _ProjectsTabState extends ScopedScreenState<ProjectsTab>
     with AppLayoutControlled {
   late final ProjectController _controller;
+  late final BucketController _bucketController;
   ProjectStatusFilter _statusFilter = ProjectStatusFilter.all;
 
   @override
   void registerServices() {
     _controller = locator.get<ProjectController>();
+    _bucketController = locator.get<BucketController>();
   }
 
   @override
   void onReady() {
     configureLayout(title: 'Projects', showBottomNav: true);
+    _bucketController.loadBuckets();
   }
 
   List<Project> _filterProjects(List<Project> projects) {
@@ -60,10 +65,21 @@ class _ProjectsTabState extends ScopedScreenState<ProjectsTab>
   Widget build(BuildContext context) {
     return DesktopAwareScreen(
       builder: (context, isDesktop) {
-        return AsyncStreamBuilder<List<Project>>(
-          state: _controller,
-          builder: (context, projects) {
-            final filteredProjects = _filterProjects(projects);
+        return AsyncStreamBuilder<List<Bucket>>(
+          state: _bucketController,
+          loadingBuilder: (_) => const Center(child: CircularProgressIndicator()),
+          errorBuilder: (_, __) => _buildBody(context, isDesktop, []),
+          builder: (context, buckets) => _buildBody(context, isDesktop, buckets),
+        );
+      },
+    );
+  }
+
+  Widget _buildBody(BuildContext context, bool isDesktop, List<Bucket> buckets) {
+    return AsyncStreamBuilder<List<Project>>(
+      state: _controller,
+      builder: (context, projects) {
+        final filteredProjects = _filterProjects(projects);
 
             return Scaffold(
               backgroundColor: isDesktop ? (Theme.of(context).brightness == Brightness.dark ? const Color(0xFF09090B) : AppColors.backgroundSecondary) : null,
@@ -164,7 +180,7 @@ class _ProjectsTabState extends ScopedScreenState<ProjectsTab>
                             spacing: AppSpacing.lg,
                             desktopChildAspectRatio: 0.85,
                             children: filteredProjects
-                                .map((project) => _buildProjectCard(project))
+                                .map((project) => _buildProjectCard(project, buckets))
                                 .toList(),
                           )
                         else
@@ -181,7 +197,7 @@ class _ProjectsTabState extends ScopedScreenState<ProjectsTab>
                             itemCount: filteredProjects.length,
                             itemBuilder: (context, index) {
                               final project = filteredProjects[index];
-                              return _buildProjectCard(project);
+                              return _buildProjectCard(project, buckets);
                             },
                           ),
                       ],
@@ -242,8 +258,6 @@ class _ProjectsTabState extends ScopedScreenState<ProjectsTab>
             ),
           ),
         );
-      },
-    );
   }
 
   Widget _buildFilterChip(String label, ProjectStatusFilter filter) {
@@ -294,7 +308,7 @@ class _ProjectsTabState extends ScopedScreenState<ProjectsTab>
     );
   }
 
-  Widget _buildProjectCard(Project project) {
+  Widget _buildProjectCard(Project project, List<Bucket> buckets) {
     // Parse color from project
     final projectColor = project.color != null
         ? Color(int.parse(project.color!.replaceFirst('#', '0xff')))
@@ -306,6 +320,11 @@ class _ProjectsTabState extends ScopedScreenState<ProjectsTab>
         ? Colors.orange
         : Colors.grey;
 
+    // Find bucket name if project has a bucket
+    final bucket = project.bucketId != null
+        ? buckets.where((b) => b.id == project.bucketId).firstOrNull
+        : null;
+
     return Card(
       elevation: 0,
       clipBehavior: Clip.antiAlias,
@@ -397,41 +416,80 @@ class _ProjectsTabState extends ScopedScreenState<ProjectsTab>
                         ],
                       ),
 
-                    // Status Badge
+                    // Status and Bucket Badges
                     const SizedBox(height: 8),
-                    Container(
-                      padding: const EdgeInsets.symmetric(
-                        horizontal: 8,
-                        vertical: 4,
-                      ),
-                      decoration: BoxDecoration(
-                        color: statusColor.withOpacity(0.1),
-                        borderRadius: BorderRadius.circular(4),
-                        border: Border.all(color: statusColor),
-                      ),
-                      child: Row(
-                        mainAxisSize: MainAxisSize.min,
-                        children: [
-                          Icon(
-                            project.status == ProjectStatus.active
-                                ? Icons.check_circle
-                                : project.status == ProjectStatus.postponed
-                                ? Icons.pause_circle
-                                : Icons.cancel,
-                            size: 12,
-                            color: statusColor,
+                    Wrap(
+                      spacing: 8,
+                      runSpacing: 4,
+                      children: [
+                        // Status Badge
+                        Container(
+                          padding: const EdgeInsets.symmetric(
+                            horizontal: 8,
+                            vertical: 4,
                           ),
-                          const SizedBox(width: 4),
-                          Text(
-                            project.status.displayName,
-                            style: TextStyle(
-                              fontSize: 10,
-                              fontWeight: FontWeight.w600,
-                              color: statusColor,
+                          decoration: BoxDecoration(
+                            color: statusColor.withOpacity(0.1),
+                            borderRadius: BorderRadius.circular(4),
+                            border: Border.all(color: statusColor),
+                          ),
+                          child: Row(
+                            mainAxisSize: MainAxisSize.min,
+                            children: [
+                              Icon(
+                                project.status == ProjectStatus.active
+                                    ? Icons.check_circle
+                                    : project.status == ProjectStatus.postponed
+                                    ? Icons.pause_circle
+                                    : Icons.cancel,
+                                size: 12,
+                                color: statusColor,
+                              ),
+                              const SizedBox(width: 4),
+                              Text(
+                                project.status.displayName,
+                                style: TextStyle(
+                                  fontSize: 10,
+                                  fontWeight: FontWeight.w600,
+                                  color: statusColor,
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                        // Bucket Badge
+                        if (bucket != null)
+                          Container(
+                            padding: const EdgeInsets.symmetric(
+                              horizontal: 8,
+                              vertical: 4,
+                            ),
+                            decoration: BoxDecoration(
+                              color: Colors.purple.withOpacity(0.1),
+                              borderRadius: BorderRadius.circular(4),
+                              border: Border.all(color: Colors.purple),
+                            ),
+                            child: Row(
+                              mainAxisSize: MainAxisSize.min,
+                              children: [
+                                const Icon(
+                                  Icons.inventory_2_outlined,
+                                  size: 12,
+                                  color: Colors.purple,
+                                ),
+                                const SizedBox(width: 4),
+                                Text(
+                                  bucket.name,
+                                  style: const TextStyle(
+                                    fontSize: 10,
+                                    fontWeight: FontWeight.w600,
+                                    color: Colors.purple,
+                                  ),
+                                ),
+                              ],
                             ),
                           ),
-                        ],
-                      ),
+                      ],
                     ),
                   ],
                 ),
diff --git a/lib/features/tasks/presentation/screens/tabs/task/components/task_form_page.dart b/lib/features/tasks/presentation/screens/tabs/task/components/task_form_page.dart
index deb3c27..41b491f 100644
--- a/lib/features/tasks/presentation/screens/tabs/task/components/task_form_page.dart
+++ b/lib/features/tasks/presentation/screens/tabs/task/components/task_form_page.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:keep_track/features/tasks/modules/buckets/domain/entities/bucket.dart';
 import 'package:keep_track/features/tasks/modules/projects/domain/entities/project.dart';
 import 'package:keep_track/features/tasks/modules/tasks/domain/entities/task.dart';
 
@@ -8,9 +9,11 @@ class TaskFormPage extends StatefulWidget {
   final Future<void> Function(Task) onSave;
   final Future<void> Function()? onDelete;
   final List<Project>? projects;
+  final List<Bucket>? buckets;
   final String? parentTaskId;
   final bool isDialog; // Whether this is shown in a dialog or as a full page
-  final bool isDialogContent; // Whether to return just content for custom dialog wrapper
+  final bool
+  isDialogContent; // Whether to return just content for custom dialog wrapper
 
   const TaskFormPage({
     super.key,
@@ -22,6 +25,7 @@ class TaskFormPage extends StatefulWidget {
     this.parentTaskId,
     this.isDialog = false,
     this.isDialogContent = false,
+    this.buckets,
   });
 
   @override
@@ -38,6 +42,8 @@ class _TaskFormPageState extends State<TaskFormPage> {
   DateTime? _dueDate;
   List<String> _tags = [];
   String? _selectedProjectId;
+  String? _selectedBucketId;
+
   final TextEditingController _tagController = TextEditingController();
 
   @override
@@ -52,6 +58,7 @@ class _TaskFormPageState extends State<TaskFormPage> {
     _dueDate = widget.task?.dueDate;
     _tags = widget.task?.tags.toList() ?? [];
     _selectedProjectId = widget.task?.projectId;
+    _selectedBucketId = widget.task?.bucketId; // Add bucket selection
   }
 
   @override
@@ -145,6 +152,7 @@ class _TaskFormPageState extends State<TaskFormPage> {
       userId: widget.userId,
       createdAt: widget.task?.createdAt,
       updatedAt: widget.task?.updatedAt,
+      bucketId: _selectedBucketId,
     );
 
     await widget.onSave(task);
@@ -180,178 +188,200 @@ class _TaskFormPageState extends State<TaskFormPage> {
     // Use Column when wrapped in a parent ScrollView (isDialogContent or isDialog)
     // Use ListView otherwise for built-in scrolling
     final formFields = [
-          // Title
-          TextFormField(
-            controller: _titleController,
-            decoration: const InputDecoration(
-              labelText: 'Title',
-              border: OutlineInputBorder(),
-            ),
-            validator: (v) =>
-                v == null || v.isEmpty ? 'Enter task title' : null,
-            autofocus: !widget.isDialog,
+      // Title
+      TextFormField(
+        controller: _titleController,
+        decoration: const InputDecoration(
+          labelText: 'Title',
+          border: OutlineInputBorder(),
+        ),
+        validator: (v) => v == null || v.isEmpty ? 'Enter task title' : null,
+        autofocus: !widget.isDialog,
+      ),
+      const SizedBox(height: 16),
+
+      // Description
+      TextFormField(
+        controller: _descriptionController,
+        decoration: const InputDecoration(
+          labelText: 'Description',
+          border: OutlineInputBorder(),
+        ),
+        maxLines: 5,
+        minLines: 3,
+      ),
+      const SizedBox(height: 16),
+
+      // Status
+      DropdownButtonFormField<TaskStatus>(
+        value: _selectedStatus,
+        decoration: const InputDecoration(
+          labelText: 'Status',
+          border: OutlineInputBorder(),
+        ),
+        items: TaskStatus.values
+            .map(
+              (status) => DropdownMenuItem(
+                value: status,
+                child: Row(
+                  children: [
+                    Icon(
+                      Icons.circle,
+                      size: 16,
+                      color: _getStatusColor(status),
+                    ),
+                    const SizedBox(width: 8),
+                    Text(status.displayName),
+                  ],
+                ),
+              ),
+            )
+            .toList(),
+        onChanged: (v) {
+          if (v != null) setState(() => _selectedStatus = v);
+        },
+      ),
+      const SizedBox(height: 16),
+
+      // Priority
+      DropdownButtonFormField<TaskPriority>(
+        value: _selectedPriority,
+        decoration: const InputDecoration(
+          labelText: 'Priority',
+          border: OutlineInputBorder(),
+        ),
+        items: TaskPriority.values
+            .map(
+              (priority) => DropdownMenuItem(
+                value: priority,
+                child: Row(
+                  children: [
+                    Icon(
+                      Icons.flag,
+                      size: 16,
+                      color: _getPriorityColor(priority),
+                    ),
+                    const SizedBox(width: 8),
+                    Text(priority.displayName),
+                  ],
+                ),
+              ),
+            )
+            .toList(),
+        onChanged: (v) {
+          if (v != null) setState(() => _selectedPriority = v);
+        },
+      ),
+      const SizedBox(height: 16),
+
+      // Project
+      if (widget.projects != null && widget.projects!.isNotEmpty) ...[
+        DropdownButtonFormField<String?>(
+          value: _selectedProjectId,
+          decoration: const InputDecoration(
+            labelText: 'Project',
+            border: OutlineInputBorder(),
           ),
-          const SizedBox(height: 16),
-
-          // Description
-          TextFormField(
-            controller: _descriptionController,
-            decoration: const InputDecoration(
-              labelText: 'Description',
-              border: OutlineInputBorder(),
+          items: [
+            const DropdownMenuItem<String?>(
+              value: null,
+              child: Text('No Project'),
             ),
-            maxLines: 5,
-            minLines: 3,
-          ),
-          const SizedBox(height: 16),
-
-          // Status
-          DropdownButtonFormField<TaskStatus>(
-            value: _selectedStatus,
-            decoration: const InputDecoration(
-              labelText: 'Status',
-              border: OutlineInputBorder(),
+            ...widget.projects!.map(
+              (project) => DropdownMenuItem<String?>(
+                value: project.id,
+                child: Text(project.name),
+              ),
             ),
-            items: TaskStatus.values
-                .map(
-                  (status) => DropdownMenuItem(
-                    value: status,
-                    child: Row(
-                      children: [
-                        Icon(
-                          Icons.circle,
-                          size: 16,
-                          color: _getStatusColor(status),
-                        ),
-                        const SizedBox(width: 8),
-                        Text(status.displayName),
-                      ],
-                    ),
-                  ),
-                )
-                .toList(),
-            onChanged: (v) {
-              if (v != null) setState(() => _selectedStatus = v);
-            },
+          ],
+          onChanged: (v) => setState(() => _selectedProjectId = v),
+        ),
+        const SizedBox(height: 16),
+      ],
+      // Buckets
+      if (widget.buckets != null && widget.buckets!.isNotEmpty) ...[
+        DropdownButtonFormField<String?>(
+          value: _selectedBucketId,
+          decoration: const InputDecoration(
+            labelText: 'Buckets',
+            border: OutlineInputBorder(),
           ),
-          const SizedBox(height: 16),
-
-          // Priority
-          DropdownButtonFormField<TaskPriority>(
-            value: _selectedPriority,
-            decoration: const InputDecoration(
-              labelText: 'Priority',
-              border: OutlineInputBorder(),
+          items: [
+            const DropdownMenuItem<String?>(
+              value: null,
+              child: Text('No Buckets'),
             ),
-            items: TaskPriority.values
-                .map(
-                  (priority) => DropdownMenuItem(
-                    value: priority,
-                    child: Row(
-                      children: [
-                        Icon(
-                          Icons.flag,
-                          size: 16,
-                          color: _getPriorityColor(priority),
-                        ),
-                        const SizedBox(width: 8),
-                        Text(priority.displayName),
-                      ],
-                    ),
-                  ),
-                )
-                .toList(),
-            onChanged: (v) {
-              if (v != null) setState(() => _selectedPriority = v);
-            },
-          ),
-          const SizedBox(height: 16),
-
-          // Project
-          if (widget.projects != null && widget.projects!.isNotEmpty) ...[
-            DropdownButtonFormField<String?>(
-              value: _selectedProjectId,
-              decoration: const InputDecoration(
-                labelText: 'Project',
-                border: OutlineInputBorder(),
+            ...widget.buckets!.map(
+              (bucket) => DropdownMenuItem<String?>(
+                value: bucket.id,
+                child: Text(bucket.name),
               ),
-              items: [
-                const DropdownMenuItem<String?>(
-                  value: null,
-                  child: Text('No Project'),
-                ),
-                ...widget.projects!.map(
-                  (project) => DropdownMenuItem<String?>(
-                    value: project.id,
-                    child: Text(project.name),
-                  ),
-                ),
-              ],
-              onChanged: (v) => setState(() => _selectedProjectId = v),
             ),
-            const SizedBox(height: 16),
           ],
-
-          // Due Date
-          Card(
-            child: ListTile(
-              leading: const Icon(Icons.calendar_today),
-              title: const Text('Due Date'),
-              subtitle: _dueDate != null
-                  ? Text(
-                      '${_dueDate!.toString().split('.')[0]}',
-                      style: const TextStyle(fontWeight: FontWeight.w500),
-                    )
-                  : const Text('Not set'),
-              trailing: Row(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  if (_dueDate != null)
-                    IconButton(
-                      icon: const Icon(Icons.clear),
-                      onPressed: () => setState(() => _dueDate = null),
-                      tooltip: 'Clear due date',
-                    ),
-                  IconButton(
-                    icon: const Icon(Icons.edit),
-                    onPressed: _pickDueDate,
-                    tooltip: 'Set due date',
-                  ),
-                ],
+          onChanged: (v) => setState(() => _selectedBucketId = v),
+        ),
+        const SizedBox(height: 16),
+      ],
+      // Due Date
+      Card(
+        child: ListTile(
+          leading: const Icon(Icons.calendar_today),
+          title: const Text('Due Date'),
+          subtitle: _dueDate != null
+              ? Text(
+                  '${_dueDate!.toString().split('.')[0]}',
+                  style: const TextStyle(fontWeight: FontWeight.w500),
+                )
+              : const Text('Not set'),
+          trailing: Row(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              if (_dueDate != null)
+                IconButton(
+                  icon: const Icon(Icons.clear),
+                  onPressed: () => setState(() => _dueDate = null),
+                  tooltip: 'Clear due date',
+                ),
+              IconButton(
+                icon: const Icon(Icons.edit),
+                onPressed: _pickDueDate,
+                tooltip: 'Set due date',
               ),
-            ),
+            ],
           ),
-          const SizedBox(height: 16),
+        ),
+      ),
+      const SizedBox(height: 16),
 
-          // Tags
-          const Text(
-            'Tags',
-            style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600),
-          ),
-          const SizedBox(height: 8),
-          Card(
-            child: Padding(
-              padding: const EdgeInsets.all(12),
-              child: Wrap(
-                spacing: 8,
-                runSpacing: 8,
-                children: [
-                  ..._tags.map(
-                    (tag) => Chip(
-                      label: Text(tag),
-                      onDeleted: () => setState(() => _tags.remove(tag)),
-                      backgroundColor: Colors.blue.withOpacity(0.1),
-                    ),
-                  ),
-                  ActionChip(
-                    avatar: const Icon(Icons.add, size: 16),
-                    label: const Text('Add tag'),
-                    onPressed: _addTag,
-                  ),
-                ],
+      // Tags
+      const Text(
+        'Tags',
+        style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600),
+      ),
+      const SizedBox(height: 8),
+      Card(
+        child: Padding(
+          padding: const EdgeInsets.all(12),
+          child: Wrap(
+            spacing: 8,
+            runSpacing: 8,
+            children: [
+              ..._tags.map(
+                (tag) => Chip(
+                  label: Text(tag),
+                  onDeleted: () => setState(() => _tags.remove(tag)),
+                  backgroundColor: Colors.blue.withOpacity(0.1),
+                ),
               ),
-            ),
+              ActionChip(
+                avatar: const Icon(Icons.add, size: 16),
+                label: const Text('Add tag'),
+                onPressed: _addTag,
+              ),
+            ],
           ),
+        ),
+      ),
     ];
 
     return Form(
@@ -361,10 +391,7 @@ class _TaskFormPageState extends State<TaskFormPage> {
               crossAxisAlignment: CrossAxisAlignment.stretch,
               children: formFields,
             )
-          : ListView(
-              padding: const EdgeInsets.all(16),
-              children: formFields,
-            ),
+          : ListView(padding: const EdgeInsets.all(16), children: formFields),
     );
   }
 
@@ -427,7 +454,10 @@ class _TaskFormPageState extends State<TaskFormPage> {
                 if (isEdit && widget.onDelete != null)
                   TextButton(
                     onPressed: _handleDelete,
-                    child: const Text('Delete', style: TextStyle(color: Colors.red)),
+                    child: const Text(
+                      'Delete',
+                      style: TextStyle(color: Colors.red),
+                    ),
                   ),
                 const SizedBox(width: 8),
                 TextButton(
diff --git a/lib/features/tasks/presentation/screens/tabs/task/components/task_management_dialog.dart b/lib/features/tasks/presentation/screens/tabs/task/components/task_management_dialog.dart
index 43682f6..fda0fc1 100644
--- a/lib/features/tasks/presentation/screens/tabs/task/components/task_management_dialog.dart
+++ b/lib/features/tasks/presentation/screens/tabs/task/components/task_management_dialog.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:keep_track/features/tasks/modules/buckets/domain/entities/bucket.dart';
 import 'package:keep_track/features/tasks/modules/projects/domain/entities/project.dart';
 import 'package:keep_track/features/tasks/modules/tasks/domain/entities/task.dart';
 
@@ -12,8 +13,10 @@ class TaskManagementDialog extends StatelessWidget {
   final Future<void> Function(Task) onSave;
   final Future<void> Function()? onDelete;
   final List<Project>? projects;
+  final List<Bucket>? buckets;
   final String? parentTaskId;
-  final bool useDialogContent; // Use dialog content mode (for custom dialog wrappers)
+  final bool
+  useDialogContent; // Use dialog content mode (for custom dialog wrappers)
 
   const TaskManagementDialog({
     super.key,
@@ -24,6 +27,7 @@ class TaskManagementDialog extends StatelessWidget {
     this.projects,
     this.parentTaskId,
     this.useDialogContent = false,
+    this.buckets,
   });
 
   @override
@@ -34,6 +38,7 @@ class TaskManagementDialog extends StatelessWidget {
       onSave: onSave,
       onDelete: onDelete,
       projects: projects,
+      buckets: buckets,
       parentTaskId: parentTaskId,
       isDialog: !useDialogContent,
       isDialogContent: useDialogContent,
diff --git a/lib/features/tasks/presentation/screens/tabs/task/create_task_route_page.dart b/lib/features/tasks/presentation/screens/tabs/task/create_task_route_page.dart
index 474e0e5..2c7c9e8 100644
--- a/lib/features/tasks/presentation/screens/tabs/task/create_task_route_page.dart
+++ b/lib/features/tasks/presentation/screens/tabs/task/create_task_route_page.dart
@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:keep_track/core/di/service_locator.dart';
 import 'package:keep_track/core/state/stream_builder_widget.dart';
+import 'package:keep_track/features/tasks/modules/buckets/domain/entities/bucket.dart';
 import 'package:keep_track/features/tasks/modules/tasks/domain/entities/task.dart';
+import 'package:keep_track/features/tasks/presentation/state/bucket_controller.dart';
 import 'package:keep_track/features/tasks/presentation/state/task_controller.dart';
 import 'package:keep_track/features/tasks/presentation/screens/tabs/task/components/task_form_page.dart';
 import 'package:keep_track/shared/infrastructure/supabase/supabase_service.dart';
@@ -20,6 +22,7 @@ class _CreateTaskRoutePageState extends State<CreateTaskRoutePage> {
   late final TaskController _controller;
   late final SupabaseService _supabase;
   late final ProjectController _projectController;
+  late final BucketController _bucketController;
 
   @override
   void initState() {
@@ -27,9 +30,10 @@ class _CreateTaskRoutePageState extends State<CreateTaskRoutePage> {
     _controller = locator.get<TaskController>();
     _supabase = locator.get<SupabaseService>();
     _projectController = locator.get<ProjectController>();
-
+    _bucketController = locator.get<BucketController>();
     // Load active projects
     _projectController.loadActiveProjects();
+    _bucketController.loadBuckets();
   }
 
   @override
@@ -40,36 +44,41 @@ class _CreateTaskRoutePageState extends State<CreateTaskRoutePage> {
         final activeProjects = projects
             .where((p) => p.status == ProjectStatus.active && !p.isArchived)
             .toList();
+        return AsyncStreamBuilder<List<Bucket>>(
+          state: _bucketController,
+          builder: (context, buckets) {
+            return TaskFormPage(
+              userId: _supabase.userId!,
+              projects: activeProjects,
+              buckets: buckets,
+              isDialog: false,
+              isDialogContent: false,
+              onSave: (Task task) async {
+                try {
+                  await _controller.createTask(task);
 
-        return TaskFormPage(
-          userId: _supabase.userId!,
-          projects: activeProjects,
-          isDialog: false,
-          isDialogContent: false,
-          onSave: (Task task) async {
-            try {
-              await _controller.createTask(task);
-
-              if (!mounted) return;
+                  if (!mounted) return;
 
-              ScaffoldMessenger.of(context).showSnackBar(
-                const SnackBar(
-                  content: Text('Task created successfully'),
-                  backgroundColor: Colors.green,
-                ),
-              );
+                  ScaffoldMessenger.of(context).showSnackBar(
+                    const SnackBar(
+                      content: Text('Task created successfully'),
+                      backgroundColor: Colors.green,
+                    ),
+                  );
 
-              Navigator.pop(context);
-            } catch (e) {
-              if (!mounted) return;
+                  Navigator.pop(context);
+                } catch (e) {
+                  if (!mounted) return;
 
-              ScaffoldMessenger.of(context).showSnackBar(
-                SnackBar(
-                  content: Text('Failed to create task: $e'),
-                  backgroundColor: Colors.red,
-                ),
-              );
-            }
+                  ScaffoldMessenger.of(context).showSnackBar(
+                    SnackBar(
+                      content: Text('Failed to create task: $e'),
+                      backgroundColor: Colors.red,
+                    ),
+                  );
+                }
+              },
+            );
           },
         );
       },
diff --git a/lib/features/tasks/presentation/screens/tabs/task/task_details_page.dart b/lib/features/tasks/presentation/screens/tabs/task/task_details_page.dart
index 09174c9..b632f1b 100644
--- a/lib/features/tasks/presentation/screens/tabs/task/task_details_page.dart
+++ b/lib/features/tasks/presentation/screens/tabs/task/task_details_page.dart
@@ -2,8 +2,10 @@ import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:keep_track/core/di/service_locator.dart';
 import 'package:keep_track/core/state/stream_builder_widget.dart';
+import 'package:keep_track/features/tasks/modules/buckets/domain/entities/bucket.dart';
 import 'package:keep_track/features/tasks/modules/projects/domain/entities/project.dart';
 import 'package:keep_track/features/tasks/modules/tasks/domain/entities/task.dart';
+import 'package:keep_track/features/tasks/presentation/state/bucket_controller.dart';
 import 'package:keep_track/features/tasks/presentation/state/project_controller.dart';
 import 'package:keep_track/features/tasks/presentation/state/task_controller.dart';
 import 'package:keep_track/features/tasks/presentation/screens/tabs/task/components/task_management_dialog.dart';
@@ -26,6 +28,7 @@ class TaskDetailsPage extends StatefulWidget {
 class _TaskDetailsPageState extends State<TaskDetailsPage> {
   late final TaskController _controller;
   late final ProjectController _projectController;
+  late final BucketController _bucketController;
   late final SupabaseService _supabaseService;
 
   @override
@@ -33,8 +36,10 @@ class _TaskDetailsPageState extends State<TaskDetailsPage> {
     super.initState();
     _controller = locator.get<TaskController>();
     _projectController = locator.get<ProjectController>();
+    _bucketController = locator.get<BucketController>();
     _supabaseService = locator.get<SupabaseService>();
     _projectController.loadActiveProjects();
+    _bucketController.loadBuckets();
   }
 
   void _showCreateSubtaskDialog(Task parentTask) {
@@ -95,99 +100,107 @@ class _TaskDetailsPageState extends State<TaskDetailsPage> {
               .where((p) => p.status == ProjectStatus.active && !p.isArchived)
               .toList();
 
-          return Dialog(
-            child: Container(
-              width: 600,
-              constraints: const BoxConstraints(maxHeight: 700),
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  // Header
-                  Container(
-                    padding: const EdgeInsets.all(16),
-                    decoration: BoxDecoration(
-                      border: Border(
-                        bottom: BorderSide(color: Colors.grey[300]!),
-                      ),
-                    ),
-                    child: Row(
-                      children: [
-                        const Expanded(
-                          child: Text(
-                            'Edit Task',
-                            style: TextStyle(
-                              fontSize: 20,
-                              fontWeight: FontWeight.bold,
-                            ),
+          return AsyncStreamBuilder<List<Bucket>>(
+            state: _bucketController,
+            builder: (context, buckets) {
+              final activeBuckets = buckets.where((b) => !b.isArchive).toList();
+
+              return Dialog(
+                child: Container(
+                  width: 600,
+                  constraints: const BoxConstraints(maxHeight: 700),
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      // Header
+                      Container(
+                        padding: const EdgeInsets.all(16),
+                        decoration: BoxDecoration(
+                          border: Border(
+                            bottom: BorderSide(color: Colors.grey[300]!),
                           ),
                         ),
-                        IconButton(
-                          icon: const Icon(Icons.close),
-                          onPressed: () => Navigator.pop(context),
+                        child: Row(
+                          children: [
+                            const Expanded(
+                              child: Text(
+                                'Edit Task',
+                                style: TextStyle(
+                                  fontSize: 20,
+                                  fontWeight: FontWeight.bold,
+                                ),
+                              ),
+                            ),
+                            IconButton(
+                              icon: const Icon(Icons.close),
+                              onPressed: () => Navigator.pop(context),
+                            ),
+                          ],
                         ),
-                      ],
-                    ),
-                  ),
+                      ),
 
-                  // Content
-                  Expanded(
-                    child: TaskManagementDialog(
-                      task: task,
-                      userId: _supabaseService.userId!,
-                      projects: activeProjects,
-                      useDialogContent: true,
-                      onSave: (updatedTask) async {
-                        try {
-                          await _controller.updateTask(updatedTask);
-                          if (mounted) {
-                            ScaffoldMessenger.of(context).showSnackBar(
-                              const SnackBar(
-                                content: Text('Task updated successfully'),
-                                backgroundColor: Colors.green,
-                              ),
-                            );
-                            Navigator.pop(context);
-                          }
-                        } catch (e) {
-                          if (mounted) {
-                            ScaffoldMessenger.of(context).showSnackBar(
-                              SnackBar(
-                                content: Text('Error: ${e.toString()}'),
-                                backgroundColor: Colors.red,
-                              ),
-                            );
-                          }
-                        }
-                      },
-                      onDelete: () async {
-                        try {
-                          await _controller.deleteTask(task.id!);
-                          if (mounted) {
-                            ScaffoldMessenger.of(context).showSnackBar(
-                              const SnackBar(
-                                content: Text('Task deleted successfully'),
-                                backgroundColor: Colors.green,
-                              ),
-                            );
-                            Navigator.pop(context); // Close dialog
-                            Navigator.pop(context); // Close drawer
-                          }
-                        } catch (e) {
-                          if (mounted) {
-                            ScaffoldMessenger.of(context).showSnackBar(
-                              SnackBar(
-                                content: Text('Error: ${e.toString()}'),
-                                backgroundColor: Colors.red,
-                              ),
-                            );
-                          }
-                        }
-                      },
-                    ),
+                      // Content
+                      Expanded(
+                        child: TaskManagementDialog(
+                          task: task,
+                          userId: _supabaseService.userId!,
+                          projects: activeProjects,
+                          buckets: activeBuckets,
+                          useDialogContent: true,
+                          onSave: (updatedTask) async {
+                            try {
+                              await _controller.updateTask(updatedTask);
+                              if (mounted) {
+                                ScaffoldMessenger.of(context).showSnackBar(
+                                  const SnackBar(
+                                    content: Text('Task updated successfully'),
+                                    backgroundColor: Colors.green,
+                                  ),
+                                );
+                                Navigator.pop(context);
+                              }
+                            } catch (e) {
+                              if (mounted) {
+                                ScaffoldMessenger.of(context).showSnackBar(
+                                  SnackBar(
+                                    content: Text('Error: ${e.toString()}'),
+                                    backgroundColor: Colors.red,
+                                  ),
+                                );
+                              }
+                            }
+                          },
+                          onDelete: () async {
+                            try {
+                              await _controller.deleteTask(task.id!);
+                              if (mounted) {
+                                ScaffoldMessenger.of(context).showSnackBar(
+                                  const SnackBar(
+                                    content: Text('Task deleted successfully'),
+                                    backgroundColor: Colors.green,
+                                  ),
+                                );
+                                Navigator.pop(context); // Close dialog
+                                Navigator.pop(context); // Close drawer
+                              }
+                            } catch (e) {
+                              if (mounted) {
+                                ScaffoldMessenger.of(context).showSnackBar(
+                                  SnackBar(
+                                    content: Text('Error: ${e.toString()}'),
+                                    backgroundColor: Colors.red,
+                                  ),
+                                );
+                              }
+                            }
+                          },
+                        ),
+                      ),
+                    ],
                   ),
-                ],
-              ),
-            ),
+                ),
+              );
+            },
           );
         },
       ),
@@ -221,19 +234,20 @@ class _TaskDetailsPageState extends State<TaskDetailsPage> {
   }
 
   Widget _buildDetailSection(String title, IconData icon, Widget content) {
+    final theme = Theme.of(context);
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Row(
           children: [
-            Icon(icon, size: 20, color: Colors.grey[600]),
+            Icon(icon, size: 20, color: theme.colorScheme.onSurfaceVariant),
             const SizedBox(width: 8),
             Text(
               title,
               style: TextStyle(
                 fontSize: 14,
                 fontWeight: FontWeight.w600,
-                color: Colors.grey[700],
+                color: theme.colorScheme.onSurfaceVariant,
               ),
             ),
           ],
@@ -249,19 +263,20 @@ class _TaskDetailsPageState extends State<TaskDetailsPage> {
     IconData icon,
     Widget content,
   ) {
+    final theme = Theme.of(context);
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Row(
           children: [
-            Icon(icon, size: 20, color: Colors.grey[600]),
+            Icon(icon, size: 20, color: theme.colorScheme.onSurfaceVariant),
             const SizedBox(width: 8),
             Text(
               title,
               style: TextStyle(
                 fontSize: 14,
                 fontWeight: FontWeight.w600,
-                color: Colors.grey[700],
+                color: theme.colorScheme.onSurfaceVariant,
               ),
             ),
           ],
@@ -577,8 +592,14 @@ class _TaskDetailsPageState extends State<TaskDetailsPage> {
                             ),
                             ...activeProjects.map((project) {
                               final projectColor = project.color != null
-                                  ? Color(int.parse(
-                                      project.color!.replaceFirst('#', '0xff')))
+                                  ? Color(
+                                      int.parse(
+                                        project.color!.replaceFirst(
+                                          '#',
+                                          '0xff',
+                                        ),
+                                      ),
+                                    )
                                   : Colors.blue[700]!;
 
                               return DropdownMenuItem<String?>(
@@ -618,6 +639,81 @@ class _TaskDetailsPageState extends State<TaskDetailsPage> {
                   ),
                   const SizedBox(height: 16),
 
+                  // Bucket - Editable
+                  AsyncStreamBuilder<List<Bucket>>(
+                    state: _bucketController,
+                    builder: (context, buckets) {
+                      final activeBuckets = buckets
+                          .where((b) => !b.isArchive)
+                          .toList();
+
+                      return _buildEditableDetailSection(
+                        'Bucket',
+                        Icons.inbox,
+                        DropdownButton<String?>(
+                          value: task.bucketId,
+                          isExpanded: true,
+                          underline: const SizedBox(),
+                          items: [
+                            const DropdownMenuItem<String?>(
+                              value: null,
+                              child: Row(
+                                children: [
+                                  Icon(
+                                    Icons.remove_circle_outline,
+                                    size: 16,
+                                    color: Colors.grey,
+                                  ),
+                                  SizedBox(width: 8),
+                                  Text(
+                                    'No Bucket',
+                                    style: TextStyle(
+                                      color: Colors.grey,
+                                      fontWeight: FontWeight.w600,
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            ),
+                            ...activeBuckets.map((bucket) {
+                              return DropdownMenuItem<String?>(
+                                value: bucket.id,
+                                child: Row(
+                                  children: [
+                                    Icon(
+                                      Icons.inbox,
+                                      color: Colors.purple[700],
+                                      size: 16,
+                                    ),
+                                    const SizedBox(width: 8),
+                                    Expanded(
+                                      child: Text(
+                                        bucket.name,
+                                        style: TextStyle(
+                                          color: Colors.purple[700],
+                                          fontWeight: FontWeight.w600,
+                                        ),
+                                        overflow: TextOverflow.ellipsis,
+                                      ),
+                                    ),
+                                  ],
+                                ),
+                              );
+                            }),
+                          ],
+                          onChanged: (newBucketId) async {
+                            final updatedTask = task.copyWith(
+                              bucketId: newBucketId,
+                            );
+                            print(task.bucketId);
+                            await _controller.updateTask(updatedTask);
+                          },
+                        ),
+                      );
+                    },
+                  ),
+                  const SizedBox(height: 16),
+
                   // Due Date - Editable
                   _buildEditableDetailSection(
                     'Due Date',
diff --git a/lib/features/tasks/presentation/screens/tabs/task/tasks_tab_new.dart b/lib/features/tasks/presentation/screens/tabs/task/tasks_tab_new.dart
index a03f567..ef804ec 100644
--- a/lib/features/tasks/presentation/screens/tabs/task/tasks_tab_new.dart
+++ b/lib/features/tasks/presentation/screens/tabs/task/tasks_tab_new.dart
@@ -8,8 +8,10 @@ import 'package:keep_track/core/theme/app_theme.dart';
 import 'package:keep_track/core/ui/app_layout_controller.dart';
 import 'package:keep_track/core/ui/responsive/desktop_aware_screen.dart';
 import 'package:keep_track/core/ui/scoped_screen.dart';
+import 'package:keep_track/features/tasks/modules/buckets/domain/entities/bucket.dart';
 import 'package:keep_track/features/tasks/modules/tasks/domain/entities/task.dart';
 import 'package:keep_track/features/tasks/modules/projects/domain/entities/project.dart';
+import 'package:keep_track/features/tasks/presentation/state/bucket_controller.dart';
 import 'package:keep_track/features/tasks/presentation/state/task_controller.dart';
 import 'package:keep_track/features/tasks/presentation/state/project_controller.dart';
 import 'package:keep_track/features/tasks/presentation/screens/tabs/task/components/task_management_dialog.dart';
@@ -35,6 +37,7 @@ class _TasksTabNewState extends ScopedScreenState<TasksTabNew>
     with AppLayoutControlled {
   late final TaskController _controller;
   late final ProjectController _projectController;
+  late final BucketController _bucketController;
   late final SupabaseService _supabaseService;
   late ScrollController _dateScrollController;
 
@@ -49,11 +52,13 @@ class _TasksTabNewState extends ScopedScreenState<TasksTabNew>
   void registerServices() {
     _controller = locator.get<TaskController>();
     _projectController = locator.get<ProjectController>();
+    _bucketController = locator.get<BucketController>();
     _supabaseService = locator.get<SupabaseService>();
     _dateScrollController = ScrollController();
 
-    // Load active projects
+    // Load active projects and buckets
     _projectController.loadActiveProjects();
+    _bucketController.loadBuckets();
 
     // Scroll to center on init
     WidgetsBinding.instance.addPostFrameCallback((_) {
@@ -111,7 +116,11 @@ class _TasksTabNewState extends ScopedScreenState<TasksTabNew>
             final sortedTasks = _sortTasksByPriority(filteredTasks);
 
             return Scaffold(
-              backgroundColor: isDesktop ? (Theme.of(context).brightness == Brightness.dark ? const Color(0xFF09090B) : AppColors.backgroundSecondary) : null,
+              backgroundColor: isDesktop
+                  ? (Theme.of(context).brightness == Brightness.dark
+                        ? const Color(0xFF09090B)
+                        : AppColors.backgroundSecondary)
+                  : null,
               body: isDesktop
                   ? _buildDesktopLayout(tasks, sortedTasks)
                   : _buildMobileLayout(tasks, sortedTasks),
@@ -844,51 +853,51 @@ class _TasksTabNewState extends ScopedScreenState<TasksTabNew>
         const SizedBox(height: 12),
 
         // Due Date Filter
-        Text(
-          'Due Date',
-          style: Theme.of(
-            context,
-          ).textTheme.labelLarge?.copyWith(fontWeight: FontWeight.bold),
-        ),
-        const SizedBox(height: 8),
-        SingleChildScrollView(
-          scrollDirection: Axis.horizontal,
-          child: Row(
-            children: [
-              _buildFilterChip(
-                'All Tasks',
-                _dueDateFilter == DueDateFilter.all,
-                () {
-                  setState(() => _dueDateFilter = DueDateFilter.all);
-                },
-              ),
-              const SizedBox(width: 8),
-              _buildFilterChip(
-                'Due Now',
-                _dueDateFilter == DueDateFilter.dueNow,
-                () {
-                  setState(() => _dueDateFilter = DueDateFilter.dueNow);
-                },
-              ),
-              const SizedBox(width: 8),
-              _buildFilterChip(
-                'Due This Week',
-                _dueDateFilter == DueDateFilter.dueThisWeek,
-                () {
-                  setState(() => _dueDateFilter = DueDateFilter.dueThisWeek);
-                },
-              ),
-              const SizedBox(width: 8),
-              _buildFilterChip(
-                'Due This Month',
-                _dueDateFilter == DueDateFilter.dueThisMonth,
-                () {
-                  setState(() => _dueDateFilter = DueDateFilter.dueThisMonth);
-                },
-              ),
-            ],
-          ),
-        ),
+        // Text(
+        //   'Due Date',
+        //   style: Theme.of(
+        //     context,
+        //   ).textTheme.labelLarge?.copyWith(fontWeight: FontWeight.bold),
+        // ),
+        // const SizedBox(height: 8),
+        // SingleChildScrollView(
+        //   scrollDirection: Axis.horizontal,
+        //   child: Row(
+        //     children: [
+        //       _buildFilterChip(
+        //         'All Tasks',
+        //         _dueDateFilter == DueDateFilter.all,
+        //         () {
+        //           setState(() => _dueDateFilter = DueDateFilter.all);
+        //         },
+        //       ),
+        //       const SizedBox(width: 8),
+        //       _buildFilterChip(
+        //         'Due Now',
+        //         _dueDateFilter == DueDateFilter.dueNow,
+        //         () {
+        //           setState(() => _dueDateFilter = DueDateFilter.dueNow);
+        //         },
+        //       ),
+        //       const SizedBox(width: 8),
+        //       _buildFilterChip(
+        //         'Due This Week',
+        //         _dueDateFilter == DueDateFilter.dueThisWeek,
+        //         () {
+        //           setState(() => _dueDateFilter = DueDateFilter.dueThisWeek);
+        //         },
+        //       ),
+        //       const SizedBox(width: 8),
+        //       _buildFilterChip(
+        //         'Due This Month',
+        //         _dueDateFilter == DueDateFilter.dueThisMonth,
+        //         () {
+        //           setState(() => _dueDateFilter = DueDateFilter.dueThisMonth);
+        //         },
+        //       ),
+        //     ],
+        //   ),
+        // ),
       ],
     );
   }
@@ -1203,6 +1212,50 @@ class _TasksTabNewState extends ScopedScreenState<TasksTabNew>
                                 Colors.blue[700]!,
                                 Icons.list,
                               ),
+                            // Project badge
+                            if (task.projectId != null)
+                              Builder(
+                                builder: (context) {
+                                  final project = _projectController
+                                      .currentProjects
+                                      ?.where((p) => p.id == task.projectId)
+                                      .firstOrNull;
+                                  if (project == null)
+                                    return const SizedBox.shrink();
+                                  final projectColor = project.color != null
+                                      ? Color(
+                                          int.parse(
+                                            project.color!.replaceFirst(
+                                              '#',
+                                              '0xff',
+                                            ),
+                                          ),
+                                        )
+                                      : Colors.blue[700]!;
+                                  return _buildTaskBadge(
+                                    project.name,
+                                    projectColor,
+                                    Icons.folder,
+                                  );
+                                },
+                              ),
+                            // Bucket badge
+                            if (task.bucketId != null)
+                              Builder(
+                                builder: (context) {
+                                  final bucket = _bucketController
+                                      .getBucketFromCurrentState(
+                                        task.bucketId!,
+                                      );
+                                  if (bucket == null)
+                                    return const SizedBox.shrink();
+                                  return _buildTaskBadge(
+                                    bucket.name,
+                                    Colors.purple[700]!,
+                                    Icons.inbox,
+                                  );
+                                },
+                              ),
                           ],
                         ),
                       ],
@@ -1283,147 +1336,163 @@ class _TasksTabNewState extends ScopedScreenState<TasksTabNew>
       // Desktop: Use Dialog wrapper with content mode
       showDialog(
         context: context,
-        builder: (context) => Dialog(
-          child: Container(
-            width: 600,
-            constraints: const BoxConstraints(maxHeight: 700),
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                // Header
-                Container(
-                  padding: const EdgeInsets.all(16),
-                  decoration: BoxDecoration(
-                    border: Border(
-                      bottom: BorderSide(color: Colors.grey[300]!),
-                    ),
-                  ),
-                  child: Row(
-                    children: [
-                      const Expanded(
-                        child: Text(
-                          'Edit Task',
-                          style: TextStyle(
-                            fontSize: 20,
-                            fontWeight: FontWeight.bold,
-                          ),
+        builder: (context) => AsyncStreamBuilder<List<Bucket>>(
+          state: _bucketController,
+          builder: (context, buckets) {
+            final activeBuckets = buckets.where((b) => !b.isArchive).toList();
+
+            return Dialog(
+              child: Container(
+                width: 600,
+                constraints: const BoxConstraints(maxHeight: 700),
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    // Header
+                    Container(
+                      padding: const EdgeInsets.all(16),
+                      decoration: BoxDecoration(
+                        border: Border(
+                          bottom: BorderSide(color: Colors.grey[300]!),
                         ),
                       ),
-                      IconButton(
-                        icon: const Icon(Icons.close),
-                        onPressed: () => Navigator.pop(context),
+                      child: Row(
+                        children: [
+                          const Expanded(
+                            child: Text(
+                              'Edit Task',
+                              style: TextStyle(
+                                fontSize: 20,
+                                fontWeight: FontWeight.bold,
+                              ),
+                            ),
+                          ),
+                          IconButton(
+                            icon: const Icon(Icons.close),
+                            onPressed: () => Navigator.pop(context),
+                          ),
+                        ],
                       ),
-                    ],
-                  ),
-                ),
+                    ),
 
-                // Content
-                Expanded(
-                  child: TaskManagementDialog(
-                    task: task,
-                    userId: _supabaseService.userId!,
-                    useDialogContent: true,
-                    onSave: (updatedTask) async {
-                      try {
-                        await _controller.updateTask(updatedTask);
-                        if (mounted) {
-                          ScaffoldMessenger.of(context).showSnackBar(
-                            const SnackBar(
-                              content: Text('Task updated successfully'),
-                              backgroundColor: Colors.green,
-                            ),
-                          );
-                        }
-                      } catch (e) {
-                        if (mounted) {
-                          ScaffoldMessenger.of(context).showSnackBar(
-                            SnackBar(
-                              content: Text('Error: ${e.toString()}'),
-                              backgroundColor: Colors.red,
-                            ),
-                          );
-                        }
-                      }
-                    },
-                    onDelete: () async {
-                      try {
-                        await _controller.deleteTask(task.id!);
-                        if (mounted) {
-                          ScaffoldMessenger.of(context).showSnackBar(
-                            const SnackBar(
-                              content: Text('Task deleted successfully'),
-                              backgroundColor: Colors.green,
-                            ),
-                          );
-                        }
-                      } catch (e) {
-                        if (mounted) {
-                          ScaffoldMessenger.of(context).showSnackBar(
-                            SnackBar(
-                              content: Text('Error: ${e.toString()}'),
-                              backgroundColor: Colors.red,
-                            ),
-                          );
-                        }
-                      }
-                    },
-                  ),
+                    // Content
+                    Expanded(
+                      child: TaskManagementDialog(
+                        task: task,
+                        userId: _supabaseService.userId!,
+                        buckets: activeBuckets,
+                        useDialogContent: true,
+                        onSave: (updatedTask) async {
+                          try {
+                            await _controller.updateTask(updatedTask);
+                            if (mounted) {
+                              ScaffoldMessenger.of(context).showSnackBar(
+                                const SnackBar(
+                                  content: Text('Task updated successfully'),
+                                  backgroundColor: Colors.green,
+                                ),
+                              );
+                            }
+                          } catch (e) {
+                            if (mounted) {
+                              ScaffoldMessenger.of(context).showSnackBar(
+                                SnackBar(
+                                  content: Text('Error: ${e.toString()}'),
+                                  backgroundColor: Colors.red,
+                                ),
+                              );
+                            }
+                          }
+                        },
+                        onDelete: () async {
+                          try {
+                            await _controller.deleteTask(task.id!);
+                            if (mounted) {
+                              ScaffoldMessenger.of(context).showSnackBar(
+                                const SnackBar(
+                                  content: Text('Task deleted successfully'),
+                                  backgroundColor: Colors.green,
+                                ),
+                              );
+                            }
+                          } catch (e) {
+                            if (mounted) {
+                              ScaffoldMessenger.of(context).showSnackBar(
+                                SnackBar(
+                                  content: Text('Error: ${e.toString()}'),
+                                  backgroundColor: Colors.red,
+                                ),
+                              );
+                            }
+                          }
+                        },
+                      ),
+                    ),
+                  ],
                 ),
-              ],
-            ),
-          ),
+              ),
+            );
+          },
         ),
       );
     } else {
       // Mobile: Use AlertDialog mode
       showDialog(
         context: context,
-        builder: (context) => TaskManagementDialog(
-          task: task,
-          userId: _supabaseService.userId!,
-          onSave: (updatedTask) async {
-            try {
-              await _controller.updateTask(updatedTask);
-              if (mounted) {
-                ScaffoldMessenger.of(context).showSnackBar(
-                  const SnackBar(
-                    content: Text('Task updated successfully'),
-                    backgroundColor: Colors.green,
-                  ),
-                );
-              }
-            } catch (e) {
-              if (mounted) {
-                ScaffoldMessenger.of(context).showSnackBar(
-                  SnackBar(
-                    content: Text('Error: ${e.toString()}'),
-                    backgroundColor: Colors.red,
-                  ),
-                );
-              }
-            }
-          },
-          onDelete: () async {
-            try {
-              await _controller.deleteTask(task.id!);
-              if (mounted) {
-                ScaffoldMessenger.of(context).showSnackBar(
-                  const SnackBar(
-                    content: Text('Task deleted successfully'),
-                    backgroundColor: Colors.green,
-                  ),
-                );
-              }
-            } catch (e) {
-              if (mounted) {
-                ScaffoldMessenger.of(context).showSnackBar(
-                  SnackBar(
-                    content: Text('Error: ${e.toString()}'),
-                    backgroundColor: Colors.red,
-                  ),
-                );
-              }
-            }
+        builder: (context) => AsyncStreamBuilder<List<Bucket>>(
+          state: _bucketController,
+          builder: (context, buckets) {
+            final activeBuckets = buckets.where((b) => !b.isArchive).toList();
+
+            return TaskManagementDialog(
+              task: task,
+              userId: _supabaseService.userId!,
+              buckets: activeBuckets,
+              onSave: (updatedTask) async {
+                try {
+                  await _controller.updateTask(updatedTask);
+                  if (mounted) {
+                    ScaffoldMessenger.of(context).showSnackBar(
+                      const SnackBar(
+                        content: Text('Task updated successfully'),
+                        backgroundColor: Colors.green,
+                      ),
+                    );
+                  }
+                } catch (e) {
+                  if (mounted) {
+                    ScaffoldMessenger.of(context).showSnackBar(
+                      SnackBar(
+                        content: Text('Error: ${e.toString()}'),
+                        backgroundColor: Colors.red,
+                      ),
+                    );
+                  }
+                }
+              },
+              onDelete: () async {
+                try {
+                  await _controller.deleteTask(task.id!);
+                  if (mounted) {
+                    ScaffoldMessenger.of(context).showSnackBar(
+                      const SnackBar(
+                        content: Text('Task deleted successfully'),
+                        backgroundColor: Colors.green,
+                      ),
+                    );
+                  }
+                } catch (e) {
+                  if (mounted) {
+                    ScaffoldMessenger.of(context).showSnackBar(
+                      SnackBar(
+                        content: Text('Error: ${e.toString()}'),
+                        backgroundColor: Colors.red,
+                      ),
+                    );
+                  }
+                }
+              },
+            );
           },
         ),
       );
@@ -1567,98 +1636,106 @@ class _TasksTabNewState extends ScopedScreenState<TasksTabNew>
               .where((p) => p.status == ProjectStatus.active && !p.isArchived)
               .toList();
 
-          return Dialog(
-            child: Container(
-              width: 600,
-              constraints: const BoxConstraints(maxHeight: 700),
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  // Header
-                  Container(
-                    padding: const EdgeInsets.all(16),
-                    decoration: BoxDecoration(
-                      border: Border(
-                        bottom: BorderSide(color: Colors.grey[300]!),
-                      ),
-                    ),
-                    child: Row(
-                      children: [
-                        const Expanded(
-                          child: Text(
-                            'Create Task',
-                            style: TextStyle(
-                              fontSize: 20,
-                              fontWeight: FontWeight.bold,
-                            ),
+          return AsyncStreamBuilder<List<Bucket>>(
+            state: _bucketController,
+            builder: (context, buckets) {
+              return Dialog(
+                child: Container(
+                  width: 600,
+                  constraints: const BoxConstraints(maxHeight: 700),
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      // Header
+                      Container(
+                        padding: const EdgeInsets.all(16),
+                        decoration: BoxDecoration(
+                          border: Border(
+                            bottom: BorderSide(color: Colors.grey[300]!),
                           ),
                         ),
-                        IconButton(
-                          icon: const Icon(Icons.close),
-                          onPressed: () => Navigator.pop(context),
+                        child: Row(
+                          children: [
+                            const Expanded(
+                              child: Text(
+                                'Create Task',
+                                style: TextStyle(
+                                  fontSize: 20,
+                                  fontWeight: FontWeight.bold,
+                                ),
+                              ),
+                            ),
+                            IconButton(
+                              icon: const Icon(Icons.close),
+                              onPressed: () => Navigator.pop(context),
+                            ),
+                          ],
                         ),
-                      ],
-                    ),
-                  ),
+                      ),
 
-                  // Content
-                  Expanded(
-                    child: TaskManagementDialog(
-                      userId: _supabaseService.userId!,
-                      projects: activeProjects,
-                      useDialogContent: true,
-                      onSave: (newTask) async {
-                        try {
-                          await _controller.createTask(newTask);
-                          if (mounted) {
-                            ScaffoldMessenger.of(context).showSnackBar(
-                              const SnackBar(
-                                content: Text('Task created successfully'),
-                                backgroundColor: Colors.green,
-                              ),
-                            );
-                            Navigator.pop(context);
-                          }
-                        } catch (e) {
-                          if (mounted) {
-                            ScaffoldMessenger.of(context).showSnackBar(
-                              SnackBar(
-                                content: Text('Error: ${e.toString()}'),
-                                backgroundColor: Colors.red,
-                              ),
-                            );
-                          }
-                        }
-                      },
-                    ),
-                  ),
+                      // Content
+                      Expanded(
+                        child: TaskManagementDialog(
+                          userId: _supabaseService.userId!,
+                          projects: activeProjects,
+                          buckets: buckets,
+                          useDialogContent: true,
+                          onSave: (newTask) async {
+                            try {
+                              await _controller.createTask(newTask);
+                              if (mounted) {
+                                ScaffoldMessenger.of(context).showSnackBar(
+                                  const SnackBar(
+                                    content: Text('Task created successfully'),
+                                    backgroundColor: Colors.green,
+                                  ),
+                                );
+                                Navigator.pop(context);
+                              }
+                            } catch (e) {
+                              if (mounted) {
+                                ScaffoldMessenger.of(context).showSnackBar(
+                                  SnackBar(
+                                    content: Text('Error: ${e.toString()}'),
+                                    backgroundColor: Colors.red,
+                                  ),
+                                );
+                              }
+                            }
+                          },
+                        ),
+                      ),
 
-                  // Footer with "View Full Page" button
-                  Container(
-                    padding: const EdgeInsets.all(16),
-                    decoration: BoxDecoration(
-                      border: Border(top: BorderSide(color: Colors.grey[300]!)),
-                    ),
-                    child: SizedBox(
-                      width: double.infinity,
-                      child: OutlinedButton.icon(
-                        icon: const Icon(Icons.open_in_full),
-                        label: const Text('View Full Page'),
-                        onPressed: () {
-                          Navigator.pop(context);
-                          Navigator.push(
-                            context,
-                            MaterialPageRoute(
-                              builder: (context) => const CreateTaskPage(),
-                            ),
-                          );
-                        },
+                      // Footer with "View Full Page" button
+                      Container(
+                        padding: const EdgeInsets.all(16),
+                        decoration: BoxDecoration(
+                          border: Border(
+                            top: BorderSide(color: Colors.grey[300]!),
+                          ),
+                        ),
+                        child: SizedBox(
+                          width: double.infinity,
+                          child: OutlinedButton.icon(
+                            icon: const Icon(Icons.open_in_full),
+                            label: const Text('View Full Page'),
+                            onPressed: () {
+                              Navigator.pop(context);
+                              Navigator.push(
+                                context,
+                                MaterialPageRoute(
+                                  builder: (context) => const CreateTaskPage(),
+                                ),
+                              );
+                            },
+                          ),
+                        ),
                       ),
-                    ),
+                    ],
                   ),
-                ],
-              ),
-            ),
+                ),
+              );
+            },
           );
         },
       ),
@@ -1710,19 +1787,20 @@ class _TasksTabNewState extends ScopedScreenState<TasksTabNew>
   }
 
   Widget _buildDetailSection(String title, IconData icon, Widget content) {
+    final theme = Theme.of(context);
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Row(
           children: [
-            Icon(icon, size: 20, color: Colors.grey[600]),
+            Icon(icon, size: 20, color: theme.colorScheme.onSurfaceVariant),
             const SizedBox(width: 8),
             Text(
               title,
               style: TextStyle(
                 fontSize: 14,
                 fontWeight: FontWeight.w600,
-                color: Colors.grey[700],
+                color: theme.colorScheme.onSurfaceVariant,
               ),
             ),
           ],
@@ -1738,19 +1816,20 @@ class _TasksTabNewState extends ScopedScreenState<TasksTabNew>
     IconData icon,
     Widget content,
   ) {
+    final theme = Theme.of(context);
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Row(
           children: [
-            Icon(icon, size: 20, color: Colors.grey[600]),
+            Icon(icon, size: 20, color: theme.colorScheme.onSurfaceVariant),
             const SizedBox(width: 8),
             Text(
               title,
               style: TextStyle(
                 fontSize: 14,
                 fontWeight: FontWeight.w600,
-                color: Colors.grey[700],
+                color: theme.colorScheme.onSurfaceVariant,
               ),
             ),
           ],
diff --git a/lib/features/tasks/presentation/screens/tasks_home_screen_new.dart b/lib/features/tasks/presentation/screens/tasks_home_screen_new.dart
deleted file mode 100644
index 9afcbbb..0000000
--- a/lib/features/tasks/presentation/screens/tasks_home_screen_new.dart
+++ /dev/null
@@ -1,976 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:keep_track/core/ui/app_layout_controller.dart';
-import 'package:keep_track/core/ui/ui.dart';
-
-/// New Task Management Screen with Calendar View and Subtasks
-class TasksHomeScreenNew extends ScopedScreen {
-  const TasksHomeScreenNew({super.key});
-
-  @override
-  State<TasksHomeScreenNew> createState() => _TasksHomeScreenNewState();
-}
-
-class _TasksHomeScreenNewState extends ScopedScreenState<TasksHomeScreenNew>
-    with AppLayoutControlled {
-  CalendarViewMode _viewMode = CalendarViewMode.month;
-  DateTime _selectedDate = DateTime.now();
-  TaskItem? _selectedTask;
-  bool _isPomodoroActive = false;
-  int _pomodoroMinutesRemaining = 25;
-
-  @override
-  void registerServices() {
-    // Services will be wired later
-  }
-
-  @override
-  void onReady() {
-    configureLayout(title: 'Tasks', showBottomNav: true);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      children: [
-        // View Mode Selector
-        _buildViewModeSelector(),
-
-        // Pomodoro Session Widget (shows when active or for today's tasks)
-        if (_isPomodoroActive || _isToday(_selectedDate))
-          _buildPomodoroWidget(),
-
-        Expanded(
-          child: SingleChildScrollView(
-            padding: const EdgeInsets.all(16),
-            child: Column(
-              children: [
-                // Calendar Grid View
-                _buildCalendarGrid(),
-                const SizedBox(height: 24),
-
-                // Task List with Subtasks
-                _buildTaskList(),
-              ],
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  bool _isToday(DateTime date) {
-    final now = DateTime.now();
-    return date.year == now.year &&
-           date.month == now.month &&
-           date.day == now.day;
-  }
-
-  Widget _buildViewModeSelector() {
-    return Card(
-      margin: const EdgeInsets.all(16),
-      elevation: 0,
-      child: Padding(
-        padding: const EdgeInsets.all(8),
-        child: Row(
-          children: [
-            Expanded(
-              child: _buildViewModeButton(
-                'Month',
-                CalendarViewMode.month,
-                Icons.calendar_month,
-              ),
-            ),
-            const SizedBox(width: 8),
-            Expanded(
-              child: _buildViewModeButton(
-                'Week',
-                CalendarViewMode.week,
-                Icons.calendar_view_week,
-              ),
-            ),
-            const SizedBox(width: 8),
-            Expanded(
-              child: _buildViewModeButton(
-                'Day',
-                CalendarViewMode.day,
-                Icons.calendar_today,
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildViewModeButton(String label, CalendarViewMode mode, IconData icon) {
-    final isSelected = _viewMode == mode;
-    return Material(
-      color: isSelected
-          ? Theme.of(context).colorScheme.primary.withOpacity(0.1)
-          : Colors.transparent,
-      borderRadius: BorderRadius.circular(8),
-      child: InkWell(
-        onTap: () => setState(() => _viewMode = mode),
-        borderRadius: BorderRadius.circular(8),
-        child: Padding(
-          padding: const EdgeInsets.symmetric(vertical: 12),
-          child: Column(
-            children: [
-              Icon(
-                icon,
-                color: isSelected
-                    ? Theme.of(context).colorScheme.primary
-                    : Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
-              ),
-              const SizedBox(height: 4),
-              Text(
-                label,
-                style: TextStyle(
-                  fontSize: 12,
-                  fontWeight: isSelected ? FontWeight.w600 : FontWeight.normal,
-                  color: isSelected
-                      ? Theme.of(context).colorScheme.primary
-                      : Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildPomodoroWidget() {
-    return Card(
-      margin: const EdgeInsets.symmetric(horizontal: 16),
-      elevation: 0,
-      color: Colors.red[50],
-      child: Padding(
-        padding: const EdgeInsets.all(16),
-        child: Column(
-          children: [
-            Row(
-              children: [
-                Container(
-                  padding: const EdgeInsets.all(8),
-                  decoration: BoxDecoration(
-                    color: Colors.red[100],
-                    shape: BoxShape.circle,
-                  ),
-                  child: Icon(Icons.timer, color: Colors.red[700]),
-                ),
-                const SizedBox(width: 12),
-                Expanded(
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Text(
-                        _isPomodoroActive ? 'Pomodoro Session' : 'Ready for Focus',
-                        style: TextStyle(
-                          fontWeight: FontWeight.bold,
-                          color: Colors.red[900],
-                        ),
-                      ),
-                      Text(
-                        _isPomodoroActive
-                            ? '$_pomodoroMinutesRemaining minutes remaining'
-                            : 'Start a pomodoro session',
-                        style: TextStyle(fontSize: 12, color: Colors.red[700]),
-                      ),
-                    ],
-                  ),
-                ),
-                ElevatedButton(
-                  onPressed: () {
-                    setState(() => _isPomodoroActive = !_isPomodoroActive);
-                  },
-                  style: ElevatedButton.styleFrom(
-                    backgroundColor: Colors.red[700],
-                    foregroundColor: Colors.white,
-                  ),
-                  child: Text(_isPomodoroActive ? 'Stop' : 'Start'),
-                ),
-              ],
-            ),
-            if (_isPomodoroActive) ...[
-              const SizedBox(height: 12),
-              Text(
-                'Today\'s Tasks Available',
-                style: TextStyle(
-                  fontSize: 12,
-                  fontWeight: FontWeight.w600,
-                  color: Colors.red[900],
-                ),
-              ),
-              const SizedBox(height: 8),
-              ...dummyTasks
-                  .where((task) => task.parentId == null && _isToday(task.dueDate))
-                  .take(3)
-                  .map((task) => Padding(
-                        padding: const EdgeInsets.only(bottom: 4),
-                        child: Row(
-                          children: [
-                            Icon(Icons.circle, size: 8, color: Colors.red[700]),
-                            const SizedBox(width: 8),
-                            Expanded(
-                              child: Text(
-                                task.title,
-                                style: TextStyle(
-                                  fontSize: 12,
-                                  color: Colors.red[900],
-                                ),
-                              ),
-                            ),
-                          ],
-                        ),
-                      )),
-            ],
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildCalendarGrid() {
-    return Card(
-      elevation: 0,
-      child: Padding(
-        padding: const EdgeInsets.all(16),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            // Calendar Header
-            Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                IconButton(
-                  icon: const Icon(Icons.chevron_left),
-                  onPressed: () {
-                    setState(() {
-                      _selectedDate = _getPreviousPeriod(_selectedDate, _viewMode);
-                    });
-                  },
-                ),
-                Text(
-                  _getCalendarTitle(),
-                  style: const TextStyle(
-                    fontSize: 18,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                IconButton(
-                  icon: const Icon(Icons.chevron_right),
-                  onPressed: () {
-                    setState(() {
-                      _selectedDate = _getNextPeriod(_selectedDate, _viewMode);
-                    });
-                  },
-                ),
-              ],
-            ),
-            const SizedBox(height: 16),
-
-            // Calendar Grid
-            if (_viewMode == CalendarViewMode.month)
-              _buildMonthGrid()
-            else if (_viewMode == CalendarViewMode.week)
-              _buildWeekGrid()
-            else
-              _buildDayView(),
-          ],
-        ),
-      ),
-    );
-  }
-
-  String _getCalendarTitle() {
-    switch (_viewMode) {
-      case CalendarViewMode.month:
-        return DateFormat('MMMM yyyy').format(_selectedDate);
-      case CalendarViewMode.week:
-        final weekStart = _getWeekStart(_selectedDate);
-        final weekEnd = weekStart.add(const Duration(days: 6));
-        return '${DateFormat('MMM d').format(weekStart)} - ${DateFormat('MMM d, yyyy').format(weekEnd)}';
-      case CalendarViewMode.day:
-        return DateFormat('EEEE, MMMM d, yyyy').format(_selectedDate);
-    }
-  }
-
-  DateTime _getPreviousPeriod(DateTime date, CalendarViewMode mode) {
-    switch (mode) {
-      case CalendarViewMode.month:
-        return DateTime(date.year, date.month - 1, 1);
-      case CalendarViewMode.week:
-        return date.subtract(const Duration(days: 7));
-      case CalendarViewMode.day:
-        return date.subtract(const Duration(days: 1));
-    }
-  }
-
-  DateTime _getNextPeriod(DateTime date, CalendarViewMode mode) {
-    switch (mode) {
-      case CalendarViewMode.month:
-        return DateTime(date.year, date.month + 1, 1);
-      case CalendarViewMode.week:
-        return date.add(const Duration(days: 7));
-      case CalendarViewMode.day:
-        return date.add(const Duration(days: 1));
-    }
-  }
-
-  DateTime _getWeekStart(DateTime date) {
-    return date.subtract(Duration(days: date.weekday - 1));
-  }
-
-  Widget _buildMonthGrid() {
-    final firstDay = DateTime(_selectedDate.year, _selectedDate.month, 1);
-    final lastDay = DateTime(_selectedDate.year, _selectedDate.month + 1, 0);
-    final startOffset = firstDay.weekday - 1;
-    final totalDays = lastDay.day;
-
-    return Column(
-      children: [
-        // Day names header
-        Row(
-          children: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
-              .map((day) => Expanded(
-                    child: Center(
-                      child: Text(
-                        day,
-                        style: TextStyle(
-                          fontSize: 12,
-                          fontWeight: FontWeight.w600,
-                          color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
-                        ),
-                      ),
-                    ),
-                  ))
-              .toList(),
-        ),
-        const SizedBox(height: 8),
-
-        // Calendar grid
-        GridView.builder(
-          shrinkWrap: true,
-          physics: const NeverScrollableScrollPhysics(),
-          gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-            crossAxisCount: 7,
-            childAspectRatio: 1,
-            crossAxisSpacing: 4,
-            mainAxisSpacing: 4,
-          ),
-          itemCount: 42, // 6 weeks
-          itemBuilder: (context, index) {
-            final dayNumber = index - startOffset + 1;
-
-            if (dayNumber < 1 || dayNumber > totalDays) {
-              return Container(); // Empty cell
-            }
-
-            final date = DateTime(_selectedDate.year, _selectedDate.month, dayNumber);
-            final tasksOnDay = dummyTasks
-                .where((task) => _isSameDay(task.dueDate, date))
-                .length;
-
-            return _buildDayCell(date, tasksOnDay);
-          },
-        ),
-      ],
-    );
-  }
-
-  Widget _buildWeekGrid() {
-    final weekStart = _getWeekStart(_selectedDate);
-
-    return Row(
-      children: List.generate(7, (index) {
-        final date = weekStart.add(Duration(days: index));
-        final tasksOnDay = dummyTasks
-            .where((task) => _isSameDay(task.dueDate, date))
-            .length;
-
-        return Expanded(
-          child: Column(
-            children: [
-              Text(
-                DateFormat('E').format(date),
-                style: TextStyle(
-                  fontSize: 12,
-                  fontWeight: FontWeight.w600,
-                  color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
-                ),
-              ),
-              const SizedBox(height: 8),
-              _buildDayCell(date, tasksOnDay, height: 80),
-            ],
-          ),
-        );
-      }),
-    );
-  }
-
-  Widget _buildDayView() {
-    final tasksToday = dummyTasks
-        .where((task) => _isSameDay(task.dueDate, _selectedDate))
-        .toList();
-
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text(
-          '${tasksToday.length} task${tasksToday.length == 1 ? '' : 's'} today',
-          style: TextStyle(
-            fontSize: 14,
-            color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
-          ),
-        ),
-        const SizedBox(height: 12),
-        Container(
-          height: 120,
-          decoration: BoxDecoration(
-            color: Theme.of(context).colorScheme.primary.withOpacity(0.05),
-            borderRadius: BorderRadius.circular(8),
-            border: Border.all(
-              color: Theme.of(context).colorScheme.primary.withOpacity(0.2),
-            ),
-          ),
-          child: tasksToday.isEmpty
-              ? Center(
-                  child: Text(
-                    'No tasks for this day',
-                    style: TextStyle(
-                      color: Theme.of(context).colorScheme.onSurface.withOpacity(0.4),
-                    ),
-                  ),
-                )
-              : ListView.builder(
-                  padding: const EdgeInsets.all(12),
-                  itemCount: tasksToday.length,
-                  itemBuilder: (context, index) {
-                    final task = tasksToday[index];
-                    return Padding(
-                      padding: const EdgeInsets.only(bottom: 8),
-                      child: Row(
-                        children: [
-                          Icon(
-                            Icons.circle,
-                            size: 8,
-                            color: _getPriorityColor(task.priority),
-                          ),
-                          const SizedBox(width: 8),
-                          Expanded(
-                            child: Text(
-                              task.title,
-                              style: const TextStyle(fontSize: 13),
-                            ),
-                          ),
-                        ],
-                      ),
-                    );
-                  },
-                ),
-        ),
-      ],
-    );
-  }
-
-  Widget _buildDayCell(DateTime date, int taskCount, {double? height}) {
-    final isToday = _isToday(date);
-    final isSelected = _isSameDay(date, _selectedDate);
-
-    return InkWell(
-      onTap: () => setState(() => _selectedDate = date),
-      child: Container(
-        height: height,
-        decoration: BoxDecoration(
-          color: isSelected
-              ? Theme.of(context).colorScheme.primary.withOpacity(0.1)
-              : isToday
-                  ? Theme.of(context).colorScheme.primary.withOpacity(0.05)
-                  : null,
-          borderRadius: BorderRadius.circular(8),
-          border: Border.all(
-            color: isToday
-                ? Theme.of(context).colorScheme.primary
-                : Theme.of(context).colorScheme.outline.withOpacity(0.2),
-          ),
-        ),
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            Text(
-              '${date.day}',
-              style: TextStyle(
-                fontWeight: isToday ? FontWeight.bold : FontWeight.normal,
-                color: isToday
-                    ? Theme.of(context).colorScheme.primary
-                    : Theme.of(context).colorScheme.onSurface,
-              ),
-            ),
-            if (taskCount > 0) ...[
-              const SizedBox(height: 4),
-              Container(
-                padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
-                decoration: BoxDecoration(
-                  color: Theme.of(context).colorScheme.primary,
-                  borderRadius: BorderRadius.circular(10),
-                ),
-                child: Text(
-                  '$taskCount',
-                  style: const TextStyle(
-                    color: Colors.white,
-                    fontSize: 10,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-              ),
-            ],
-          ],
-        ),
-      ),
-    );
-  }
-
-  bool _isSameDay(DateTime date1, DateTime date2) {
-    return date1.year == date2.year &&
-           date1.month == date2.month &&
-           date1.day == date2.day;
-  }
-
-  Widget _buildTaskList() {
-    final tasksOnSelectedDate = dummyTasks
-        .where((task) =>
-            task.parentId == null &&
-            _isSameDay(task.dueDate, _selectedDate))
-        .toList();
-
-    if (tasksOnSelectedDate.isEmpty) {
-      return Card(
-        elevation: 0,
-        child: Padding(
-          padding: const EdgeInsets.all(32),
-          child: Center(
-            child: Column(
-              children: [
-                Icon(
-                  Icons.task_alt,
-                  size: 48,
-                  color: Theme.of(context).colorScheme.onSurface.withOpacity(0.3),
-                ),
-                const SizedBox(height: 8),
-                Text(
-                  'No tasks for ${DateFormat('MMM d').format(_selectedDate)}',
-                  style: TextStyle(
-                    color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ),
-      );
-    }
-
-    return Card(
-      elevation: 0,
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Padding(
-            padding: const EdgeInsets.all(16),
-            child: Row(
-              children: [
-                Icon(
-                  Icons.list,
-                  color: Theme.of(context).colorScheme.primary,
-                ),
-                const SizedBox(width: 8),
-                Text(
-                  'Tasks for ${DateFormat('MMM d').format(_selectedDate)}',
-                  style: const TextStyle(
-                    fontSize: 18,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-              ],
-            ),
-          ),
-          const Divider(height: 1),
-          ListView.builder(
-            shrinkWrap: true,
-            physics: const NeverScrollableScrollPhysics(),
-            itemCount: tasksOnSelectedDate.length,
-            itemBuilder: (context, index) {
-              final task = tasksOnSelectedDate[index];
-              return _buildTaskItem(task, 0);
-            },
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildTaskItem(TaskItem task, int indentLevel) {
-    final subtasks = dummyTasks.where((t) => t.parentId == task.id).toList();
-    final isExpanded = _selectedTask?.id == task.id;
-
-    return Column(
-      children: [
-        InkWell(
-          onTap: () {
-            setState(() {
-              _selectedTask = isExpanded ? null : task;
-            });
-          },
-          child: Padding(
-            padding: EdgeInsets.only(
-              left: 16.0 + (indentLevel * 24.0),
-              right: 16.0,
-              top: 12.0,
-              bottom: 12.0,
-            ),
-            child: Row(
-              children: [
-                // Checkbox
-                Checkbox(
-                  value: task.isCompleted,
-                  onChanged: (value) {
-                    // Will be wired later
-                  },
-                  shape: RoundedRectangleBorder(
-                    borderRadius: BorderRadius.circular(4),
-                  ),
-                ),
-                const SizedBox(width: 8),
-
-                // Priority indicator
-                Container(
-                  width: 4,
-                  height: 40,
-                  decoration: BoxDecoration(
-                    color: _getPriorityColor(task.priority),
-                    borderRadius: BorderRadius.circular(2),
-                  ),
-                ),
-                const SizedBox(width: 12),
-
-                // Task info
-                Expanded(
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Text(
-                        task.title,
-                        style: TextStyle(
-                          fontSize: 14,
-                          fontWeight: FontWeight.w500,
-                          decoration: task.isCompleted
-                              ? TextDecoration.lineThrough
-                              : null,
-                        ),
-                      ),
-                      if (task.description != null) ...[
-                        const SizedBox(height: 4),
-                        Text(
-                          task.description!,
-                          style: TextStyle(
-                            fontSize: 12,
-                            color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
-                          ),
-                          maxLines: 1,
-                          overflow: TextOverflow.ellipsis,
-                        ),
-                      ],
-                      const SizedBox(height: 4),
-                      Row(
-                        children: [
-                          Icon(
-                            Icons.flag,
-                            size: 12,
-                            color: _getPriorityColor(task.priority),
-                          ),
-                          const SizedBox(width: 4),
-                          Text(
-                            task.priority,
-                            style: TextStyle(
-                              fontSize: 11,
-                              color: _getPriorityColor(task.priority),
-                            ),
-                          ),
-                          if (task.pomodoroSessions > 0) ...[
-                            const SizedBox(width: 12),
-                            Icon(
-                              Icons.timer,
-                              size: 12,
-                              color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
-                            ),
-                            const SizedBox(width: 4),
-                            Text(
-                              '${task.pomodoroSessions} sessions',
-                              style: TextStyle(
-                                fontSize: 11,
-                                color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
-                              ),
-                            ),
-                          ],
-                          if (subtasks.isNotEmpty) ...[
-                            const SizedBox(width: 12),
-                            Icon(
-                              Icons.subdirectory_arrow_right,
-                              size: 12,
-                              color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
-                            ),
-                            const SizedBox(width: 4),
-                            Text(
-                              '${subtasks.length} subtask${subtasks.length > 1 ? 's' : ''}',
-                              style: TextStyle(
-                                fontSize: 11,
-                                color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
-                              ),
-                            ),
-                          ],
-                        ],
-                      ),
-                    ],
-                  ),
-                ),
-
-                // Expand/collapse icon
-                if (subtasks.isNotEmpty || isExpanded)
-                  Icon(
-                    isExpanded ? Icons.expand_less : Icons.expand_more,
-                    color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
-                  ),
-              ],
-            ),
-          ),
-        ),
-
-        // Metadata when expanded
-        if (isExpanded) ...[
-          Container(
-            margin: EdgeInsets.only(
-              left: 16.0 + (indentLevel * 24.0),
-              right: 16.0,
-              bottom: 12.0,
-            ),
-            padding: const EdgeInsets.all(12),
-            decoration: BoxDecoration(
-              color: Theme.of(context).colorScheme.surfaceVariant.withOpacity(0.3),
-              borderRadius: BorderRadius.circular(8),
-            ),
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                _buildMetadataRow('Created', DateFormat('MMM d, yyyy').format(task.createdAt)),
-                _buildMetadataRow('Due', DateFormat('MMM d, yyyy HH:mm').format(task.dueDate)),
-                _buildMetadataRow('Status', task.status),
-                _buildMetadataRow('Priority', task.priority),
-                if (task.tags.isNotEmpty)
-                  _buildMetadataRow('Tags', task.tags.join(', ')),
-                if (task.estimatedMinutes != null)
-                  _buildMetadataRow('Estimated', '${task.estimatedMinutes} min'),
-                if (task.pomodoroSessions > 0)
-                  _buildMetadataRow('Pomodoro Sessions', '${task.pomodoroSessions}'),
-              ],
-            ),
-          ),
-        ],
-
-        // Subtasks (indented)
-        ...subtasks.map((subtask) => _buildTaskItem(subtask, indentLevel + 1)),
-
-        if (indentLevel == 0)
-          const Divider(height: 1),
-      ],
-    );
-  }
-
-  Widget _buildMetadataRow(String label, String value) {
-    return Padding(
-      padding: const EdgeInsets.only(bottom: 8),
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          SizedBox(
-            width: 100,
-            child: Text(
-              label,
-              style: TextStyle(
-                fontSize: 12,
-                fontWeight: FontWeight.w600,
-                color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8),
-              ),
-            ),
-          ),
-          Expanded(
-            child: Text(
-              value,
-              style: TextStyle(
-                fontSize: 12,
-                color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Color _getPriorityColor(String priority) {
-    switch (priority.toLowerCase()) {
-      case 'urgent':
-        return Colors.red[700]!;
-      case 'high':
-        return Colors.orange[700]!;
-      case 'medium':
-        return Colors.blue[700]!;
-      case 'low':
-        return Colors.grey[600]!;
-      default:
-        return Colors.grey[600]!;
-    }
-  }
-}
-
-enum CalendarViewMode { month, week, day }
-
-// Dummy Data Classes
-class TaskItem {
-  final String id;
-  final String? parentId;
-  final String title;
-  final String? description;
-  final String status;
-  final String priority;
-  final DateTime createdAt;
-  final DateTime dueDate;
-  final bool isCompleted;
-  final List<String> tags;
-  final int? estimatedMinutes;
-  final int pomodoroSessions;
-
-  TaskItem({
-    required this.id,
-    this.parentId,
-    required this.title,
-    this.description,
-    required this.status,
-    required this.priority,
-    required this.createdAt,
-    required this.dueDate,
-    this.isCompleted = false,
-    this.tags = const [],
-    this.estimatedMinutes,
-    this.pomodoroSessions = 0,
-  });
-}
-
-// Dummy Data
-final dummyTasks = [
-  TaskItem(
-    id: '1',
-    title: 'Complete project proposal',
-    description: 'Write and submit Q1 project proposal',
-    status: 'In Progress',
-    priority: 'Urgent',
-    createdAt: DateTime.now().subtract(const Duration(days: 2)),
-    dueDate: DateTime.now(),
-    tags: ['work', 'important'],
-    estimatedMinutes: 120,
-    pomodoroSessions: 3,
-  ),
-  TaskItem(
-    id: '1.1',
-    parentId: '1',
-    title: 'Research market trends',
-    status: 'Completed',
-    priority: 'High',
-    createdAt: DateTime.now().subtract(const Duration(days: 2)),
-    dueDate: DateTime.now(),
-    isCompleted: true,
-    pomodoroSessions: 2,
-  ),
-  TaskItem(
-    id: '1.2',
-    parentId: '1',
-    title: 'Draft executive summary',
-    status: 'In Progress',
-    priority: 'High',
-    createdAt: DateTime.now().subtract(const Duration(days: 1)),
-    dueDate: DateTime.now(),
-    pomodoroSessions: 1,
-  ),
-  TaskItem(
-    id: '1.3',
-    parentId: '1',
-    title: 'Get approval from stakeholders',
-    status: 'To Do',
-    priority: 'Urgent',
-    createdAt: DateTime.now(),
-    dueDate: DateTime.now(),
-  ),
-  TaskItem(
-    id: '2',
-    title: 'Team meeting at 2 PM',
-    description: 'Discuss sprint retrospective',
-    status: 'To Do',
-    priority: 'Medium',
-    createdAt: DateTime.now().subtract(const Duration(days: 1)),
-    dueDate: DateTime.now(),
-    tags: ['meeting'],
-    estimatedMinutes: 60,
-  ),
-  TaskItem(
-    id: '3',
-    title: 'Review code changes',
-    description: 'Review PR #234 and PR #235',
-    status: 'To Do',
-    priority: 'High',
-    createdAt: DateTime.now(),
-    dueDate: DateTime.now().add(const Duration(days: 1)),
-    tags: ['code-review', 'urgent'],
-    estimatedMinutes: 45,
-  ),
-  TaskItem(
-    id: '3.1',
-    parentId: '3',
-    title: 'Review PR #234',
-    status: 'To Do',
-    priority: 'High',
-    createdAt: DateTime.now(),
-    dueDate: DateTime.now().add(const Duration(days: 1)),
-  ),
-  TaskItem(
-    id: '3.2',
-    parentId: '3',
-    title: 'Review PR #235',
-    status: 'To Do',
-    priority: 'High',
-    createdAt: DateTime.now(),
-    dueDate: DateTime.now().add(const Duration(days: 1)),
-  ),
-  TaskItem(
-    id: '4',
-    title: 'Update documentation',
-    status: 'To Do',
-    priority: 'Low',
-    createdAt: DateTime.now(),
-    dueDate: DateTime.now().add(const Duration(days: 3)),
-    tags: ['docs'],
-    estimatedMinutes: 90,
-  ),
-  TaskItem(
-    id: '5',
-    title: 'Design system updates',
-    description: 'Update color palette and typography',
-    status: 'To Do',
-    priority: 'Medium',
-    createdAt: DateTime.now(),
-    dueDate: DateTime.now().add(const Duration(days: 5)),
-    tags: ['design', 'ui'],
-    estimatedMinutes: 180,
-    pomodoroSessions: 1,
-  ),
-];
diff --git a/lib/features/tasks/presentation/state/bucket_controller.dart b/lib/features/tasks/presentation/state/bucket_controller.dart
new file mode 100644
index 0000000..cc21536
--- /dev/null
+++ b/lib/features/tasks/presentation/state/bucket_controller.dart
@@ -0,0 +1,90 @@
+import 'package:keep_track/core/error/result.dart';
+import 'package:keep_track/core/state/stream_state.dart';
+import 'package:keep_track/features/tasks/modules/buckets/domain/entities/bucket.dart';
+import 'package:keep_track/features/tasks/modules/buckets/domain/repositories/bucket_repository.dart';
+
+/// Controller for managing bucket state and operations
+class BucketController extends StreamState<AsyncState<List<Bucket>>> {
+  final BucketRepository _repository;
+
+  BucketController(this._repository) : super(const AsyncLoading()) {
+    loadBuckets();
+  }
+
+  /// Load all buckets
+  Future<void> loadBuckets() async {
+    await execute(() async {
+      return await _repository.getBuckets().then((r) => r.unwrap());
+    });
+  }
+
+  /// Create a new bucket
+  Future<void> createBucket(Bucket bucket) async {
+    await execute(() async {
+      final created = await _repository.createBucket(bucket).then((r) => r.unwrap());
+      final current = data ?? [];
+      return [...current, created];
+    });
+  }
+
+  /// Update an existing bucket
+  Future<void> updateBucket(Bucket bucket) async {
+    await execute(() async {
+      await _repository.updateBucket(bucket).then((r) => r.unwrap());
+      await loadBuckets();
+      return data ?? [];
+    });
+  }
+
+  /// Delete a bucket
+  Future<void> deleteBucket(String id) async {
+    await execute(() async {
+      await _repository.deleteBucket(id).then((r) => r.unwrap());
+      await loadBuckets();
+      return data ?? [];
+    });
+  }
+
+  /// Archive a bucket (soft delete)
+  Future<void> archiveBucket(String id) async {
+    final bucket = getBucketFromCurrentState(id);
+    if (bucket != null) {
+      await updateBucket(bucket.copyWith(isArchive: true));
+    }
+  }
+
+  /// Unarchive a bucket
+  Future<void> unarchiveBucket(String id) async {
+    final bucket = getBucketFromCurrentState(id);
+    if (bucket != null) {
+      await updateBucket(bucket.copyWith(isArchive: false));
+    }
+  }
+
+  /// Refresh current data
+  Future<void> refresh() async {
+    await loadBuckets();
+  }
+
+  /// Clear all buckets (for testing or reset)
+  void clearBuckets() {
+    emit(const AsyncData([]));
+  }
+
+  /// Get buckets currently in state (if loaded)
+  List<Bucket>? get currentBuckets => state is AsyncData<List<Bucket>>
+      ? (state as AsyncData<List<Bucket>>).data
+      : null;
+
+  /// Get bucket by ID from current state
+  Bucket? getBucketFromCurrentState(String id) {
+    final buckets = currentBuckets;
+    if (buckets == null) return null;
+
+    try {
+      return buckets.where((b) => b.id == id).first;
+    } catch (e) {
+      return null;
+    }
+  }
+}
diff --git a/lib/features/tasks/presentation/state/pomodoro_session_controller.dart b/lib/features/tasks/presentation/state/pomodoro_session_controller.dart
index 484c2be..8aac427 100644
--- a/lib/features/tasks/presentation/state/pomodoro_session_controller.dart
+++ b/lib/features/tasks/presentation/state/pomodoro_session_controller.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'package:keep_track/core/error/result.dart';
 import 'package:keep_track/core/state/stream_state.dart';
+import 'package:keep_track/features/notifications/pomodoro_notification_helper.dart';
 import 'package:keep_track/features/tasks/modules/pomodoro/domain/entities/pomodoro_settings.dart';
 import '../../modules/pomodoro/domain/entities/pomodoro_session.dart';
 import '../../modules/pomodoro/domain/repositories/pomodoro_session_repository.dart';
@@ -37,8 +38,9 @@ class PomodoroSessionController
       final activeSession = result.unwrap();
 
       if (activeSession != null) {
-        // Check if session time has expired
-        if (activeSession.remainingSeconds <= 0 &&
+        // Check if session time has expired (skip for stopwatch - no expiration)
+        if (!activeSession.isStopwatch &&
+            activeSession.remainingSeconds <= 0 &&
             (activeSession.isRunning ||
                 activeSession.status == PomodoroSessionStatus.paused)) {
           // Session expired while user was away - auto-complete it
@@ -327,8 +329,8 @@ class PomodoroSessionController
       // The session entity calculates elapsed/remaining from database startedAt
       final remaining = currentSession.remainingSeconds;
 
-      // Check if timer is complete
-      if (remaining <= 0) {
+      // Check if timer is complete (skip for stopwatch - runs forever until manually stopped)
+      if (!currentSession.isStopwatch && remaining <= 0) {
         timer.cancel();
         _autoCompleteSession(currentSession);
         return;
@@ -360,6 +362,9 @@ class PomodoroSessionController
       // Update in database
       await _repository.updateSession(updatedSession).then((r) => r.unwrap());
 
+      // Show notification for session completion (mobile only)
+      await PomodoroNotificationHelper.instance.showSessionCompleteNotification(updatedSession);
+
       // Show completed state
       emit(
         AsyncData(
diff --git a/lib/features/tasks/presentation/state/project_controller.dart b/lib/features/tasks/presentation/state/project_controller.dart
index 8db1f41..e579681 100644
--- a/lib/features/tasks/presentation/state/project_controller.dart
+++ b/lib/features/tasks/presentation/state/project_controller.dart
@@ -25,6 +25,15 @@ class ProjectController extends StreamState<AsyncState<List<Project>>> {
     });
   }
 
+  // Load all projects related to selected bucket
+  Future<void> loadProjectsByBucketId(String bucketId) async {
+    await execute(() async {
+      return await _repository
+          .getProjectsByBucketID(bucketId)
+          .then((r) => r.unwrap());
+    });
+  }
+
   /// Create a new project
   Future<void> createProject(Project project) async {
     await execute(() async {
@@ -71,4 +80,21 @@ class ProjectController extends StreamState<AsyncState<List<Project>>> {
       return data ?? [];
     });
   }
+
+  /// Get projects currently in state (if loaded)
+  List<Project>? get currentProjects => state is AsyncData<List<Project>>
+      ? (state as AsyncData<List<Project>>).data
+      : null;
+
+  /// Get project by ID from current state
+  Project? getProjectFromCurrentState(String id) {
+    final projects = currentProjects;
+    if (projects == null) return null;
+
+    try {
+      return projects.where((p) => p.id == id).first;
+    } catch (e) {
+      return null;
+    }
+  }
 }
diff --git a/lib/features/tasks/presentation/state/task_controller.dart b/lib/features/tasks/presentation/state/task_controller.dart
index ca28cd5..337ef09 100644
--- a/lib/features/tasks/presentation/state/task_controller.dart
+++ b/lib/features/tasks/presentation/state/task_controller.dart
@@ -1,11 +1,13 @@
 import 'package:keep_track/core/error/result.dart';
 import 'package:keep_track/core/state/stream_state.dart';
+import 'package:keep_track/features/notifications/task_notification_helper.dart';
 import '../../modules/tasks/domain/entities/task.dart';
 import '../../modules/tasks/domain/repositories/task_repository.dart';
 
 /// Controller for managing task list state
 class TaskController extends StreamState<AsyncState<List<Task>>> {
   final TaskRepository _repository;
+  final TaskNotificationHelper _notificationHelper = TaskNotificationHelper.instance;
 
   TaskController(this._repository) : super(const AsyncLoading()) {
     loadTasks();
@@ -20,7 +22,9 @@ class TaskController extends StreamState<AsyncState<List<Task>>> {
 
   /// Create a new task
   Future<void> createTask(Task task) async {
-    await _repository.createTask(task).then((r) => r.unwrap());
+    final createdTask = await _repository.createTask(task).then((r) => r.unwrap());
+    // Schedule notification for task with due date (mobile only)
+    await _notificationHelper.scheduleTaskDueNotification(createdTask);
     await loadTasks();
   }
 
@@ -28,6 +32,8 @@ class TaskController extends StreamState<AsyncState<List<Task>>> {
   Future<void> updateTask(Task task) async {
     await execute(() async {
       await _repository.updateTask(task).then((r) => r.unwrap());
+      // Update notification based on task state (mobile only)
+      await _notificationHelper.updateTaskNotification(task);
       await loadTasks();
       return data ?? [];
     });
@@ -36,6 +42,8 @@ class TaskController extends StreamState<AsyncState<List<Task>>> {
   /// Delete a task
   Future<void> deleteTask(String id) async {
     await execute(() async {
+      // Cancel notification before deleting (mobile only)
+      await _notificationHelper.cancelTaskDueNotification(id);
       await _repository.deleteTask(id).then((r) => r.unwrap());
       await loadTasks();
       return data ?? [];
@@ -58,6 +66,14 @@ class TaskController extends StreamState<AsyncState<List<Task>>> {
     });
   }
 
+  Future<void> loadProjectsByBucketId(String bucketId) async {
+    await execute(() async {
+      return await _repository
+          .getTasksByBucketID(bucketId)
+          .then((r) => r.unwrap());
+    });
+  }
+
   /// Search tasks
   Future<void> searchTasks(String query) async {
     await execute(() async {
diff --git a/lib/features/tasks/presentation/widgets/pomodoro_nav_indicator.dart b/lib/features/tasks/presentation/widgets/pomodoro_nav_indicator.dart
new file mode 100644
index 0000000..00ff34c
--- /dev/null
+++ b/lib/features/tasks/presentation/widgets/pomodoro_nav_indicator.dart
@@ -0,0 +1,200 @@
+import 'package:flutter/material.dart';
+import 'package:keep_track/core/di/service_locator.dart';
+import 'package:keep_track/core/state/stream_builder_widget.dart';
+import 'package:keep_track/core/state/stream_state.dart';
+import 'package:keep_track/features/tasks/modules/pomodoro/domain/entities/pomodoro_session.dart';
+import 'package:keep_track/features/tasks/presentation/state/pomodoro_session_controller.dart';
+
+/// Compact pomodoro timer indicator for navigation bars
+/// Shows elapsed/remaining time when a session is active
+class PomodoroNavIndicator extends StatelessWidget {
+  final VoidCallback? onTap;
+
+  const PomodoroNavIndicator({super.key, this.onTap});
+
+  @override
+  Widget build(BuildContext context) {
+    final controller = locator.get<PomodoroSessionController>();
+
+    return AsyncStreamBuilder<PomodoroSessionState>(
+      state: controller,
+      builder: (context, state) {
+        final session = state.currentSession;
+
+        // Don't show if no active session or session is completed/cancelled
+        if (session == null ||
+            session.status == PomodoroSessionStatus.completed ||
+            session.status == PomodoroSessionStatus.canceled) {
+          return const SizedBox.shrink();
+        }
+
+        // Get session color
+        Color sessionColor;
+        switch (session.type) {
+          case PomodoroSessionType.pomodoro:
+            sessionColor = Colors.red;
+            break;
+          case PomodoroSessionType.shortBreak:
+            sessionColor = Colors.green;
+            break;
+          case PomodoroSessionType.longBreak:
+            sessionColor = Colors.blue;
+            break;
+          case PomodoroSessionType.stopwatch:
+            sessionColor = Colors.amber;
+            break;
+        }
+
+        // Calculate display time
+        final int displaySeconds;
+        if (session.isStopwatch) {
+          displaySeconds = session.elapsedSeconds;
+        } else {
+          displaySeconds = session.remainingSeconds;
+        }
+
+        final hours = displaySeconds ~/ 3600;
+        final minutes = (displaySeconds % 3600) ~/ 60;
+        final seconds = displaySeconds % 60;
+
+        final timeText = hours > 0
+            ? '${hours}:${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}'
+            : '${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}';
+
+        final isRunning = state.isRunning;
+
+        return Tooltip(
+          message: '${session.type.displayName} - Tap to view',
+          child: InkWell(
+            onTap: onTap,
+            borderRadius: BorderRadius.circular(20),
+            child: Container(
+              padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+              decoration: BoxDecoration(
+                color: sessionColor.withOpacity(0.15),
+                borderRadius: BorderRadius.circular(20),
+                border: Border.all(
+                  color: sessionColor.withOpacity(0.4),
+                  width: 1.5,
+                ),
+              ),
+              child: Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  // Pulsing indicator for running sessions
+                  _PulsingDot(
+                    color: sessionColor,
+                    isAnimating: isRunning,
+                  ),
+                  const SizedBox(width: 8),
+                  // Time display
+                  Text(
+                    timeText,
+                    style: TextStyle(
+                      color: sessionColor,
+                      fontWeight: FontWeight.bold,
+                      fontSize: 14,
+                      fontFeatures: const [FontFeature.tabularFigures()],
+                    ),
+                  ),
+                  // Pause indicator
+                  if (!isRunning) ...[
+                    const SizedBox(width: 4),
+                    Icon(
+                      Icons.pause,
+                      size: 14,
+                      color: sessionColor,
+                    ),
+                  ],
+                ],
+              ),
+            ),
+          ),
+        );
+      },
+      loadingBuilder: (_) => const SizedBox.shrink(),
+      errorBuilder: (_, __) => const SizedBox.shrink(),
+    );
+  }
+}
+
+/// Pulsing dot indicator for active sessions
+class _PulsingDot extends StatefulWidget {
+  final Color color;
+  final bool isAnimating;
+
+  const _PulsingDot({
+    required this.color,
+    required this.isAnimating,
+  });
+
+  @override
+  State<_PulsingDot> createState() => _PulsingDotState();
+}
+
+class _PulsingDotState extends State<_PulsingDot>
+    with SingleTickerProviderStateMixin {
+  late AnimationController _controller;
+  late Animation<double> _animation;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = AnimationController(
+      duration: const Duration(milliseconds: 1000),
+      vsync: this,
+    );
+    _animation = Tween<double>(begin: 0.5, end: 1.0).animate(
+      CurvedAnimation(parent: _controller, curve: Curves.easeInOut),
+    );
+
+    if (widget.isAnimating) {
+      _controller.repeat(reverse: true);
+    }
+  }
+
+  @override
+  void didUpdateWidget(_PulsingDot oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (widget.isAnimating && !_controller.isAnimating) {
+      _controller.repeat(reverse: true);
+    } else if (!widget.isAnimating && _controller.isAnimating) {
+      _controller.stop();
+      _controller.value = 1.0;
+    }
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AnimatedBuilder(
+      animation: _animation,
+      builder: (context, child) {
+        return Container(
+          width: 8,
+          height: 8,
+          decoration: BoxDecoration(
+            color: widget.color.withOpacity(
+              widget.isAnimating ? _animation.value : 1.0,
+            ),
+            shape: BoxShape.circle,
+            boxShadow: widget.isAnimating
+                ? [
+                    BoxShadow(
+                      color: widget.color.withOpacity(0.4 * _animation.value),
+                      blurRadius: 4,
+                      spreadRadius: 1,
+                    ),
+                  ]
+                : null,
+          ),
+        );
+      },
+    );
+  }
+}
diff --git a/lib/features/tasks/presentation/widgets/transaction_completion_dialog.dart b/lib/features/tasks/presentation/widgets/transaction_completion_dialog.dart
index fad9cd7..f4319ff 100644
--- a/lib/features/tasks/presentation/widgets/transaction_completion_dialog.dart
+++ b/lib/features/tasks/presentation/widgets/transaction_completion_dialog.dart
@@ -121,7 +121,7 @@ class _TransactionCompletionDialogState
                 prefixText: '₱ ',
                 suffixIcon: Icon(
                   Icons.info_outline,
-                  color: Colors.grey[600],
+                  color: Theme.of(context).colorScheme.onSurfaceVariant,
                 ),
               ),
               controller: TextEditingController(
diff --git a/lib/features/tasks/tasks.dart b/lib/features/tasks/tasks.dart
index 51098a7..edc8fad 100644
--- a/lib/features/tasks/tasks.dart
+++ b/lib/features/tasks/tasks.dart
@@ -12,7 +12,7 @@ export 'modules/projects/domain/repositories/project_repository.dart';
 // Data
 export 'modules/tasks/data/models/task_model.dart';
 export 'modules/tasks/data/datasources/task_datasource.dart';
-export 'modules/tasks/data/datasources/mongodb/task_datasource_supabase.dart';
+export 'modules/tasks/data/datasources/supabase/task_datasource_supabase.dart';
 export 'modules/tasks/data/repositories/task_repository_impl.dart';
 export 'modules/projects/data/datasources/supabase/project_datasource_supabase.dart';
 export 'modules/projects/data/datasources/project_datasource.dart';
diff --git a/lib/features/tasks/tasks_di.dart b/lib/features/tasks/tasks_di.dart
index 792afb7..c52cfe6 100644
--- a/lib/features/tasks/tasks_di.dart
+++ b/lib/features/tasks/tasks_di.dart
@@ -4,11 +4,17 @@
 library;
 
 import 'package:keep_track/features/profile/presentation/state/task_activity_controller.dart';
+import 'package:keep_track/features/tasks/data/sevices/bucket_initialization_service.dart';
+import 'package:keep_track/features/tasks/modules/buckets/data/datasources/bucket_datasource.dart';
+import 'package:keep_track/features/tasks/modules/buckets/data/datasources/supabase/bucket_datasource_supabase.dart';
+import 'package:keep_track/features/tasks/modules/buckets/data/repositories/bucket_repository_impl.dart';
+import 'package:keep_track/features/tasks/modules/buckets/domain/repositories/bucket_repository.dart';
+import 'package:keep_track/features/tasks/presentation/state/bucket_controller.dart';
 import 'package:keep_track/features/tasks/presentation/state/task_controller.dart';
 import 'package:keep_track/shared/infrastructure/supabase/supabase_service.dart';
 
 import '../../core/di/service_locator.dart';
-import 'modules/tasks/data/datasources/mongodb/task_datasource_supabase.dart';
+import 'modules/tasks/data/datasources/supabase/task_datasource_supabase.dart';
 import 'modules/tasks/data/datasources/task_datasource.dart';
 import 'modules/tasks/data/repositories/task_repository_impl.dart';
 import 'modules/tasks/domain/repositories/task_repository.dart';
@@ -74,10 +80,29 @@ void setupTasksDependencies() {
     return PomodoroSessionRepositoryImpl(dataSource);
   });
 
-  // Pomodoro controllers
-  locator.registerFactory<PomodoroSessionController>(() {
+  // Pomodoro controllers - use singleton so nav indicator and timer share state
+  locator.registerLazySingleton<PomodoroSessionController>(() {
     final repo = locator.get<PomodoroSessionRepository>();
     final supabaseService = locator.get<SupabaseService>();
     return PomodoroSessionController(repo, supabaseService.userId!);
   });
+
+  locator.registerFactory<BucketDataSource>(() {
+    final supabaseService = locator.get<SupabaseService>();
+    return BucketDataSourceSupabase(supabaseService);
+  });
+
+  locator.registerFactory<BucketRepository>(() {
+    final dataSource = locator.get<BucketDataSource>();
+    return BucketRepositoryImpl(dataSource);
+  });
+
+  locator.registerFactory<BucketInitializationService>(() {
+    final bucketRepository = locator.get<BucketRepository>();
+    return BucketInitializationService(bucketRepository);
+  });
+  locator.registerFactory<BucketController>(() {
+    final bucketRepository = locator.get<BucketRepository>();
+    return BucketController(bucketRepository);
+  });
 }
diff --git a/lib/main.dart b/lib/main.dart
index e2f926b..3806b8a 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -20,6 +20,7 @@ import 'core/state/stream_state.dart';
 import 'features/auth/auth.dart';
 import 'features/tasks/tasks_di.dart';
 import 'features/finance/finance_di.dart';
+import 'features/notifications/notifications_di.dart';
 
 void main() async {
   // Ensure Flutter is initialized
@@ -128,6 +129,9 @@ Future<void> _initializeAppWithRetry({
       // Setup app dependencies
       _setupDependencies(sharedPreferences);
 
+      // Initialize notifications (mobile only - safe to call on any platform)
+      await initializeNotifications();
+
       // Run the app - SUCCESS!
       runApp(const PersonalCodexApp());
       return; // Exit the retry loop
@@ -414,6 +418,7 @@ void _setupDependencies(SharedPreferences sharedPreferences) {
   setupAuthDependencies(); // Auth must be first
   setupTasksDependencies();
   setupFinanceDependencies();
+  setupNotificationDependencies(); // Mobile only - safe to call on any platform
 }
 
 /// Main app widget
diff --git a/pubspec.yaml b/pubspec.yaml
index 2176888..6155bc0 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.7.3-alpha.4+38
+version: 0.7.4+40
 
 environment:
   sdk: ^3.9.2
@@ -42,6 +42,14 @@ dependencies:
   flutter_colorpicker: ^1.1.0
   shared_preferences: ^2.3.3
   app_links: ^6.3.2
+  url_launcher: ^6.3.1
+  http: ^1.2.0
+  package_info_plus: ^8.0.0
+
+  # Notifications (mobile only)
+  flutter_local_notifications: ^18.0.1
+  timezone: ^0.9.4
+  permission_handler: ^11.3.1
 
 dev_dependencies:
   flutter_test:
@@ -70,7 +78,6 @@ flutter:
 
   # To add assets to your application, add an assets section, like this:
   assets:
-    - .env
     - assets/icon/app_icon.png
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/to/resolution-aware-images