splash screen update

README.md

@@ -1,83 +1,159 @@
-# MyApp
+# IngTrak
 
-Generic Flutter Android starter built with Flutter **3.47** (Dart **3.13**), Material 3, null safety, and [Provider](https://pub.dev/packages/provider) for state management.
+Personal finance app for **Enable Banking** (ING and other supported banks): transactions, labels, charts, budgets, look-ahead projections, and **PocketBase** cloud sync.
 
-Package name: `com.ingtrak.app`
+- **Package:** `com.ingtrak.app`
+- **Platform:** Android (Flutter)
+- **Flutter:** 3.47+ · **Dart:** 3.13+
 
 ## Features
 
-- Splash screen that fades into the main shell
-- Bottom navigation: Home, Search, Profile, Settings
-- `ListView.builder` catalog with rounded, shadowed cards
-- Detail screen with a matching `Hero` animation
-- Light / dark / system theme, persisted with `shared_preferences`
-- Add-item form with validation
-- Mock catalog plus an `http` client aimed at JSONPlaceholder (toggle in Settings)
+- **Bank connect** — Enable Banking via backend API + in-app WebView; optional deep link `ingtrak://connected`
+- **Home** — Balance, customizable layout: built-in sections (Transactions / Categorized / Recent) and filter widgets (stats or budget, half/full width, bar/pie/ring)
+- **Transactions** — Search, filters, month heatmap, labels, notes, merchant / “apply to similar” rules
+- **Overview** — Income/expense and label charts; save **favourite** chart filters
+- **Look ahead** — Projected balance from recurring templates
+- **Sync** — Bidirectional PocketBase sync (transactions, labels, annotations, favourites, home widgets, app prefs)
+- **Theme** — Light / dark / system (local)
+- **CSV** — Import ING CSV exports (Settings)
 
-## Folder structure
+## Prerequisites
+
+- [Flutter SDK](https://docs.flutter.dev/get-started/install) **3.47** or newer (Dart **3.13**)
+- Android Studio / SDK (Java **17**), emulator or device
+- Reachable **bank API** (`API_BASE_URL`) and **PocketBase** (`POCKETBASE_URL`)
+- PocketBase auth collection **`usersapp`** (create this before running migrations)
+
+```bash
+flutter doctor
+flutter doctor --android-licenses   # if prompted
+```
+
+## Quick start
+
+```bash
+cd ingtrakapp
+cp .env.example .env          # edit URLs if needed
+flutter pub get
+flutter devices
+flutter run                   # or: flutter run -d android
+```
+
+First Android build downloads Gradle and may take a few minutes.
+
+### Useful commands
+
+```bash
+flutter analyze
+flutter test
+flutter run --release
+flutter build apk
+```
+
+### Override config without editing `.env`
+
+```bash
+flutter run \
+  --dart-define=API_BASE_URL=https://your-api.example \
+  --dart-define=POCKETBASE_URL=https://your-pb.example \
+  --dart-define=POCKETBASE_USERS_COLLECTION=usersapp
+```
+
+`--dart-define` values win over `.env`.
+
+## Configuration
+
+Copy [`.env.example`](.env.example) to `.env` (both are listed as Flutter assets). No secrets belong in these files.
+
+| Variable | Purpose | Example |
+|----------|---------|---------|
+| `API_BASE_URL` | FastAPI bank / Enable Banking proxy | `https://ingtrak.satoshinakamoto.win` |
+| `POCKETBASE_URL` | PocketBase instance | `https://pb.satoshinakamoto.win` |
+| `POCKETBASE_USERS_COLLECTION` | Auth collection name | `usersapp` |
+
+Loaded in `lib/utils/app_config.dart` at startup (`flutter_dotenv`). Fallbacks: hosted API URL, PocketBase `http://127.0.0.1:8090`.
+
+### Bank redirect URIs
+
+1. **HTTP callback (Enable Banking Control Panel / backend `REDIRECT_URI`):**  
+   `{API_BASE_URL}/api/connect/callback`
+2. **Optional app deep link** (after HTML bounce; not registered with Enable Banking):  
+   `ingtrak://connected?code=…`  
+   Declared in `AndroidManifest.xml` and handled via `app_links`.
+
+## PocketBase setup
+
+Migrations live in [`pocketbase/pb_migrations/`](pocketbase/pb_migrations/). They assume collection **`usersapp`** already exists.
+
+### Collections
+
+| Migration | Collection |
+|-----------|------------|
+| `1740000000` | `labels`, `tx_meta`, `merchant_rules`, `exact_templates` |
+| `1740000001` | `transactions` |
+| `1740000002` | `recurring_templates` |
+| `1740000003` | `overview_favourites` |
+| `1740000004`–`0006` | `home_filter_widgets` (+ half width, budget fields) |
+| `1740000007` | `app_prefs` (Home section toggles + Look ahead years) |
+
+Built-in labels stay in the app; only **custom** labels sync. Rows are scoped per user (`user = @request.auth.id`).
+
+### Apply migrations (typical Linux host)
+
+```bash
+sudo cp pocketbase/pb_migrations/*.js /opt/pocketbase/pb_migrations/
+sudo chown pocketbase:pocketbase /opt/pocketbase/pb_migrations/*.js
+sudo -u pocketbase /opt/pocketbase/pocketbase migrate up
+sudo systemctl restart pocketbase
+```
+
+Adjust paths if your PocketBase install differs. After migrate, sign in on the app and run **Sync** (Account) so local data uploads.
+
+### What syncs
+
+- Bank transactions, labels, tx annotations, merchant/exact templates  
+- Recurring templates, overview favourites, home filter widgets  
+- App prefs: Home built-in section visibility, Look ahead max years  
+
+Theme mode stays **device-local**.
+
+## Project layout
 
 ```
-android-flutter-app-generic/
-├── android/                         # Android embedding, Gradle, manifest
+ingtrakapp/
+├── android/                      # Android embedding (com.ingtrak.app)
+├── assets/branding/              # App icon source + generated launcher assets
 ├── lib/
-│   ├── main.dart                    # Entry point, Provider scope, MaterialApp
-│   ├── models/
-│   │   └── item.dart                # Item + ItemCategory
-│   ├── providers/
-│   │   ├── item_provider.dart       # Catalog ChangeNotifier
-│   │   └── theme_provider.dart      # ThemeMode ChangeNotifier
-│   ├── screens/
-│   │   ├── splash_screen.dart
-│   │   ├── main_shell.dart          # NavigationBar host
-│   │   ├── home_screen.dart
-│   │   ├── search_screen.dart
-│   │   ├── profile_screen.dart
-│   │   ├── settings_screen.dart
-│   │   ├── item_detail_screen.dart
-│   │   └── add_item_screen.dart
-│   ├── services/
-│   │   ├── storage_service.dart     # shared_preferences wrapper
-│   │   ├── item_api.dart            # http placeholder
-│   │   ├── fake_item_data.dart      # Offline sample catalog
-│   │   └── item_repository.dart     # Mock vs remote switch
-│   ├── utils/
-│   │   ├── app_theme.dart           # Material 3 light/dark themes
-│   │   ├── constants.dart
-│   │   └── helpers.dart
-│   └── widgets/
-│       ├── app_text_field.dart
-│       ├── empty_state.dart
-│       ├── item_card.dart
-│       ├── item_hero_badge.dart
-│       ├── loading_view.dart
-│       └── responsive_body.dart
+│   ├── main.dart                 # Providers, dotenv, deep links
+│   ├── models/                   # Bank, meta, favourites, home widgets, prefs
+│   ├── providers/                # Auth, bank, sync, tx_meta, preferences, theme
+│   ├── screens/                  # Splash, auth, Home / Overview / Look ahead, …
+│   ├── services/                 # Bank API, PocketBase sync, CSV, storage
+│   ├── utils/                    # Config, theme, constants, connect helpers
+│   └── widgets/                  # Home widgets, filters, charts, sync UI
+├── pocketbase/pb_migrations/     # Schema migrations
 ├── test/
-│   └── widget_test.dart
+├── .env.example
 └── pubspec.yaml
 ```
 
-## Run the app
+## Launcher icon
 
-You need the [Flutter SDK](https://docs.flutter.dev/get-started/install) (3.47 or newer) and an Android emulator or device.
+Source: `assets/branding/app_icon.png`. Regenerate Android mipmaps:
 
 ```bash
-cd android-flutter-app-generic
-flutter pub get
-flutter run
+dart run flutter_launcher_icons
 ```
 
-Useful extras:
+(Configured in `pubspec.yaml`; iOS not enabled — no `ios/` folder yet.)
 
-```bash
-flutter devices          # list emulators / devices
-flutter run -d android   # target Android explicitly
-flutter analyze          # static analysis
-flutter test             # widget + unit tests
-```
+## First-run checklist
 
-On first Android run, Flutter will download a Gradle distribution and compile the app. Accept any Android licenses with `flutter doctor --android-licenses` if prompted.
+1. `.env` points at your API + PocketBase  
+2. PocketBase migrations applied; `usersapp` exists; create an account (or use Admin → Users)  
+3. Backend Enable Banking `REDIRECT_URI` matches `{API_BASE_URL}/api/connect/callback`  
+4. `flutter run` → sign in → **Settings** → connect bank (or import CSV) → **Account** → Sync  
 
-## Theme and data
+## License / privacy
 
-- Open **Settings** to switch System / Light / Dark. The choice is stored locally.
-- Turn on **Use remote sample API** to fetch posts from `https://jsonplaceholder.typicode.com/posts` through the `http` package. If the request fails, the app falls back to the bundled mock list.
+Private project. Bank credentials and tokens are handled by your backend and Enable Banking — keep API and PocketBase access controlled.

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@color/ic_launcher_background"/>
+  <foreground>
+      <inset
+          android:drawable="@drawable/ic_launcher_foreground"
+          android:inset="16%" />
+  </foreground>
+</adaptive-icon>

android/app/src/main/res/values/colors.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#1A1C1B</color>
+</resources>

lib/models/app_cloud_prefs.dart

@@ -0,0 +1,41 @@
+/// Cloud-synced app preferences (Home sections + Look ahead).
+library;
+
+import 'home_built_in_sections.dart';
+
+/// One-per-user prefs row mirrored in PocketBase `app_prefs`.
+class AppCloudPrefs {
+  const AppCloudPrefs({
+    required this.homeBuiltInSections,
+    required this.lookAheadMaxYears,
+  });
+
+  final HomeBuiltInSections homeBuiltInSections;
+  final int lookAheadMaxYears;
+
+  static const defaults = AppCloudPrefs(
+    homeBuiltInSections: HomeBuiltInSections.defaults,
+    lookAheadMaxYears: 5,
+  );
+
+  AppCloudPrefs copyWith({
+    HomeBuiltInSections? homeBuiltInSections,
+    int? lookAheadMaxYears,
+  }) {
+    return AppCloudPrefs(
+      homeBuiltInSections:
+          homeBuiltInSections ?? this.homeBuiltInSections,
+      lookAheadMaxYears: lookAheadMaxYears ?? this.lookAheadMaxYears,
+    );
+  }
+}
+
+/// Prefer local when the user has pending edits; otherwise take remote.
+AppCloudPrefs mergeAppCloudPrefs({
+  required AppCloudPrefs local,
+  required AppCloudPrefs? remote,
+  required bool preferLocal,
+}) {
+  if (preferLocal || remote == null) return local;
+  return remote;
+}

lib/models/home_built_in_sections.dart

@@ -0,0 +1,43 @@
+/// Visibility flags for built-in Home screen sections.
+library;
+
+class HomeBuiltInSections {
+  const HomeBuiltInSections({
+    this.showTransactions = true,
+    this.showCategorized = true,
+    this.showRecent = true,
+  });
+
+  static const defaults = HomeBuiltInSections();
+
+  final bool showTransactions;
+  final bool showCategorized;
+  final bool showRecent;
+
+  HomeBuiltInSections copyWith({
+    bool? showTransactions,
+    bool? showCategorized,
+    bool? showRecent,
+  }) {
+    return HomeBuiltInSections(
+      showTransactions: showTransactions ?? this.showTransactions,
+      showCategorized: showCategorized ?? this.showCategorized,
+      showRecent: showRecent ?? this.showRecent,
+    );
+  }
+
+  Map<String, dynamic> toJson() => {
+        'showTransactions': showTransactions,
+        'showCategorized': showCategorized,
+        'showRecent': showRecent,
+      };
+
+  factory HomeBuiltInSections.fromJson(Map<String, dynamic>? json) {
+    if (json == null) return defaults;
+    return HomeBuiltInSections(
+      showTransactions: json['showTransactions'] as bool? ?? true,
+      showCategorized: json['showCategorized'] as bool? ?? true,
+      showRecent: json['showRecent'] as bool? ?? true,
+    );
+  }
+}

lib/models/home_filter_widget.dart

@@ -1,16 +1,90 @@
 /// Named transaction-filter widgets pinned on the Home screen.
 library;
 
+import 'package:flutter/material.dart';
+
 import '../widgets/label_filter_dialog.dart';
 import 'transaction_meta.dart';
 
-/// A saved [TransactionFilterSelection] plus which metrics to show on Home.
+/// What a Home filter widget shows.
+enum HomeWidgetType {
+  /// In / Out / count metrics.
+  stats,
+
+  /// Progress of this month’s net toward a budget cap.
+  budget,
+}
+
+/// How the budget ceiling is chosen.
+enum HomeBudgetCapMode {
+  /// User-entered amount (positive).
+  fixed,
+
+  /// Absolute average of monthly nets over the last N months.
+  averageMonths,
+}
+
+/// Budget progress visualization.
+enum HomeWidgetChartStyle {
+  bar,
+  pie,
+  ring,
+}
+
+/// Preset icons users can assign to a Home widget.
+abstract final class HomeWidgetIcons {
+  static const List<(String id, IconData icon, String label)> all = [
+    ('dashboard', Icons.dashboard_outlined, 'Dashboard'),
+    ('savings', Icons.savings_outlined, 'Savings'),
+    ('wallet', Icons.account_balance_wallet_outlined, 'Wallet'),
+    ('cart', Icons.shopping_cart_outlined, 'Shopping'),
+    ('bag', Icons.shopping_bag_outlined, 'Bag'),
+    ('food', Icons.restaurant_outlined, 'Food'),
+    ('bolt', Icons.bolt_outlined, 'Utilities'),
+    ('home', Icons.home_work_outlined, 'Home'),
+    ('car', Icons.directions_car_outlined, 'Transport'),
+    ('bus', Icons.directions_bus_outlined, 'Transit'),
+    ('health', Icons.local_hospital_outlined, 'Health'),
+    ('sport', Icons.fitness_center_outlined, 'Sport'),
+    ('travel', Icons.flight_outlined, 'Travel'),
+    ('gift', Icons.card_giftcard_outlined, 'Gifts'),
+    ('pets', Icons.pets_outlined, 'Pets'),
+    ('work', Icons.work_outline, 'Work'),
+    ('pay', Icons.payments_outlined, 'Pay'),
+    ('swap', Icons.swap_horiz, 'Transfers'),
+    ('chart', Icons.pie_chart_outline, 'Chart'),
+    ('flag', Icons.flag_outlined, 'Goal'),
+  ];
+
+  static IconData iconFor(String? id) {
+    for (final entry in all) {
+      if (entry.$1 == id) return entry.$2;
+    }
+    return Icons.dashboard_outlined;
+  }
+
+  static String labelFor(String? id) {
+    for (final entry in all) {
+      if (entry.$1 == id) return entry.$3;
+    }
+    return 'Dashboard';
+  }
+}
+
+/// A saved [TransactionFilterSelection] plus Home display options.
 class HomeFilterWidget {
   const HomeFilterWidget({
     required this.id,
     required this.name,
     this.display = true,
     this.sortOrder = 0,
+    this.halfWidth = false,
+    this.type = HomeWidgetType.stats,
+    this.iconId = 'dashboard',
+    this.chartStyle = HomeWidgetChartStyle.bar,
+    this.budgetCapMode = HomeBudgetCapMode.fixed,
+    this.budgetFixedAmount = 0,
+    this.budgetAverageMonths = 3,
     this.labelIds = const [],
     this.flow = TxFlowFilter.all,
     this.amountRange = const TxAmountRange(),
@@ -26,6 +100,20 @@ class HomeFilterWidget {
   final bool display;
   final int sortOrder;
 
+  /// When true, the Home card uses half the row width.
+  final bool halfWidth;
+
+  final HomeWidgetType type;
+  final String iconId;
+  final HomeWidgetChartStyle chartStyle;
+  final HomeBudgetCapMode budgetCapMode;
+
+  /// Positive ceiling when [budgetCapMode] is [HomeBudgetCapMode.fixed].
+  final double budgetFixedAmount;
+
+  /// Months of history when [budgetCapMode] is [HomeBudgetCapMode.averageMonths].
+  final int budgetAverageMonths;
+
   final List<String> labelIds;
   final TxFlowFilter flow;
   final TxAmountRange amountRange;
@@ -36,6 +124,8 @@ class HomeFilterWidget {
   final bool showAmountOut;
   final bool showCount;
 
+  IconData get icon => HomeWidgetIcons.iconFor(iconId);
+
   TransactionFilterSelection get filter => TransactionFilterSelection(
         labelIds: labelIds.toSet(),
         flow: flow,
@@ -49,6 +139,13 @@ class HomeFilterWidget {
     String? name,
     bool? display,
     int? sortOrder,
+    bool? halfWidth,
+    HomeWidgetType? type,
+    String? iconId,
+    HomeWidgetChartStyle? chartStyle,
+    HomeBudgetCapMode? budgetCapMode,
+    double? budgetFixedAmount,
+    int? budgetAverageMonths,
     List<String>? labelIds,
     TxFlowFilter? flow,
     TxAmountRange? amountRange,
@@ -63,6 +160,13 @@ class HomeFilterWidget {
       name: name ?? this.name,
       display: display ?? this.display,
       sortOrder: sortOrder ?? this.sortOrder,
+      halfWidth: halfWidth ?? this.halfWidth,
+      type: type ?? this.type,
+      iconId: iconId ?? this.iconId,
+      chartStyle: chartStyle ?? this.chartStyle,
+      budgetCapMode: budgetCapMode ?? this.budgetCapMode,
+      budgetFixedAmount: budgetFixedAmount ?? this.budgetFixedAmount,
+      budgetAverageMonths: budgetAverageMonths ?? this.budgetAverageMonths,
       labelIds: labelIds ?? this.labelIds,
       flow: flow ?? this.flow,
       amountRange: amountRange ?? this.amountRange,
@@ -103,6 +207,13 @@ class HomeFilterWidget {
         'name': name,
         'display': display,
         'sortOrder': sortOrder,
+        'halfWidth': halfWidth,
+        'type': type.name,
+        'iconId': iconId,
+        'chartStyle': chartStyle.name,
+        'budgetCapMode': budgetCapMode.name,
+        'budgetFixedAmount': budgetFixedAmount,
+        'budgetAverageMonths': budgetAverageMonths,
         'labelIds': labelIds,
         'flow': flow.name,
         'amountRange': {
@@ -127,6 +238,12 @@ class HomeFilterWidget {
       return null;
     }
 
+    int asInt(dynamic value, int fallback) {
+      if (value is int) return value;
+      if (value is num) return value.round();
+      return fallback;
+    }
+
     return HomeFilterWidget(
       id: json['id'] as String? ??
           'hw_${DateTime.now().millisecondsSinceEpoch}',
@@ -134,7 +251,25 @@ class HomeFilterWidget {
           ? (json['name'] as String).trim()
           : 'Filter',
       display: json['display'] as bool? ?? true,
-      sortOrder: json['sortOrder'] as int? ?? 0,
+      sortOrder: asInt(json['sortOrder'], 0),
+      halfWidth: json['halfWidth'] as bool? ?? false,
+      type: HomeWidgetType.values.firstWhere(
+        (e) => e.name == json['type'],
+        orElse: () => HomeWidgetType.stats,
+      ),
+      iconId: (json['iconId'] as String?)?.trim().isNotEmpty == true
+          ? (json['iconId'] as String).trim()
+          : 'dashboard',
+      chartStyle: HomeWidgetChartStyle.values.firstWhere(
+        (e) => e.name == json['chartStyle'],
+        orElse: () => HomeWidgetChartStyle.bar,
+      ),
+      budgetCapMode: HomeBudgetCapMode.values.firstWhere(
+        (e) => e.name == json['budgetCapMode'],
+        orElse: () => HomeBudgetCapMode.fixed,
+      ),
+      budgetFixedAmount: asDouble(json['budgetFixedAmount']) ?? 0,
+      budgetAverageMonths: asInt(json['budgetAverageMonths'], 3).clamp(1, 36),
       labelIds: [
         for (final id in (json['labelIds'] as List? ?? const []))
           if (id is String && id.isNotEmpty) id,

lib/providers/preferences_provider.dart

@@ -3,6 +3,8 @@ library;
 
 import 'package:flutter/foundation.dart';
 
+import '../models/app_cloud_prefs.dart';
+import '../models/home_built_in_sections.dart';
 import '../models/home_filter_widget.dart';
 import '../models/overview_favourite.dart';
 import '../services/storage_service.dart';
@@ -12,12 +14,14 @@ class PreferencesController extends ChangeNotifier {
     _lookAheadMaxYears = _storage.lookAheadMaxYears;
     _overviewFavourites = _storage.loadOverviewFavourites();
     _homeFilterWidgets = _storage.loadHomeFilterWidgets();
+    _homeBuiltInSections = _storage.loadHomeBuiltInSections();
   }
 
   final StorageService _storage;
   late int _lookAheadMaxYears;
   late List<OverviewFavourite> _overviewFavourites;
   late List<HomeFilterWidget> _homeFilterWidgets;
+  late HomeBuiltInSections _homeBuiltInSections;
 
   /// Fired after favourites are persisted (for cloud push debounce).
   VoidCallback? onFavouritesPersisted;
@@ -25,9 +29,18 @@ class PreferencesController extends ChangeNotifier {
   /// Fired after Home widgets are persisted (for cloud push debounce).
   VoidCallback? onHomeWidgetsPersisted;
 
+  /// Fired after Home sections / Look ahead are persisted.
+  VoidCallback? onAppPrefsPersisted;
+
   /// Years ahead Look ahead can navigate (1–30, default 5).
   int get lookAheadMaxYears => _lookAheadMaxYears;
 
+  /// Snapshot used for PocketBase `app_prefs` sync.
+  AppCloudPrefs get cloudPrefs => AppCloudPrefs(
+        homeBuiltInSections: _homeBuiltInSections,
+        lookAheadMaxYears: _lookAheadMaxYears,
+      );
+
   List<OverviewFavourite> get overviewFavourites =>
       List.unmodifiable(_overviewFavourites);
 
@@ -50,12 +63,58 @@ class PreferencesController extends ChangeNotifier {
   bool get hasDisplayedHomeFilterWidgets =>
       _homeFilterWidgets.any((w) => w.display);
 
-  Future<void> setLookAheadMaxYears(int years) async {
+  HomeBuiltInSections get homeBuiltInSections => _homeBuiltInSections;
+
+  Future<void> setHomeBuiltInSections(
+    HomeBuiltInSections sections, {
+    bool schedulePush = true,
+  }) async {
+    if (sections.showTransactions == _homeBuiltInSections.showTransactions &&
+        sections.showCategorized == _homeBuiltInSections.showCategorized &&
+        sections.showRecent == _homeBuiltInSections.showRecent) {
+      return;
+    }
+    _homeBuiltInSections = sections;
+    notifyListeners();
+    await _storage.saveHomeBuiltInSections(sections);
+    if (schedulePush) onAppPrefsPersisted?.call();
+  }
+
+  Future<void> setHomeShowTransactions(bool value) => setHomeBuiltInSections(
+        _homeBuiltInSections.copyWith(showTransactions: value),
+      );
+
+  Future<void> setHomeShowCategorized(bool value) => setHomeBuiltInSections(
+        _homeBuiltInSections.copyWith(showCategorized: value),
+      );
+
+  Future<void> setHomeShowRecent(bool value) => setHomeBuiltInSections(
+        _homeBuiltInSections.copyWith(showRecent: value),
+      );
+
+  Future<void> setLookAheadMaxYears(
+    int years, {
+    bool schedulePush = true,
+  }) async {
     final next = years.clamp(1, 30);
     if (next == _lookAheadMaxYears) return;
     _lookAheadMaxYears = next;
     notifyListeners();
     await _storage.setLookAheadMaxYears(next);
+    if (schedulePush) onAppPrefsPersisted?.call();
+  }
+
+  Future<void> replaceCloudPrefs(
+    AppCloudPrefs prefs, {
+    bool notify = true,
+    bool schedulePush = false,
+  }) async {
+    _homeBuiltInSections = prefs.homeBuiltInSections;
+    _lookAheadMaxYears = prefs.lookAheadMaxYears.clamp(1, 30);
+    if (notify) notifyListeners();
+    await _storage.saveHomeBuiltInSections(_homeBuiltInSections);
+    await _storage.setLookAheadMaxYears(_lookAheadMaxYears);
+    if (schedulePush) onAppPrefsPersisted?.call();
   }
 
   Future<void> addOverviewFavourite(OverviewFavourite favourite) async {
@@ -149,6 +208,19 @@ class PreferencesController extends ChangeNotifier {
     await updateHomeFilterWidget(current.copyWith(display: display));
   }
 
+  Future<void> reorderHomeFilterWidgets(int oldIndex, int newIndex) async {
+    if (oldIndex == newIndex) return;
+    final next = [..._homeFilterWidgets];
+    final item = next.removeAt(oldIndex);
+    final target = newIndex.clamp(0, next.length);
+    next.insert(target, item);
+    _homeFilterWidgets = [
+      for (var i = 0; i < next.length; i++) next[i].copyWith(sortOrder: i),
+    ];
+    notifyListeners();
+    await _persistHomeWidgets();
+  }
+
   Future<void> replaceHomeFilterWidgets(
     List<HomeFilterWidget> widgets, {
     bool notify = true,

lib/providers/sync_provider.dart

@@ -5,6 +5,7 @@ import 'dart:async';
 
 import 'package:flutter/foundation.dart';
 
+import '../models/app_cloud_prefs.dart';
 import '../models/home_filter_widget.dart';
 import '../models/overview_favourite.dart';
 import '../services/pb_sync_service.dart';
@@ -39,9 +40,10 @@ class SyncController extends ChangeNotifier {
         _bank = bank,
         _prefs = prefs {
     _wasLoggedIn = auth.isLoggedIn;
-    _meta.onPersisted = _schedulePush;
-    _prefs.onFavouritesPersisted = _schedulePush;
-    _prefs.onHomeWidgetsPersisted = _schedulePush;
+    _meta.onPersisted = _scheduleMetaPush;
+    _prefs.onFavouritesPersisted = _scheduleFavouritesPush;
+    _prefs.onHomeWidgetsPersisted = _scheduleHomeWidgetsPush;
+    _prefs.onAppPrefsPersisted = _scheduleAppPrefsPush;
     _auth.addListener(_onAuthChanged);
     _bank.onAfterSuccessfulLoad = _onBankDataLoaded;
     if (_auth.isLoggedIn) {
@@ -58,6 +60,10 @@ class SyncController extends ChangeNotifier {
   bool _syncing = false;
   bool _pushQueued = false;
   bool _queuedFullSync = false;
+  bool _pushMetaPending = false;
+  bool _pushFavouritesPending = false;
+  bool _pushHomeWidgetsPending = false;
+  bool _pushAppPrefsPending = false;
   Timer? _pushDebounce;
   Timer? _progressHold;
   Timer? _uiNotifyThrottle;
@@ -187,6 +193,11 @@ class SyncController extends ChangeNotifier {
       _progressHold?.cancel();
       _uiNotifyThrottle?.cancel();
       _uiNotifyQueued = false;
+      _pushQueued = false;
+      _pushMetaPending = false;
+      _pushFavouritesPending = false;
+      _pushHomeWidgetsPending = false;
+      _pushAppPrefsPending = false;
       _lastError = null;
       _statusDetail = '';
       _showProgressRing = false;
@@ -199,10 +210,20 @@ class SyncController extends ChangeNotifier {
 
   /// Bank pull-to-refresh / reconnect finished — reconcile with PocketBase.
   ///
-  /// Always runs a full sync when logged in so (1) new API txs are pushed and
+  /// Runs a full sync when idle so (1) new API txs are pushed and
   /// (2) any cloud-only history the bank window lacks is pulled back.
+  ///
+  /// If a sync is already in flight (common at cold start: constructor sync
+  /// overlaps bank refresh), do **not** queue another full sync — that was
+  /// causing a back-to-back double pull of 4k+ txs.
   void _onBankDataLoaded() {
     if (!_auth.isLoggedIn) return;
+    if (_syncing) {
+      debugPrint(
+        'SyncController: bank load finished during sync — skip queued full sync',
+      );
+      return;
+    }
     unawaited(syncNow());
   }
 
@@ -224,8 +245,32 @@ class SyncController extends ChangeNotifier {
     }
   }
 
-  void _schedulePush() {
+  void _scheduleMetaPush() {
+    _pushMetaPending = true;
+    _armPushDebounce();
+  }
+
+  void _scheduleFavouritesPush() {
+    _pushFavouritesPending = true;
+    _armPushDebounce();
+  }
+
+  void _scheduleHomeWidgetsPush() {
+    _pushHomeWidgetsPending = true;
+    _armPushDebounce();
+  }
+
+  void _scheduleAppPrefsPush() {
+    _pushAppPrefsPending = true;
+    _armPushDebounce();
+  }
+
+  void _armPushDebounce() {
     if (!_auth.isLoggedIn) return;
+    if (_syncing) {
+      _pushQueued = true;
+      return;
+    }
     _pushDebounce?.cancel();
     _pushDebounce = Timer(const Duration(seconds: 2), () {
       unawaited(_pushOnly());
@@ -296,6 +341,20 @@ class SyncController extends ChangeNotifier {
         _prefs.homeFilterWidgets,
         remoteHomeWidgets,
       );
+      AppCloudPrefs? remoteAppPrefs;
+      try {
+        remoteAppPrefs = await service.pullAppPrefs(onStatus: _setStatus);
+      } catch (error) {
+        debugPrint('SyncController: app_prefs pull skipped ($error)');
+      }
+      // Prefer local when this device has pending prefs edits; otherwise
+      // take remote so a new install picks up cloud Home section toggles.
+      final preferLocalAppPrefs = _pushAppPrefsPending;
+      final mergedAppPrefs = mergeAppCloudPrefs(
+        local: _prefs.cloudPrefs,
+        remote: remoteAppPrefs,
+        preferLocal: preferLocalAppPrefs,
+      );
       // Apply without notifying — one rebuild after both stores are ready.
       await _meta.replaceStore(mergedMeta, notify: false);
       await _bank.applySyncedTransactions(remoteTxs, notify: false);
@@ -307,6 +366,7 @@ class SyncController extends ChangeNotifier {
         mergedHomeWidgets,
         notify: false,
       );
+      await _prefs.replaceCloudPrefs(mergedAppPrefs, notify: false);
       _meta.notifyListeners();
       _bank.notifyListeners();
       _prefs.notifyListeners();
@@ -339,6 +399,15 @@ class SyncController extends ChangeNotifier {
           'SyncController: home_filter_widgets push skipped ($error)',
         );
       }
+      try {
+        await service.pushAppPrefs(
+          mergedAppPrefs,
+          onStatus: _setStatus,
+        );
+        _pushAppPrefsPending = false;
+      } catch (error) {
+        debugPrint('SyncController: app_prefs push skipped ($error)');
+      }
       final bankSummary = await service.pushTransactions(
         _bank.transactions,
         progressStart: 0.82,
@@ -370,53 +439,128 @@ class SyncController extends ChangeNotifier {
     }
   }
 
-  /// Annotation-only push after local meta edits (avoids re-uploading 4k+ txs).
+  /// Pushes only the stores that changed locally (debounced).
+  ///
+  /// Annotation edits push tx_meta; favourite / Home-widget edits do not
+  /// re-upload the full annotation store or bank transactions.
   Future<void> _pushOnly() async {
-    if (!_auth.isLoggedIn || _syncing) {
-      if (_syncing) _pushQueued = true;
+    if (!_auth.isLoggedIn) return;
+    if (_syncing) {
+      _pushQueued = true;
+      return;
+    }
+
+    final pushMeta = _pushMetaPending;
+    final pushFavourites = _pushFavouritesPending;
+    final pushHomeWidgets = _pushHomeWidgetsPending;
+    final pushAppPrefs = _pushAppPrefsPending;
+    _pushMetaPending = false;
+    _pushFavouritesPending = false;
+    _pushHomeWidgetsPending = false;
+    _pushAppPrefsPending = false;
+    if (!pushMeta && !pushFavourites && !pushHomeWidgets && !pushAppPrefs) {
       return;
     }
 
     _progressHold?.cancel();
     _syncing = true;
     _progressSuccess = false;
-    _statusDetail = 'Pushing…';
+
+    final label = switch ((
+      pushMeta,
+      pushFavourites,
+      pushHomeWidgets,
+      pushAppPrefs,
+    )) {
+      (false, false, false, true) => 'App prefs',
+      (false, false, true, false) => 'Home widgets',
+      (false, false, true, true) => 'Home layout',
+      (false, true, false, false) => 'Favourites',
+      (false, true, true, _) => 'Home layout',
+      (true, false, false, false) => 'Annotations',
+      _ => 'Changes',
+    };
+    _statusDetail = 'Pushing $label…';
     _setProgress(0.05);
-    _announce('Syncing…', isProgress: true);
+    _announce('Saving $label…', isProgress: true);
+
     try {
       final service = PbSyncService(_auth.client);
-      final summary = await service.push(
-        _meta.exportStore(),
-        progressStart: 0.05,
-        progressEnd: 0.9,
-        onProgress: _setProgress,
-        onStatus: _setStatus,
-      );
-      try {
-        await service.pushOverviewFavourites(
-          _prefs.overviewFavourites,
+      final parts = <String>[];
+      var done = 0;
+      final total = (pushMeta ? 1 : 0) +
+          (pushFavourites ? 1 : 0) +
+          (pushHomeWidgets ? 1 : 0) +
+          (pushAppPrefs ? 1 : 0);
+      void bump() {
+        done++;
+        _setProgress(done / total);
+      }
+
+      if (pushMeta) {
+        _setStatus('Pushing annotations…');
+        final summary = await service.push(
+          _meta.exportStore(),
+          progressStart: done / total,
+          progressEnd: (done + 1) / total,
+          onProgress: _setProgress,
           onStatus: _setStatus,
         );
-      } catch (error) {
-        debugPrint(
-          'SyncController: overview_favourites push skipped ($error)',
-        );
+        parts.add(summary);
+        bump();
       }
-      try {
-        await service.pushHomeFilterWidgets(
-          _prefs.homeFilterWidgets,
-          onStatus: _setStatus,
-        );
-      } catch (error) {
-        debugPrint(
-          'SyncController: home_filter_widgets push skipped ($error)',
-        );
+      if (pushFavourites) {
+        _setStatus('Pushing favourites…');
+        try {
+          await service.pushOverviewFavourites(
+            _prefs.overviewFavourites,
+            onStatus: _setStatus,
+          );
+          parts.add('Favourites updated');
+        } catch (error) {
+          debugPrint(
+            'SyncController: overview_favourites push skipped ($error)',
+          );
+        }
+        bump();
       }
+      if (pushHomeWidgets) {
+        _setStatus('Pushing home widgets…');
+        try {
+          await service.pushHomeFilterWidgets(
+            _prefs.homeFilterWidgets,
+            onStatus: _setStatus,
+          );
+          parts.add('Home widgets updated');
+        } catch (error) {
+          debugPrint(
+            'SyncController: home_filter_widgets push skipped ($error)',
+          );
+        }
+        bump();
+      }
+      if (pushAppPrefs) {
+        _setStatus('Pushing app prefs…');
+        try {
+          await service.pushAppPrefs(
+            _prefs.cloudPrefs,
+            onStatus: _setStatus,
+          );
+          parts.add('App prefs updated');
+        } catch (error) {
+          debugPrint('SyncController: app_prefs push skipped ($error)');
+          // Re-queue so a missing collection doesn't drop the edit forever
+          // until the next manual full sync after migrate.
+          _pushAppPrefsPending = true;
+        }
+        bump();
+      }
+
       _setProgress(1.0);
       _lastSyncedAt = DateTime.now();
       _lastError = null;
-      _lastSyncSummary = summary;
-      _announce('Sync complete');
+      _lastSyncSummary = parts.isEmpty ? label : parts.join('\n');
+      _announce('Saved $label');
       _syncing = false;
       _finishProgress(success: true);
     } catch (error, stackTrace) {
@@ -447,6 +591,7 @@ class SyncController extends ChangeNotifier {
     _meta.onPersisted = null;
     _prefs.onFavouritesPersisted = null;
     _prefs.onHomeWidgetsPersisted = null;
+    _prefs.onAppPrefsPersisted = null;
     super.dispose();
   }
 }

lib/screens/home_screen.dart

@@ -4,6 +4,7 @@ library;
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
+import '../models/home_filter_widget.dart';
 import '../providers/bank_provider.dart';
 import '../providers/preferences_provider.dart';
 import '../providers/tx_meta_provider.dart';
@@ -45,11 +46,11 @@ class _HomeScreenState extends State<HomeScreen> {
 
     return Scaffold(
       appBar: AppBar(
-        title: Text(_editingWidgets ? 'Edit widgets' : 'Home'),
+        title: Text(_editingWidgets ? 'Edit Home' : 'Home'),
         actions: [
           if (bank.isLinked || bank.hasData)
             IconButton(
-              tooltip: _editingWidgets ? 'Done' : 'Edit Home widgets',
+              tooltip: _editingWidgets ? 'Done' : 'Edit Home layout',
               onPressed: () =>
                   setState(() => _editingWidgets = !_editingWidgets),
               icon: Icon(
@@ -218,41 +219,74 @@ class _HomeBody extends StatelessWidget {
                 ),
               ),
             ),
-            const SizedBox(height: 20),
-            Row(
-              children: [
-                Expanded(
-                  child: _StatChip(
-                    label: 'Transactions',
-                    value: '${bank.transactions.length}',
-                    icon: Icons.list_alt,
-                  ),
-                ),
-                const SizedBox(width: 10),
-                Expanded(
-                  child: _StatChip(
-                    label: 'Categorized',
-                    value: '$categorized',
-                    icon: Icons.label_outline,
-                  ),
-                ),
-              ],
-            ),
-            if (editingWidgets || widgets.isNotEmpty) ...[
-              const SizedBox(height: 24),
+            if (_showBuiltIn(
+                  editing: editingWidgets,
+                  enabled: prefs.homeBuiltInSections.showTransactions,
+                ) ||
+                _showBuiltIn(
+                  editing: editingWidgets,
+                  enabled: prefs.homeBuiltInSections.showCategorized,
+                )) ...[
+              const SizedBox(height: 20),
               Row(
                 children: [
-                  Text('Widgets', style: theme.textTheme.titleMedium),
-                  const Spacer(),
-                  if (editingWidgets)
-                    TextButton.icon(
-                      onPressed: () => showHomeWidgetsSheet(context),
-                      icon: const Icon(Icons.add, size: 18),
-                      label: const Text('Add'),
+                  if (_showBuiltIn(
+                    editing: editingWidgets,
+                    enabled: prefs.homeBuiltInSections.showTransactions,
+                  ))
+                    Expanded(
+                      child: _EditableHomeBlock(
+                        editing: editingWidgets,
+                        visible: prefs.homeBuiltInSections.showTransactions,
+                        onToggleVisible: (value) =>
+                            prefs.setHomeShowTransactions(value),
+                        child: _StatChip(
+                          label: 'Transactions',
+                          value: '${bank.transactions.length}',
+                          icon: Icons.list_alt,
+                        ),
+                      ),
+                    ),
+                  if (_showBuiltIn(
+                        editing: editingWidgets,
+                        enabled: prefs.homeBuiltInSections.showTransactions,
+                      ) &&
+                      _showBuiltIn(
+                        editing: editingWidgets,
+                        enabled: prefs.homeBuiltInSections.showCategorized,
+                      ))
+                    const SizedBox(width: 10),
+                  if (_showBuiltIn(
+                    editing: editingWidgets,
+                    enabled: prefs.homeBuiltInSections.showCategorized,
+                  ))
+                    Expanded(
+                      child: _EditableHomeBlock(
+                        editing: editingWidgets,
+                        visible: prefs.homeBuiltInSections.showCategorized,
+                        onToggleVisible: (value) =>
+                            prefs.setHomeShowCategorized(value),
+                        child: _StatChip(
+                          label: 'Categorized',
+                          value: '$categorized',
+                          icon: Icons.label_outline,
+                        ),
+                      ),
                     ),
                 ],
               ),
-              const SizedBox(height: 8),
+            ],
+            if (editingWidgets || widgets.isNotEmpty) ...[
+              const SizedBox(height: 24),
+              if (editingWidgets)
+                Align(
+                  alignment: Alignment.centerRight,
+                  child: TextButton.icon(
+                    onPressed: () => showHomeWidgetsSheet(context),
+                    icon: const Icon(Icons.add, size: 18),
+                    label: const Text('Add'),
+                  ),
+                ),
               if (widgets.isEmpty)
                 Text(
                   'No widgets yet. Tap Add to pin a transaction filter.',
@@ -260,68 +294,137 @@ class _HomeBody extends StatelessWidget {
                     color: colors.onSurfaceVariant,
                   ),
                 )
-              else
-                for (final widgetConfig in widgets) ...[
-                  HomeFilterWidgetCard(
-                    widgetConfig: widgetConfig,
-                    editing: editingWidgets,
-                    onRemove: editingWidgets
-                        ? () => prefs.removeHomeFilterWidget(widgetConfig.id)
-                        : null,
-                  ),
-                  const SizedBox(height: 10),
-                ],
-            ],
-            if (recent.isNotEmpty) ...[
-              const SizedBox(height: 24),
-              Row(
-                children: [
-                  Text('Recent', style: theme.textTheme.titleMedium),
-                  const Spacer(),
-                  TextButton(
-                    onPressed: () => _openTransactions(context),
-                    child: const Text('See all'),
-                  ),
-                ],
-              ),
-              const SizedBox(height: 4),
-              for (final tx in recent)
-                ListTile(
-                  contentPadding: EdgeInsets.zero,
-                  dense: true,
-                  leading: Builder(
-                    builder: (context) {
-                      final labels =
-                          meta.leafLabelsFor(meta.metaFor(tx));
-                      final label = labels.isEmpty ? null : labels.first;
-                      return Icon(
-                        label?.icon ?? Icons.receipt_long_outlined,
-                        color: label?.color,
-                      );
-                    },
-                  ),
-                  title: Text(
-                    tx.description,
-                    maxLines: 1,
-                    overflow: TextOverflow.ellipsis,
-                  ),
-                  subtitle: Text(formatIsoDate(tx.date)),
-                  trailing: Text(
-                    formatMoney(tx.amount, tx.currency),
-                    style: theme.textTheme.titleSmall?.copyWith(
-                      color: tx.amount >= 0
-                          ? AppTheme.accent
-                          : AppTheme.expense,
-                    ),
-                  ),
-                  onTap: () {
-                    Navigator.of(context).push(
-                      MaterialPageRoute<void>(
-                        builder: (_) => TransactionDetailScreen(tx: tx),
+              else if (editingWidgets)
+                ReorderableListView.builder(
+                  shrinkWrap: true,
+                  physics: const NeverScrollableScrollPhysics(),
+                  buildDefaultDragHandles: false,
+                  itemCount: widgets.length,
+                  onReorderItem: prefs.reorderHomeFilterWidgets,
+                  proxyDecorator: (child, index, animation) {
+                    return Material(
+                      elevation: 2,
+                      color: Colors.transparent,
+                      borderRadius: BorderRadius.circular(16),
+                      child: child,
+                    );
+                  },
+                  itemBuilder: (context, index) {
+                    final widgetConfig = widgets[index];
+                    return Padding(
+                      key: ValueKey(widgetConfig.id),
+                      padding: const EdgeInsets.only(bottom: 10),
+                      child: _HomeWidgetSlot(
+                        halfWidth: widgetConfig.halfWidth,
+                        child: HomeFilterWidgetCard(
+                          widgetConfig: widgetConfig,
+                          editing: true,
+                          onToggleDisplay: (display) =>
+                              prefs.setHomeFilterWidgetDisplay(
+                            widgetConfig.id,
+                            display,
+                          ),
+                          onEdit: () async {
+                            final preferences =
+                                context.read<PreferencesController>();
+                            final updated = await composeHomeFilterWidget(
+                              context,
+                              existing: widgetConfig,
+                            );
+                            if (updated == null) return;
+                            await preferences.updateHomeFilterWidget(updated);
+                          },
+                          dragHandle: ReorderableDragStartListener(
+                            index: index,
+                            child: Icon(
+                              Icons.drag_handle,
+                              color: colors.onSurfaceVariant,
+                            ),
+                          ),
+                        ),
                       ),
                     );
                   },
+                )
+              else
+                ..._packedHomeWidgetRows(widgets),
+            ],
+            if (_showBuiltIn(
+                  editing: editingWidgets,
+                  enabled: prefs.homeBuiltInSections.showRecent,
+                ) &&
+                (recent.isNotEmpty || editingWidgets)) ...[
+              const SizedBox(height: 24),
+              _EditableHomeBlock(
+                editing: editingWidgets,
+                visible: prefs.homeBuiltInSections.showRecent,
+                onToggleVisible: (value) => prefs.setHomeShowRecent(value),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  children: [
+                    Row(
+                      children: [
+                        Text('Recent', style: theme.textTheme.titleMedium),
+                        const Spacer(),
+                        TextButton(
+                          onPressed: () => _openTransactions(context),
+                          child: const Text('See all'),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 4),
+                    if (recent.isEmpty)
+                      Text(
+                        'No recent transactions yet.',
+                        style: theme.textTheme.bodyMedium?.copyWith(
+                          color: colors.onSurfaceVariant,
+                        ),
+                      )
+                    else
+                      for (final tx in recent)
+                        ListTile(
+                          contentPadding: EdgeInsets.zero,
+                          dense: true,
+                          leading: Builder(
+                            builder: (context) {
+                              final labels =
+                                  meta.leafLabelsFor(meta.metaFor(tx));
+                              final label =
+                                  labels.isEmpty ? null : labels.first;
+                              return Icon(
+                                label?.icon ?? Icons.receipt_long_outlined,
+                                color: label?.color,
+                              );
+                            },
+                          ),
+                          title: Text(
+                            tx.description,
+                            maxLines: 1,
+                            overflow: TextOverflow.ellipsis,
+                          ),
+                          subtitle: Text(formatIsoDate(tx.date)),
+                          trailing: Text(
+                            formatMoney(tx.amount, tx.currency),
+                            style: theme.textTheme.titleSmall?.copyWith(
+                              color: tx.amount >= 0
+                                  ? AppTheme.accent
+                                  : AppTheme.expense,
+                            ),
+                          ),
+                          onTap: editingWidgets
+                              ? null
+                              : () {
+                                  Navigator.of(context).push(
+                                    MaterialPageRoute<void>(
+                                      builder: (_) =>
+                                          TransactionDetailScreen(tx: tx),
+                                    ),
+                                  );
+                                },
+                        ),
+                  ],
                 ),
+              ),
             ],
             if (bank.error != null) ...[
               const SizedBox(height: 12),
@@ -382,3 +485,116 @@ class _StatChip extends StatelessWidget {
     );
   }
 }
+
+bool _showBuiltIn({required bool editing, required bool enabled}) =>
+    editing || enabled;
+
+/// Wraps a built-in Home block with show/hide controls while editing.
+class _EditableHomeBlock extends StatelessWidget {
+  const _EditableHomeBlock({
+    required this.editing,
+    required this.visible,
+    required this.onToggleVisible,
+    required this.child,
+  });
+
+  final bool editing;
+  final bool visible;
+  final ValueChanged<bool> onToggleVisible;
+  final Widget child;
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = Theme.of(context).colorScheme;
+    final content = Opacity(
+      opacity: editing && !visible ? 0.45 : 1,
+      child: child,
+    );
+    if (!editing) return content;
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Expanded(child: content),
+        IconButton(
+          tooltip: visible ? 'Hide from Home' : 'Show on Home',
+          onPressed: () => onToggleVisible(!visible),
+          icon: Icon(
+            visible ? Icons.visibility_outlined : Icons.visibility_off_outlined,
+            color: visible ? colors.onSurfaceVariant : colors.primary,
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+/// Full- or half-width slot for a Home filter widget card.
+class _HomeWidgetSlot extends StatelessWidget {
+  const _HomeWidgetSlot({
+    required this.halfWidth,
+    required this.child,
+  });
+
+  final bool halfWidth;
+  final Widget child;
+
+  @override
+  Widget build(BuildContext context) {
+    if (!halfWidth) return child;
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final width = (constraints.maxWidth - 10) / 2;
+        return Align(
+          alignment: Alignment.centerLeft,
+          child: SizedBox(width: width, child: child),
+        );
+      },
+    );
+  }
+}
+
+List<Widget> _packedHomeWidgetRows(List<HomeFilterWidget> widgets) {
+  final rows = <Widget>[];
+  var i = 0;
+  while (i < widgets.length) {
+    final a = widgets[i];
+    final canPair = a.halfWidth &&
+        i + 1 < widgets.length &&
+        widgets[i + 1].halfWidth;
+    if (canPair) {
+      final b = widgets[i + 1];
+      rows.add(
+        Padding(
+          padding: const EdgeInsets.only(bottom: 10),
+          child: IntrinsicHeight(
+            child: Row(
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                Expanded(
+                  child: HomeFilterWidgetCard(widgetConfig: a),
+                ),
+                const SizedBox(width: 10),
+                Expanded(
+                  child: HomeFilterWidgetCard(widgetConfig: b),
+                ),
+              ],
+            ),
+          ),
+        ),
+      );
+      i += 2;
+      continue;
+    }
+    rows.add(
+      Padding(
+        padding: const EdgeInsets.only(bottom: 10),
+        child: _HomeWidgetSlot(
+          halfWidth: a.halfWidth,
+          child: HomeFilterWidgetCard(widgetConfig: a),
+        ),
+      ),
+    );
+    i += 1;
+  }
+  return rows;
+}

lib/screens/overview_screen.dart

@@ -332,7 +332,7 @@ class _OverviewScreenState extends State<OverviewScreen> {
 
     return ListView(
       physics: const AlwaysScrollableScrollPhysics(),
-      padding: const EdgeInsets.fromLTRB(0, 8, 0, 32),
+      padding: const EdgeInsets.fromLTRB(0, 4, 0, 24),
       children: [
         if (bank.error != null) ...[
           Text(
@@ -341,7 +341,7 @@ class _OverviewScreenState extends State<OverviewScreen> {
               color: theme.colorScheme.error,
             ),
           ),
-          const SizedBox(height: 12),
+          const SizedBox(height: 8),
         ],
         Row(
           children: [
@@ -355,23 +355,33 @@ class _OverviewScreenState extends State<OverviewScreen> {
             ),
             TextButton(
               onPressed: _openFavouritesManager,
+              style: TextButton.styleFrom(
+                visualDensity: VisualDensity.compact,
+                tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                padding: const EdgeInsets.symmetric(horizontal: 8),
+              ),
               child: const Text('Manage'),
             ),
             TextButton.icon(
               onPressed: () => setState(() => _showFavouritesView = false),
-              icon: const Icon(Icons.insights_outlined, size: 18),
+              style: TextButton.styleFrom(
+                visualDensity: VisualDensity.compact,
+                tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                padding: const EdgeInsets.symmetric(horizontal: 8),
+              ),
+              icon: const Icon(Icons.open_in_new, size: 16),
               label: const Text('Full overview'),
             ),
           ],
         ),
-        const SizedBox(height: 4),
-        Text(
-          'All favourites with Display checked appear here. '
-          'Use Full overview to set a filter, then ★ → Save current filter.',
-          style: theme.textTheme.labelMedium,
-        ),
         if (displayed.isEmpty) ...[
-          const SizedBox(height: 24),
+          const SizedBox(height: 8),
+          Text(
+            'All favourites with Display checked appear here. '
+            'Use Full overview to set a filter, then ★ → Save current filter.',
+            style: theme.textTheme.labelMedium,
+          ),
+          const SizedBox(height: 16),
           Text(
             'No displayed favourites yet. Tap Manage to enable Display, '
             'or save a new filter from Full overview.',
@@ -380,9 +390,9 @@ class _OverviewScreenState extends State<OverviewScreen> {
             ),
           ),
         ] else ...[
-          const SizedBox(height: 12),
+          const SizedBox(height: 8),
           for (var i = 0; i < displayed.length; i++) ...[
-            if (i > 0) const SizedBox(height: 14),
+            if (i > 0) const SizedBox(height: 10),
             _favouriteChartCard(
               context: context,
               favourite: displayed[i],
@@ -1176,10 +1186,13 @@ class _ChartCard extends StatelessWidget {
   final VoidCallback? onEdit;
 
   static const _compactSegmentStyle = ButtonStyle(
-    visualDensity: VisualDensity(horizontal: -4, vertical: -3),
+    visualDensity: VisualDensity(horizontal: -4, vertical: -4),
     tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-    padding: WidgetStatePropertyAll(EdgeInsets.symmetric(horizontal: 8)),
-    minimumSize: WidgetStatePropertyAll(Size(0, 32)),
+    padding: WidgetStatePropertyAll(EdgeInsets.symmetric(horizontal: 6)),
+    minimumSize: WidgetStatePropertyAll(Size(0, 28)),
+    textStyle: WidgetStatePropertyAll(
+      TextStyle(fontSize: 12, fontWeight: FontWeight.w600),
+    ),
   );
 
   Widget _filterButton(ColorScheme colors) {
@@ -1216,44 +1229,152 @@ class _ChartCard extends StatelessWidget {
     );
   }
 
-  Widget _editButton(ColorScheme colors) {
+  Widget _editButton(ColorScheme colors, {required bool compact}) {
     return IconButton(
       tooltip: 'Edit favourite',
       onPressed: onEdit,
       visualDensity: const VisualDensity(horizontal: -4, vertical: -4),
-      constraints: const BoxConstraints(minWidth: 36, minHeight: 36),
+      constraints: BoxConstraints(
+        minWidth: compact ? 28 : 36,
+        minHeight: compact ? 28 : 36,
+      ),
       padding: EdgeInsets.zero,
       style: IconButton.styleFrom(
-        backgroundColor: colors.surfaceContainerHigh,
+        backgroundColor:
+            compact ? null : colors.surfaceContainerHigh,
         foregroundColor: colors.onSurfaceVariant,
         shape: RoundedRectangleBorder(
           borderRadius: BorderRadius.circular(10),
         ),
       ),
-      icon: const Icon(Icons.edit_outlined, size: 18),
+      icon: Icon(Icons.edit_outlined, size: compact ? 16 : 18),
     );
   }
 
+  Widget _legendRow(ColorScheme colors, {required bool compact}) {
+    if (metric == OverviewMetricMode.flow) {
+      return Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          _LegendDot(
+            color: _kIncomeColor,
+            label: 'Income',
+            compact: compact,
+          ),
+          SizedBox(width: compact ? 10 : 14),
+          _LegendDot(
+            color: _kExpenseColor,
+            label: 'Expense',
+            compact: compact,
+          ),
+        ],
+      );
+    }
+    if (labelSpend.isEmpty) return const SizedBox.shrink();
+    return Wrap(
+      spacing: compact ? 8 : 12,
+      runSpacing: 2,
+      alignment: WrapAlignment.end,
+      children: [
+        for (final row in labelSpend.take(compact ? 3 : 5))
+          GestureDetector(
+            onTap: () => onLabelTap(row.label),
+            child: _LegendDot(
+              color: row.label.color,
+              label: row.label.name,
+              compact: compact,
+            ),
+          ),
+        if (labelSpend.length > (compact ? 3 : 5))
+          _LegendDot(
+            color: colors.outline,
+            label: 'Other',
+            compact: compact,
+          ),
+      ],
+    );
+  }
+
+  Widget _periodControls(ThemeData theme, {required bool compact}) {
+    final titleStyle = (compact
+            ? theme.textTheme.labelMedium
+            : theme.textTheme.titleMedium)
+        ?.copyWith(
+      fontWeight: FontWeight.w600,
+      color: compact ? theme.colorScheme.onSurfaceVariant : null,
+    );
+
+    if (period == OverviewPeriodMode.monthly) {
+      return Row(
+        children: [
+          IconButton(
+            tooltip: 'Previous year',
+            onPressed: canGoBack ? onBack : null,
+            visualDensity: const VisualDensity(horizontal: -4, vertical: -4),
+            constraints: BoxConstraints(
+              minWidth: compact ? 28 : 32,
+              minHeight: compact ? 28 : 32,
+            ),
+            padding: EdgeInsets.zero,
+            icon: Icon(Icons.chevron_left, size: compact ? 20 : 22),
+          ),
+          Flexible(
+            child: Text(
+              periodTitle,
+              textAlign: TextAlign.left,
+              maxLines: 1,
+              overflow: TextOverflow.ellipsis,
+              style: titleStyle,
+            ),
+          ),
+          IconButton(
+            tooltip: 'Next year',
+            onPressed: canGoForward ? onForward : null,
+            visualDensity: const VisualDensity(horizontal: -4, vertical: -4),
+            constraints: BoxConstraints(
+              minWidth: compact ? 28 : 32,
+              minHeight: compact ? 28 : 32,
+            ),
+            padding: EdgeInsets.zero,
+            icon: Icon(Icons.chevron_right, size: compact ? 20 : 22),
+          ),
+        ],
+      );
+    }
+
+    return Text(periodTitle, style: titleStyle);
+  }
+
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
     final colors = theme.colorScheme;
     final showFilter =
         metric == OverviewMetricMode.labels && onPickLabels != null;
-    final showFavouriteChrome =
-        onPeriodModeChanged != null || onEdit != null;
+    final compact = onPeriodModeChanged != null || onEdit != null;
+    final chartHeight = compact ? 176.0 : 220.0;
+
+    final legend = _legendRow(colors, compact: compact);
+    final hasLegend = metric == OverviewMetricMode.flow ||
+        labelSpend.isNotEmpty;
 
     return Card(
       color: colors.surfaceContainer,
       elevation: 0,
+      margin: EdgeInsets.zero,
       shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(20),
+        borderRadius: BorderRadius.circular(compact ? 16 : 20),
       ),
       child: Padding(
-        padding: const EdgeInsets.fromLTRB(14, 12, 14, 16),
+        padding: EdgeInsets.fromLTRB(
+          compact ? 12 : 14,
+          compact ? 10 : 12,
+          compact ? 10 : 14,
+          compact ? 12 : 16,
+        ),
         child: Column(
           children: [
-            if (showFavouriteChrome) ...[
+            if (compact) ...[
               Row(
                 children: [
                   if (onPeriodModeChanged != null)
@@ -1274,145 +1395,133 @@ class _ChartCard extends StatelessWidget {
                       onSelectionChanged: (selection) {
                         onPeriodModeChanged!(selection.first);
                       },
-                    )
-                  else
-                    const SizedBox.shrink(),
+                    ),
                   if (heading != null) ...[
-                    const SizedBox(width: 10),
+                    const SizedBox(width: 8),
                     Expanded(
                       child: Text(
                         heading!,
                         maxLines: 1,
                         overflow: TextOverflow.ellipsis,
-                        style: theme.textTheme.titleMedium?.copyWith(
+                        style: theme.textTheme.titleSmall?.copyWith(
                           fontWeight: FontWeight.w700,
                         ),
                       ),
                     ),
                   ] else
                     const Spacer(),
-                  if (onEdit != null) ...[
-                    const SizedBox(width: 6),
-                    _editButton(colors),
-                  ],
-                ],
-              ),
-              const SizedBox(height: 8),
-            ] else if (heading != null) ...[
-              Align(
-                alignment: Alignment.centerLeft,
-                child: Text(
-                  heading!,
-                  style: theme.textTheme.titleMedium?.copyWith(
-                    fontWeight: FontWeight.w700,
-                  ),
-                ),
-              ),
-              const SizedBox(height: 8),
-            ],
-            if (period == OverviewPeriodMode.monthly)
-              Row(
-                children: [
-                  IconButton(
-                    tooltip: 'Previous year',
-                    onPressed: canGoBack ? onBack : null,
-                    visualDensity: const VisualDensity(
-                      horizontal: -4,
-                      vertical: -4,
-                    ),
-                    constraints: const BoxConstraints(
-                      minWidth: 32,
-                      minHeight: 32,
-                    ),
-                    padding: EdgeInsets.zero,
-                    icon: const Icon(Icons.chevron_left, size: 22),
-                  ),
-                  Expanded(
-                    child: Text(
-                      periodTitle,
-                      textAlign: TextAlign.center,
-                      style: theme.textTheme.titleMedium?.copyWith(
-                        fontWeight: FontWeight.w700,
-                      ),
-                    ),
-                  ),
-                  IconButton(
-                    tooltip: 'Next year',
-                    onPressed: canGoForward ? onForward : null,
-                    visualDensity: const VisualDensity(
-                      horizontal: -4,
-                      vertical: -4,
-                    ),
-                    constraints: const BoxConstraints(
-                      minWidth: 32,
-                      minHeight: 32,
-                    ),
-                    padding: EdgeInsets.zero,
-                    icon: const Icon(Icons.chevron_right, size: 22),
-                  ),
                   if (showFilter) ...[
-                    const SizedBox(width: 2),
+                    const SizedBox(width: 4),
                     _filterButton(colors),
                   ],
+                  if (onEdit != null) ...[
+                    const SizedBox(width: 2),
+                    _editButton(colors, compact: true),
+                  ],
                 ],
-              )
-            else
+              ),
+              const SizedBox(height: 4),
               Row(
+                crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
-                  SizedBox(width: showFilter ? 36 : 0),
                   Expanded(
-                    child: Text(
-                      periodTitle,
-                      textAlign: TextAlign.center,
-                      style: theme.textTheme.titleMedium?.copyWith(
-                        fontWeight: FontWeight.w700,
-                      ),
+                    child: _periodControls(theme, compact: true),
+                  ),
+                  if (hasLegend) ...[
+                    const SizedBox(width: 8),
+                    Flexible(child: legend),
+                  ],
+                ],
+              ),
+              const SizedBox(height: 6),
+            ] else ...[
+              if (heading != null) ...[
+                Align(
+                  alignment: Alignment.centerLeft,
+                  child: Text(
+                    heading!,
+                    style: theme.textTheme.titleMedium?.copyWith(
+                      fontWeight: FontWeight.w700,
                     ),
                   ),
-                  if (showFilter)
-                    _filterButton(colors)
-                  else
-                    const SizedBox(width: 0),
-                ],
-              ),
-            if (metric == OverviewMetricMode.flow) ...[
-              const Row(
-                mainAxisAlignment: MainAxisAlignment.end,
-                children: [
-                  _LegendDot(color: _kIncomeColor, label: 'Income'),
-                  SizedBox(width: 14),
-                  _LegendDot(color: _kExpenseColor, label: 'Expense'),
-                ],
-              ),
-              const SizedBox(height: 8),
-            ] else if (labelSpend.isNotEmpty) ...[
-              Align(
-                alignment: Alignment.centerRight,
-                child: Wrap(
-                  spacing: 12,
-                  runSpacing: 4,
-                  alignment: WrapAlignment.end,
+                ),
+                const SizedBox(height: 8),
+              ],
+              if (period == OverviewPeriodMode.monthly)
+                Row(
                   children: [
-                    for (final row in labelSpend.take(5))
-                      GestureDetector(
-                        onTap: () => onLabelTap(row.label),
-                        child: _LegendDot(
-                          color: row.label.color,
-                          label: row.label.name,
+                    IconButton(
+                      tooltip: 'Previous year',
+                      onPressed: canGoBack ? onBack : null,
+                      visualDensity: const VisualDensity(
+                        horizontal: -4,
+                        vertical: -4,
+                      ),
+                      constraints: const BoxConstraints(
+                        minWidth: 32,
+                        minHeight: 32,
+                      ),
+                      padding: EdgeInsets.zero,
+                      icon: const Icon(Icons.chevron_left, size: 22),
+                    ),
+                    Expanded(
+                      child: Text(
+                        periodTitle,
+                        textAlign: TextAlign.center,
+                        style: theme.textTheme.titleMedium?.copyWith(
+                          fontWeight: FontWeight.w700,
                         ),
                       ),
-                    if (labelSpend.length > 5)
-                      _LegendDot(
-                        color: colors.outline,
-                        label: 'Other',
+                    ),
+                    IconButton(
+                      tooltip: 'Next year',
+                      onPressed: canGoForward ? onForward : null,
+                      visualDensity: const VisualDensity(
+                        horizontal: -4,
+                        vertical: -4,
                       ),
+                      constraints: const BoxConstraints(
+                        minWidth: 32,
+                        minHeight: 32,
+                      ),
+                      padding: EdgeInsets.zero,
+                      icon: const Icon(Icons.chevron_right, size: 22),
+                    ),
+                    if (showFilter) ...[
+                      const SizedBox(width: 2),
+                      _filterButton(colors),
+                    ],
+                  ],
+                )
+              else
+                Row(
+                  children: [
+                    SizedBox(width: showFilter ? 36 : 0),
+                    Expanded(
+                      child: Text(
+                        periodTitle,
+                        textAlign: TextAlign.center,
+                        style: theme.textTheme.titleMedium?.copyWith(
+                          fontWeight: FontWeight.w700,
+                        ),
+                      ),
+                    ),
+                    if (showFilter)
+                      _filterButton(colors)
+                    else
+                      const SizedBox(width: 0),
                   ],
                 ),
-              ),
-              const SizedBox(height: 8),
+              if (hasLegend) ...[
+                Align(
+                  alignment: Alignment.centerRight,
+                  child: legend,
+                ),
+                const SizedBox(height: 8),
+              ],
             ],
             SizedBox(
-              height: 220,
+              height: chartHeight,
               child: metric == OverviewMetricMode.flow
                   ? _FlowBars(
                       months: months,
@@ -1908,23 +2017,34 @@ class _LabelMonthBars extends StatelessWidget {
 }
 
 class _LegendDot extends StatelessWidget {
-  const _LegendDot({required this.color, required this.label});
+  const _LegendDot({
+    required this.color,
+    required this.label,
+    this.compact = false,
+  });
 
   final Color color;
   final String label;
+  final bool compact;
 
   @override
   Widget build(BuildContext context) {
+    final theme = Theme.of(context);
     return Row(
       mainAxisSize: MainAxisSize.min,
       children: [
         Container(
-          width: 8,
-          height: 8,
+          width: compact ? 6 : 8,
+          height: compact ? 6 : 8,
           decoration: BoxDecoration(color: color, shape: BoxShape.circle),
         ),
-        const SizedBox(width: 6),
-        Text(label, style: Theme.of(context).textTheme.labelMedium),
+        SizedBox(width: compact ? 4 : 6),
+        Text(
+          label,
+          style: compact
+              ? theme.textTheme.labelSmall
+              : theme.textTheme.labelMedium,
+        ),
       ],
     );
   }

lib/screens/splash_screen.dart

@@ -82,17 +82,13 @@ class _SplashScreenState extends State<SplashScreen>
                 child: Column(
                   mainAxisSize: MainAxisSize.min,
                   children: [
-                    Container(
-                      width: 88,
-                      height: 88,
-                      decoration: BoxDecoration(
-                        color: colors.onPrimary.withValues(alpha: 0.16),
-                        borderRadius: BorderRadius.circular(24),
-                      ),
-                      child: Icon(
-                        Icons.account_balance_rounded,
-                        size: 44,
-                        color: colors.onPrimary,
+                    ClipRRect(
+                      borderRadius: BorderRadius.circular(24),
+                      child: Image.asset(
+                        'assets/branding/app_icon.png',
+                        width: 112,
+                        height: 112,
+                        filterQuality: FilterQuality.high,
                       ),
                     ),
                     const SizedBox(height: 24),
@@ -103,12 +99,12 @@ class _SplashScreenState extends State<SplashScreen>
                       ),
                     ),
                     const SizedBox(height: 8),
-                      Text(
-                        'Your bank data, simply',
-                        style: textTheme.bodyLarge?.copyWith(
-                          color: colors.onPrimary.withValues(alpha: 0.85),
-                        ),
+                    Text(
+                      'Your bank data, simply',
+                      style: textTheme.bodyLarge?.copyWith(
+                        color: colors.onPrimary.withValues(alpha: 0.85),
                       ),
+                    ),
                     const SizedBox(height: 40),
                     SizedBox(
                       width: 28,

lib/screens/transactions_screen.dart

@@ -241,6 +241,7 @@ class _TransactionsScreenState extends State<TransactionsScreen> {
   }
 
   Future<void> _saveAsHomeWidget() async {
+    final preferences = context.read<PreferencesController>();
     final created = await composeHomeFilterWidget(
       context,
       initialFilter: TransactionFilterSelection(
@@ -252,8 +253,8 @@ class _TransactionsScreenState extends State<TransactionsScreen> {
       ),
       skipFilterDialog: true,
     );
-    if (created == null || !mounted) return;
-    await context.read<PreferencesController>().addHomeFilterWidget(created);
+    if (created == null) return;
+    await preferences.addHomeFilterWidget(created);
     if (!mounted) return;
     ScaffoldMessenger.of(context).showSnackBar(
       SnackBar(content: Text('Added “${created.name}” to Home')),

lib/services/pb_sync_service.dart

@@ -7,7 +7,9 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:pocketbase/pocketbase.dart';
 
+import '../models/app_cloud_prefs.dart';
 import '../models/bank.dart';
+import '../models/home_built_in_sections.dart';
 import '../models/home_filter_widget.dart';
 import '../models/overview_favourite.dart';
 import '../models/transaction_meta.dart';
@@ -520,6 +522,17 @@ class PbSyncService {
           'name': r.getStringValue('name'),
           'display': r.getBoolValue('display', true),
           'sortOrder': r.getIntValue('sort_order', 0),
+          'halfWidth': r.getBoolValue('half_width'),
+          'type': r.getStringValue('widget_type'),
+          'iconId': r.getStringValue('icon_id'),
+          'chartStyle': r.getStringValue('chart_style'),
+          'budgetCapMode': r.getStringValue('budget_cap_mode'),
+          'budgetFixedAmount': switch (r.get<dynamic>('budget_fixed_amount')) {
+            num n => n.toDouble(),
+            String s => double.tryParse(s) ?? 0,
+            _ => 0.0,
+          },
+          'budgetAverageMonths': r.getIntValue('budget_average_months', 3),
           'labelIds': _jsonStringList(r.get<dynamic>('label_ids')),
           'flow': r.getStringValue('flow'),
           'amountRange': rangeRaw is Map
@@ -547,6 +560,43 @@ class PbSyncService {
     await _syncHomeFilterWidgets(userId, filter, widgets);
   }
 
+  /// Pull per-user app prefs (Home sections + Look ahead). Soft-fail if missing.
+  Future<AppCloudPrefs?> pullAppPrefs({
+    void Function(String message)? onStatus,
+  }) async {
+    final userId = _userId;
+    final filter = 'user="$userId"';
+    onStatus?.call('Pulling app prefs…');
+    final records = await _fullList('app_prefs', filter);
+    if (records.isEmpty) {
+      debugPrint('PbSyncService pull: app_prefs=0');
+      return null;
+    }
+    final r = records.first;
+    final prefs = AppCloudPrefs(
+      homeBuiltInSections: HomeBuiltInSections(
+        showTransactions: r.getBoolValue('home_show_transactions', true),
+        showCategorized: r.getBoolValue('home_show_categorized', true),
+        showRecent: r.getBoolValue('home_show_recent', true),
+      ),
+      lookAheadMaxYears:
+          r.getIntValue('look_ahead_max_years', 5).clamp(1, 30),
+    );
+    debugPrint('PbSyncService pull: app_prefs=1');
+    return prefs;
+  }
+
+  /// Upsert the single app_prefs row for this user.
+  Future<void> pushAppPrefs(
+    AppCloudPrefs prefs, {
+    void Function(String message)? onStatus,
+  }) async {
+    final userId = _userId;
+    final filter = 'user="$userId"';
+    onStatus?.call('Syncing app prefs…');
+    await _syncAppPrefs(userId, filter, prefs);
+  }
+
   /// Upserts local bank txs to PocketBase. Does **not** delete remote rows
   /// (partial local caches must not wipe another device).
   Future<String> pushTransactions(
@@ -821,6 +871,10 @@ class PbSyncService {
           filter =
               'user="$userId" && client_id="${key.replaceAll('"', '\\"')}"';
         }
+      case 'app_prefs':
+        if (userId != null) {
+          filter = 'user="$userId"';
+        }
       case 'transactions':
         final key = body['tx_id'];
         if (userId != null && key is String) {
@@ -1197,6 +1251,13 @@ class PbSyncService {
         'name': _clip(w.name.isEmpty ? 'Filter' : w.name, 200),
         'display': w.display,
         'sort_order': w.sortOrder,
+        'half_width': w.halfWidth,
+        'widget_type': w.type.name,
+        'icon_id': w.iconId,
+        'chart_style': w.chartStyle.name,
+        'budget_cap_mode': w.budgetCapMode.name,
+        'budget_fixed_amount': w.budgetFixedAmount,
+        'budget_average_months': w.budgetAverageMonths,
         'label_ids': w.labelIds,
         'flow': w.flow.name,
         'amount_range': {
@@ -1231,6 +1292,36 @@ class PbSyncService {
     await _runWriteOps('home_filter_widgets', ops);
   }
 
+  Future<void> _syncAppPrefs(
+    String userId,
+    String filter,
+    AppCloudPrefs prefs,
+  ) async {
+    final existing = await _fullList('app_prefs', filter);
+    final body = <String, dynamic>{
+      'user': userId,
+      'home_show_transactions': prefs.homeBuiltInSections.showTransactions,
+      'home_show_categorized': prefs.homeBuiltInSections.showCategorized,
+      'home_show_recent': prefs.homeBuiltInSections.showRecent,
+      'look_ahead_max_years': prefs.lookAheadMaxYears.clamp(1, 30),
+    };
+    final ops = <_BatchOp>[];
+    if (existing.isEmpty) {
+      ops.add(_BatchOp.create(body));
+    } else {
+      final remote = existing.first;
+      if (!_appPrefsUnchanged(remote, prefs)) {
+        ops.add(_BatchOp.update(remote.id, body));
+      }
+      // Enforce singleton: drop extras if any.
+      for (var i = 1; i < existing.length; i++) {
+        ops.add(_BatchOp.delete(existing[i].id));
+      }
+    }
+    debugPrint('PbSyncService app_prefs: remote=${existing.length} ops=${ops.length}');
+    await _runWriteOps('app_prefs', ops);
+  }
+
   bool _labelUnchanged(RecordModel remote, Map<String, dynamic> body) {
     return remote.getStringValue('name') == body['name'] &&
         remote.getIntValue('color') == body['color'] &&
@@ -1294,9 +1385,22 @@ class PbSyncService {
         ? Map<String, dynamic>.from(rangeRaw)
         : const <String, dynamic>{};
     double? asDouble(dynamic value) => value is num ? value.toDouble() : null;
+    final remoteFixed = switch (remote.get<dynamic>('budget_fixed_amount')) {
+      num n => n.toDouble(),
+      String s => double.tryParse(s) ?? 0,
+      _ => 0.0,
+    };
     return remote.getStringValue('name') == w.name &&
         remote.getBoolValue('display', true) == w.display &&
         remote.getIntValue('sort_order', 0) == w.sortOrder &&
+        remote.getBoolValue('half_width') == w.halfWidth &&
+        remote.getStringValue('widget_type') == w.type.name &&
+        remote.getStringValue('icon_id') == w.iconId &&
+        remote.getStringValue('chart_style') == w.chartStyle.name &&
+        remote.getStringValue('budget_cap_mode') == w.budgetCapMode.name &&
+        (remoteFixed * 100).round() == (w.budgetFixedAmount * 100).round() &&
+        remote.getIntValue('budget_average_months', 3) ==
+            w.budgetAverageMonths &&
         _sameIdList(remoteIds, w.labelIds) &&
         remote.getStringValue('flow') == w.flow.name &&
         asDouble(rangeMap['exact']) == w.amountRange.exact &&
@@ -1308,6 +1412,17 @@ class PbSyncService {
         remote.getBoolValue('show_amount_out', true) == w.showAmountOut &&
         remote.getBoolValue('show_count', true) == w.showCount;
   }
+
+  bool _appPrefsUnchanged(RecordModel remote, AppCloudPrefs prefs) {
+    final s = prefs.homeBuiltInSections;
+    return remote.getBoolValue('home_show_transactions', true) ==
+            s.showTransactions &&
+        remote.getBoolValue('home_show_categorized', true) ==
+            s.showCategorized &&
+        remote.getBoolValue('home_show_recent', true) == s.showRecent &&
+        remote.getIntValue('look_ahead_max_years', 5) ==
+            prefs.lookAheadMaxYears.clamp(1, 30);
+  }
 }
 
 RecurringTemplateSource _parseTemplateSource(String raw) {

lib/services/storage_service.dart

@@ -7,6 +7,7 @@ import 'package:flutter/foundation.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import '../models/bank.dart';
+import '../models/home_built_in_sections.dart';
 import '../models/home_filter_widget.dart';
 import '../models/overview_favourite.dart';
 import '../models/transaction_meta.dart';
@@ -183,6 +184,27 @@ class StorageService {
     return _prefs.setString(StorageKeys.homeFilterWidgets, encoded);
   }
 
+  HomeBuiltInSections loadHomeBuiltInSections() {
+    final raw = _prefs.getString(StorageKeys.homeBuiltInSections);
+    if (raw == null || raw.isEmpty) return HomeBuiltInSections.defaults;
+    try {
+      final decoded = jsonDecode(raw);
+      if (decoded is! Map) return HomeBuiltInSections.defaults;
+      return HomeBuiltInSections.fromJson(
+        Map<String, dynamic>.from(decoded),
+      );
+    } catch (_) {
+      return HomeBuiltInSections.defaults;
+    }
+  }
+
+  Future<void> saveHomeBuiltInSections(HomeBuiltInSections sections) {
+    return _prefs.setString(
+      StorageKeys.homeBuiltInSections,
+      jsonEncode(sections.toJson()),
+    );
+  }
+
   bool get useRemoteData => _prefs.getBool(StorageKeys.useRemoteData) ?? false;
 
   Future<void> setUseRemoteData(bool value) {

lib/utils/constants.dart

@@ -57,6 +57,9 @@ abstract final class StorageKeys {
 
   /// Home screen filter widgets (JSON list).
   static const homeFilterWidgets = 'home_filter_widgets_v1';
+
+  /// Built-in Home sections visibility (Transactions / Categorized / Recent).
+  static const homeBuiltInSections = 'home_built_in_sections_v1';
 }
 
 /// Named routes registered on [MaterialApp].

lib/utils/tx_filter_metrics.dart

@@ -2,6 +2,7 @@
 library;
 
 import '../models/bank.dart';
+import '../models/home_filter_widget.dart';
 import '../models/transaction_meta.dart';
 import '../providers/tx_meta_provider.dart';
 import '../utils/tx_calendar.dart';
@@ -23,15 +24,40 @@ class TxFilterMetrics {
   double get net => amountIn - amountOut;
 }
 
+class HomeBudgetMetrics {
+  const HomeBudgetMetrics({
+    required this.monthNet,
+    required this.target,
+    required this.averageMonths,
+  });
+
+  /// Net (in − out) for the current calendar month.
+  final double monthNet;
+
+  /// Positive budget ceiling (fixed amount or avg |net| of last N months).
+  final double target;
+
+  final int averageMonths;
+
+  /// How much of the ceiling is used, based on |monthNet|.
+  double get used => monthNet.abs();
+
+  double get progress => target <= 0 ? 0 : used / target;
+
+  bool get overBudget => target > 0 && used > target;
+}
+
 /// Filter [all] the same way Transactions does (pool → search → flow/amount).
 List<BankTransaction> applyTransactionFilter({
   required List<BankTransaction> all,
   required TxMetaController meta,
   required TransactionFilterSelection filter,
   DateTime? month,
+  bool forceMonthOnly = false,
 }) {
   final nowMonth = monthStart(month ?? DateTime.now());
-  final pool = filter.monthOnly
+  final limitToMonth = forceMonthOnly || filter.monthOnly;
+  final pool = limitToMonth
       ? [
           for (final tx in all)
             if (_txInMonth(tx, nowMonth)) tx,
@@ -55,12 +81,14 @@ TxFilterMetrics computeTxFilterMetrics({
   required TxMetaController meta,
   required TransactionFilterSelection filter,
   DateTime? month,
+  bool forceMonthOnly = false,
 }) {
   final filtered = applyTransactionFilter(
     all: all,
     meta: meta,
     filter: filter,
     month: month,
+    forceMonthOnly: forceMonthOnly,
   );
   var amountIn = 0.0;
   var amountOut = 0.0;
@@ -80,6 +108,50 @@ TxFilterMetrics computeTxFilterMetrics({
   );
 }
 
+/// Budget progress: this month’s |net| vs fixed or average-of-last-N-months cap.
+HomeBudgetMetrics computeHomeBudgetMetrics({
+  required List<BankTransaction> all,
+  required TxMetaController meta,
+  required HomeFilterWidget widget,
+  DateTime? now,
+}) {
+  final today = now ?? DateTime.now();
+  final currentMonth = monthStart(today);
+  final monthFilter = widget.filter;
+  final monthNet = computeTxFilterMetrics(
+    all: all,
+    meta: meta,
+    filter: monthFilter,
+    month: currentMonth,
+    forceMonthOnly: true,
+  ).net;
+
+  final months = widget.budgetAverageMonths.clamp(1, 36);
+  final double target;
+  if (widget.budgetCapMode == HomeBudgetCapMode.fixed) {
+    target = widget.budgetFixedAmount.abs();
+  } else {
+    var sum = 0.0;
+    for (var i = 1; i <= months; i++) {
+      final month = addMonths(currentMonth, -i);
+      sum += computeTxFilterMetrics(
+        all: all,
+        meta: meta,
+        filter: monthFilter,
+        month: month,
+        forceMonthOnly: true,
+      ).net.abs();
+    }
+    target = sum / months;
+  }
+
+  return HomeBudgetMetrics(
+    monthNet: monthNet,
+    target: target,
+    averageMonths: months,
+  );
+}
+
 bool _txInMonth(BankTransaction tx, DateTime month) {
   final date = DateTime.tryParse(tx.date);
   if (date == null) return false;

lib/widgets/home_filter_widget_card.dart

@@ -1,9 +1,12 @@
 /// Home card for a saved transaction-filter widget.
 library;
 
+import 'dart:math' as math;
+
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
+import '../models/bank.dart';
 import '../models/home_filter_widget.dart';
 import '../providers/bank_provider.dart';
 import '../providers/tx_meta_provider.dart';
@@ -17,20 +20,25 @@ class HomeFilterWidgetCard extends StatelessWidget {
     super.key,
     required this.widgetConfig,
     this.editing = false,
-    this.onRemove,
+    this.onToggleDisplay,
+    this.onEdit,
+    this.dragHandle,
   });
 
   final HomeFilterWidget widgetConfig;
   final bool editing;
-  final VoidCallback? onRemove;
+  final ValueChanged<bool>? onToggleDisplay;
+  final VoidCallback? onEdit;
+  final Widget? dragHandle;
 
-  void _open(BuildContext context) {
+  void _openTransactions(BuildContext context) {
     final filter = widgetConfig.filter;
     Navigator.of(context).push(
       MaterialPageRoute<void>(
         builder: (_) => TransactionsScreen(
           initialLabelIds: filter.labelIds,
-          initialSearchInMonthOnly: filter.monthOnly,
+          initialSearchInMonthOnly:
+              widgetConfig.type == HomeWidgetType.budget || filter.monthOnly,
           initialQuery: filter.query,
           initialFlow: filter.flow,
           initialAmountRange: filter.amountRange,
@@ -50,78 +58,68 @@ class HomeFilterWidgetCard extends StatelessWidget {
             ? bank.transactions.first.currency
             : 'EUR');
 
-    final metrics = computeTxFilterMetrics(
-      all: bank.transactions,
-      meta: meta,
-      filter: widgetConfig.filter,
-    );
+    final hidden = editing && !widgetConfig.display;
 
-    return Card(
-      color: colors.surfaceContainer,
-      elevation: 0,
-      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
-      child: InkWell(
-        borderRadius: BorderRadius.circular(16),
-        onTap: editing ? null : () => _open(context),
-        child: Padding(
-          padding: const EdgeInsets.fromLTRB(14, 12, 8, 12),
-          child: Row(
-            children: [
-              Expanded(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Text(
-                      widgetConfig.name,
-                      style: theme.textTheme.titleSmall?.copyWith(
-                        fontWeight: FontWeight.w700,
-                      ),
-                      maxLines: 1,
-                      overflow: TextOverflow.ellipsis,
-                    ),
-                    const SizedBox(height: 8),
-                    Wrap(
-                      spacing: 12,
-                      runSpacing: 6,
-                      children: [
-                        if (widgetConfig.showAmountIn)
-                          _Metric(
-                            label: 'In',
-                            value: formatMoney(metrics.amountIn, currency),
-                            color: AppTheme.accent,
-                          ),
-                        if (widgetConfig.showAmountOut)
-                          _Metric(
-                            label: 'Out',
-                            value: formatMoney(metrics.amountOut, currency),
-                            color: AppTheme.expense,
-                          ),
-                        if (widgetConfig.showCount)
-                          _Metric(
-                            label: 'Txs',
-                            value: '${metrics.count}',
-                            color: colors.primary,
-                          ),
-                      ],
-                    ),
-                  ],
-                ),
-              ),
-              if (editing)
-                IconButton(
-                  tooltip: 'Remove from Home',
-                  onPressed: onRemove,
-                  icon: Icon(
-                    Icons.remove_circle_outline,
-                    color: colors.error,
+    return Opacity(
+      opacity: hidden ? 0.45 : 1,
+      child: Card(
+        color: colors.surfaceContainer,
+        elevation: 0,
+        margin: EdgeInsets.zero,
+        clipBehavior: Clip.antiAlias,
+        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
+        child: InkWell(
+          onTap: editing ? onEdit : () => _openTransactions(context),
+          child: Padding(
+            padding: EdgeInsets.fromLTRB(
+              14,
+              14,
+              editing ? 4 : 14,
+              14,
+            ),
+            child: Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                if (dragHandle != null) ...[
+                  Padding(
+                    padding: const EdgeInsets.only(top: 8),
+                    child: dragHandle!,
                   ),
-                )
-              else
-                Icon(
-                  Icons.chevron_right,
-                  color: colors.onSurfaceVariant,
+                  const SizedBox(width: 4),
+                ],
+                Expanded(
+                  child: widgetConfig.type == HomeWidgetType.budget
+                      ? _BudgetBody(
+                          widgetConfig: widgetConfig,
+                          currency: currency,
+                          transactions: bank.transactions,
+                          meta: meta,
+                        )
+                      : _StatsBody(
+                          widgetConfig: widgetConfig,
+                          currency: currency,
+                          transactions: bank.transactions,
+                          meta: meta,
+                        ),
                 ),
-            ],
+                if (editing && onToggleDisplay != null)
+                  IconButton(
+                    tooltip: widgetConfig.display
+                        ? 'Hide from Home'
+                        : 'Show on Home',
+                    onPressed: () =>
+                        onToggleDisplay!(!widgetConfig.display),
+                    icon: Icon(
+                      widgetConfig.display
+                          ? Icons.remove_circle_outline
+                          : Icons.add_circle_outline,
+                      color: widgetConfig.display
+                          ? colors.error
+                          : colors.primary,
+                    ),
+                  ),
+              ],
+            ),
           ),
         ),
       ),
@@ -129,6 +127,604 @@ class HomeFilterWidgetCard extends StatelessWidget {
   }
 }
 
+String _monthName(DateTime date) {
+  const months = [
+    'January',
+    'February',
+    'March',
+    'April',
+    'May',
+    'June',
+    'July',
+    'August',
+    'September',
+    'October',
+    'November',
+    'December',
+  ];
+  return months[date.month - 1];
+}
+
+String? _subtitleFor(HomeFilterWidget widget) {
+  if (widget.type == HomeWidgetType.budget) return 'MONTHLY LIMIT';
+  if (widget.monthOnly) return _monthName(DateTime.now());
+  return null;
+}
+
+class _IconBadge extends StatelessWidget {
+  const _IconBadge({required this.icon});
+
+  final IconData icon;
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = Theme.of(context).colorScheme;
+    return Container(
+      width: 40,
+      height: 40,
+      decoration: BoxDecoration(
+        borderRadius: BorderRadius.circular(12),
+        border: Border.all(
+          color: colors.outlineVariant.withValues(alpha: 0.55),
+        ),
+        color: colors.surfaceContainerHigh.withValues(alpha: 0.35),
+      ),
+      child: Icon(icon, color: colors.primary, size: 20),
+    );
+  }
+}
+
+class _CardHeader extends StatelessWidget {
+  const _CardHeader({
+    required this.icon,
+    required this.title,
+    this.subtitle,
+    this.trailing,
+  });
+
+  final IconData icon;
+  final String title;
+  final String? subtitle;
+  final Widget? trailing;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final colors = theme.colorScheme;
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        _IconBadge(icon: icon),
+        const SizedBox(width: 12),
+        Expanded(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                title,
+                style: theme.textTheme.titleSmall?.copyWith(
+                  fontWeight: FontWeight.w700,
+                ),
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+              ),
+              if (subtitle != null) ...[
+                const SizedBox(height: 2),
+                Text(
+                  subtitle!,
+                  style: theme.textTheme.labelSmall?.copyWith(
+                    color: colors.onSurfaceVariant,
+                    letterSpacing:
+                        subtitle == 'MONTHLY LIMIT' ? 0.6 : 0,
+                    fontWeight: FontWeight.w500,
+                  ),
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                ),
+              ],
+            ],
+          ),
+        ),
+        if (trailing != null) ...[
+          const SizedBox(width: 8),
+          trailing!,
+        ],
+      ],
+    );
+  }
+}
+
+class _UsedPill extends StatelessWidget {
+  const _UsedPill({required this.label});
+
+  final String label;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final colors = theme.colorScheme;
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
+      decoration: BoxDecoration(
+        color: colors.surfaceContainerHighest.withValues(alpha: 0.65),
+        borderRadius: BorderRadius.circular(999),
+      ),
+      child: Text(
+        label,
+        style: theme.textTheme.labelSmall?.copyWith(
+          color: colors.onSurfaceVariant,
+          fontWeight: FontWeight.w600,
+        ),
+      ),
+    );
+  }
+}
+
+class _StatsBody extends StatelessWidget {
+  const _StatsBody({
+    required this.widgetConfig,
+    required this.currency,
+    required this.transactions,
+    required this.meta,
+  });
+
+  final HomeFilterWidget widgetConfig;
+  final String currency;
+  final List<BankTransaction> transactions;
+  final TxMetaController meta;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final colors = theme.colorScheme;
+    final metrics = computeTxFilterMetrics(
+      all: transactions,
+      meta: meta,
+      filter: widgetConfig.filter,
+    );
+
+    // Prefer a single hero "Spent" figure when that's the main metric.
+    final spentOnly = widgetConfig.showAmountOut &&
+        !widgetConfig.showAmountIn &&
+        !widgetConfig.showCount;
+
+    // Avoid LayoutBuilder/Spacer/Expanded here: half-width rows use
+    // IntrinsicHeight, which cannot measure those widgets.
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        _CardHeader(
+          icon: widgetConfig.icon,
+          title: widgetConfig.name,
+          subtitle: _subtitleFor(widgetConfig),
+        ),
+        if (spentOnly) ...[
+          const SizedBox(height: 32),
+          Text(
+            'Spent',
+            style: theme.textTheme.labelMedium?.copyWith(
+              color: colors.onSurfaceVariant,
+            ),
+          ),
+          const SizedBox(height: 2),
+          Text(
+            formatMoney(metrics.amountOut, currency),
+            style: theme.textTheme.titleMedium?.copyWith(
+              color: AppTheme.expense,
+              fontWeight: FontWeight.w700,
+              height: 1.15,
+            ),
+          ),
+        ] else ...[
+          const SizedBox(height: 14),
+          Wrap(
+            spacing: 16,
+            runSpacing: 8,
+            children: [
+              if (widgetConfig.showAmountIn)
+                _Metric(
+                  label: 'In',
+                  value: formatMoney(metrics.amountIn, currency),
+                  color: AppTheme.accent,
+                ),
+              if (widgetConfig.showAmountOut)
+                _Metric(
+                  label: 'Spent',
+                  value: formatMoney(metrics.amountOut, currency),
+                  color: AppTheme.expense,
+                ),
+              if (widgetConfig.showCount)
+                _Metric(
+                  label: 'Txs',
+                  value: '${metrics.count}',
+                  color: colors.primary,
+                ),
+            ],
+          ),
+        ],
+      ],
+    );
+  }
+}
+
+class _BudgetBody extends StatelessWidget {
+  const _BudgetBody({
+    required this.widgetConfig,
+    required this.currency,
+    required this.transactions,
+    required this.meta,
+  });
+
+  final HomeFilterWidget widgetConfig;
+  final String currency;
+  final List<BankTransaction> transactions;
+  final TxMetaController meta;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final colors = theme.colorScheme;
+    final budget = computeHomeBudgetMetrics(
+      all: transactions,
+      meta: meta,
+      widget: widgetConfig,
+    );
+    final progress = budget.progress.clamp(0.0, 1.0);
+    final over = budget.overBudget;
+    final fillColor = over ? colors.error : colors.primary;
+    // Grayish unfilled track (not green-tinted).
+    final trackColor = Color.alphaBlend(
+      colors.onSurface.withValues(alpha: 0.14),
+      colors.surfaceContainerHigh,
+    );
+    final trackLabelColor = colors.onSurfaceVariant;
+    final spentLabelColor = colors.onSurface;
+    final pct = budget.target <= 0 ? 0 : (progress * 100).round();
+    final half = widgetConfig.halfWidth;
+    final isBar = widgetConfig.chartStyle == HomeWidgetChartStyle.bar;
+    final subtitle = widgetConfig.monthOnly
+        ? _monthName(DateTime.now())
+        : 'MONTHLY LIMIT';
+
+    final capLine = _BudgetLegendLine(
+      bulletColor: trackLabelColor.withValues(alpha: 0.75),
+      textColor: trackLabelColor,
+      fontWeight: FontWeight.w500,
+      text: budget.target <= 0
+          ? '— cap'
+          : formatMoney(budget.target, currency),
+    );
+    final spentLine = _BudgetLegendLine(
+      bulletColor: fillColor,
+      textColor: spentLabelColor,
+      fontWeight: FontWeight.w700,
+      text: formatMoney(budget.used, currency),
+    );
+
+    final isRingOrPie = widgetConfig.chartStyle == HomeWidgetChartStyle.pie ||
+        widgetConfig.chartStyle == HomeWidgetChartStyle.ring;
+
+    Widget ringChart({required double size}) => SizedBox(
+          width: size,
+          height: size,
+          child: CustomPaint(
+            painter: _BudgetChartPainter(
+              progress: budget.target <= 0 ? 0 : progress,
+              style: widgetConfig.chartStyle,
+              fillColor: fillColor,
+              trackColor: trackColor,
+              percentLabel: budget.target > 0 ? '$pct%' : null,
+              labelColor: colors.onSurface,
+              labelScale: 0.32,
+            ),
+          ),
+        );
+
+    // Full-width ring/pie: ring beside header+amounts so the card stays short.
+    if (isRingOrPie && !half) {
+      return Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Expanded(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                _CardHeader(
+                  icon: widgetConfig.icon,
+                  title: widgetConfig.name,
+                  subtitle: subtitle,
+                ),
+                const SizedBox(height: 10),
+                capLine,
+                const SizedBox(height: 6),
+                spentLine,
+              ],
+            ),
+          ),
+          const SizedBox(width: 8),
+          ringChart(size: 68),
+        ],
+      );
+    }
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        _CardHeader(
+          icon: widgetConfig.icon,
+          title: widgetConfig.name,
+          subtitle: subtitle,
+          // Percent lives in the ring/pie center; pill only for full-width bars.
+          trailing: budget.target > 0 && !half && isBar
+              ? _UsedPill(label: '$pct% used')
+              : null,
+        ),
+        const SizedBox(height: 14),
+        switch (widgetConfig.chartStyle) {
+          HomeWidgetChartStyle.bar => Column(
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                _BudgetBar(
+                  progress: budget.target <= 0 ? 0 : progress,
+                  fillColor: fillColor,
+                  trackColor: trackColor,
+                  // Solid rounded bar (not a slider thumb).
+                  height: 14,
+                  percentLabel: half && budget.target > 0 ? '$pct%' : null,
+                ),
+                const SizedBox(height: 10),
+                if (half)
+                  Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      capLine,
+                      const SizedBox(height: 4),
+                      spentLine,
+                    ],
+                  )
+                else
+                  Row(
+                    children: [
+                      Expanded(child: capLine),
+                      const SizedBox(width: 8),
+                      Expanded(
+                        child: Align(
+                          alignment: Alignment.centerRight,
+                          child: spentLine,
+                        ),
+                      ),
+                    ],
+                  ),
+              ],
+            ),
+          HomeWidgetChartStyle.pie || HomeWidgetChartStyle.ring => Row(
+              crossAxisAlignment: CrossAxisAlignment.center,
+              children: [
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      capLine,
+                      const SizedBox(height: 8),
+                      spentLine,
+                    ],
+                  ),
+                ),
+                const SizedBox(width: 10),
+                ringChart(size: 68),
+              ],
+            ),
+        },
+      ],
+    );
+  }
+}
+
+/// Rounded progress bar (no slider thumb).
+class _BudgetBar extends StatelessWidget {
+  const _BudgetBar({
+    required this.progress,
+    required this.fillColor,
+    required this.trackColor,
+    required this.height,
+    this.percentLabel,
+  });
+
+  final double progress;
+  final Color fillColor;
+  final Color trackColor;
+  final double height;
+  final String? percentLabel;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final colors = theme.colorScheme;
+    return SizedBox(
+      height: height,
+      child: ClipRRect(
+        borderRadius: BorderRadius.circular(999),
+        child: Stack(
+          fit: StackFit.expand,
+          children: [
+            ColoredBox(color: trackColor),
+            FractionallySizedBox(
+              widthFactor: progress.clamp(0.0, 1.0),
+              alignment: Alignment.centerLeft,
+              child: ColoredBox(color: fillColor),
+            ),
+            if (percentLabel != null)
+              Center(
+                child: Text(
+                  percentLabel!,
+                  style: theme.textTheme.labelSmall?.copyWith(
+                    color: progress >= 0.45
+                        ? colors.onPrimary
+                        : colors.onSurface,
+                    fontWeight: FontWeight.w800,
+                  ),
+                ),
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _BudgetLegendLine extends StatelessWidget {
+  const _BudgetLegendLine({
+    required this.bulletColor,
+    required this.textColor,
+    required this.text,
+    this.fontWeight = FontWeight.w600,
+  });
+
+  final Color bulletColor;
+  final Color textColor;
+  final String text;
+  final FontWeight fontWeight;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Container(
+          width: 7,
+          height: 7,
+          decoration: BoxDecoration(
+            color: bulletColor,
+            shape: BoxShape.circle,
+          ),
+        ),
+        const SizedBox(width: 8),
+        Flexible(
+          child: Text(
+            text,
+            maxLines: 1,
+            overflow: TextOverflow.ellipsis,
+            style: theme.textTheme.labelMedium?.copyWith(
+              color: textColor,
+              fontWeight: fontWeight,
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class _BudgetChartPainter extends CustomPainter {
+  _BudgetChartPainter({
+    required this.progress,
+    required this.style,
+    required this.fillColor,
+    required this.trackColor,
+    this.percentLabel,
+    this.labelColor,
+    this.labelScale = 0.42,
+  });
+
+  final double progress;
+  final HomeWidgetChartStyle style;
+  final Color fillColor;
+  final Color trackColor;
+  final String? percentLabel;
+  final Color? labelColor;
+  final double labelScale;
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    final center = Offset(size.width / 2, size.height / 2);
+    final radius = math.min(size.width, size.height) / 2;
+    final sweep = 2 * math.pi * progress.clamp(0.0, 1.0);
+
+    if (style == HomeWidgetChartStyle.pie) {
+      // Donut-style pizza: thick ring cutout so % stays readable.
+      final stroke = radius * 0.42;
+      final r = radius - stroke / 2;
+      final trackPaint = Paint()
+        ..color = trackColor
+        ..style = PaintingStyle.stroke
+        ..strokeWidth = stroke;
+      canvas.drawCircle(center, r, trackPaint);
+      if (progress > 0) {
+        canvas.drawArc(
+          Rect.fromCircle(center: center, radius: r),
+          -math.pi / 2,
+          sweep,
+          false,
+          Paint()
+            ..color = fillColor
+            ..style = PaintingStyle.stroke
+            ..strokeWidth = stroke
+            ..strokeCap = StrokeCap.butt,
+        );
+      }
+    } else {
+      // Thick ring with rounded caps (reference mock).
+      final stroke = radius * 0.22;
+      final r = radius - stroke / 2;
+      canvas.drawCircle(
+        center,
+        r,
+        Paint()
+          ..color = trackColor
+          ..style = PaintingStyle.stroke
+          ..strokeWidth = stroke
+          ..strokeCap = StrokeCap.round,
+      );
+      if (progress > 0) {
+        canvas.drawArc(
+          Rect.fromCircle(center: center, radius: r),
+          -math.pi / 2,
+          sweep,
+          false,
+          Paint()
+            ..color = fillColor
+            ..style = PaintingStyle.stroke
+            ..strokeWidth = stroke
+            ..strokeCap = StrokeCap.round,
+        );
+      }
+    }
+
+    final label = percentLabel;
+    if (label != null && labelColor != null) {
+      final tp = TextPainter(
+        text: TextSpan(
+          text: label,
+          style: TextStyle(
+            color: labelColor,
+            fontSize: radius * labelScale,
+            fontWeight: FontWeight.w800,
+            height: 1,
+          ),
+        ),
+        textDirection: TextDirection.ltr,
+      )..layout();
+      tp.paint(
+        canvas,
+        center - Offset(tp.width / 2, tp.height / 2),
+      );
+    }
+  }
+
+  @override
+  bool shouldRepaint(covariant _BudgetChartPainter oldDelegate) {
+    return oldDelegate.progress != progress ||
+        oldDelegate.style != style ||
+        oldDelegate.fillColor != fillColor ||
+        oldDelegate.trackColor != trackColor ||
+        oldDelegate.percentLabel != percentLabel ||
+        oldDelegate.labelColor != labelColor ||
+        oldDelegate.labelScale != labelScale;
+  }
+}
+
 class _Metric extends StatelessWidget {
   const _Metric({
     required this.label,

lib/widgets/home_widgets_sheet.dart

@@ -10,7 +10,6 @@ import '../providers/bank_provider.dart';
 import '../providers/preferences_provider.dart';
 import '../providers/tx_meta_provider.dart';
 import '../widgets/label_filter_dialog.dart';
-import '../widgets/overview_favourites_sheet.dart' show promptFavouriteName;
 
 Future<void> showHomeWidgetsSheet(BuildContext context) {
   return showModalBottomSheet<void>(
@@ -34,33 +33,27 @@ Future<HomeFilterWidget?> composeHomeFilterWidget(
   HomeFilterWidget? existing,
   bool skipFilterDialog = false,
 }) async {
+  // Capture before any modal opens — the caller's element may be rebuilt.
+  final bank = context.read<BankController>();
+  final meta = context.read<TxMetaController>();
+  final navigator = Navigator.of(context);
+
   TransactionFilterSelection? filter = initialFilter ?? existing?.filter;
   if (!skipFilterDialog || filter == null) {
-    final bank = context.read<BankController>();
-    final meta = context.read<TxMetaController>();
     filter = await showTransactionFilterDialog(
-      context,
+      navigator.context,
       available: meta.allLabels,
       transactions: bank.transactions,
       initial: filter ?? const TransactionFilterSelection(labelIds: {}),
     );
-    if (filter == null || !context.mounted) return null;
+    if (filter == null || !navigator.mounted) return null;
   }
 
-  final name = await promptFavouriteName(
-    context,
-    initial: existing?.name ?? '',
-    title: existing == null ? 'Name this widget' : 'Rename widget',
-  );
-  if (name == null || !context.mounted) return null;
-
-  await Future<void>.delayed(Duration.zero);
-  if (!context.mounted) return null;
+  if (!navigator.mounted) return null;
 
   final draft = existing == null
-      ? HomeFilterWidget.fromFilter(name: name, filter: filter)
+      ? HomeFilterWidget.fromFilter(name: 'Filter', filter: filter)
       : existing.copyWith(
-          name: name,
           labelIds: filter.labelIds.toList(growable: false),
           flow: filter.flow,
           amountRange: filter.amountRange,
@@ -68,75 +61,306 @@ Future<HomeFilterWidget?> composeHomeFilterWidget(
           monthOnly: filter.monthOnly,
         );
 
-  return _promptWidgetMetrics(context, draft);
+  // Name is edited inside Widget options (no separate rename dialog).
+  await WidgetsBinding.instance.endOfFrame;
+  if (!navigator.mounted) return null;
+  return _promptWidgetMetrics(navigator.context, draft);
 }
 
 Future<HomeFilterWidget?> _promptWidgetMetrics(
   BuildContext context,
   HomeFilterWidget draft,
 ) {
-  var showIn = draft.showAmountIn;
-  var showOut = draft.showAmountOut;
-  var showCount = draft.showCount;
-
   return showDialog<HomeFilterWidget>(
     context: context,
     useRootNavigator: true,
-    builder: (context) {
-      return StatefulBuilder(
-        builder: (context, setState) {
-          return AlertDialog(
-            title: const Text('Widget metrics'),
-            content: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
+    builder: (context) => _WidgetOptionsDialog(draft: draft),
+  );
+}
+
+class _WidgetOptionsDialog extends StatefulWidget {
+  const _WidgetOptionsDialog({required this.draft});
+
+  final HomeFilterWidget draft;
+
+  @override
+  State<_WidgetOptionsDialog> createState() => _WidgetOptionsDialogState();
+}
+
+class _WidgetOptionsDialogState extends State<_WidgetOptionsDialog> {
+  late HomeWidgetType _type;
+  late String _iconId;
+  late HomeWidgetChartStyle _chartStyle;
+  late HomeBudgetCapMode _budgetCapMode;
+  late int _budgetAverageMonths;
+  late bool _showIn;
+  late bool _showOut;
+  late bool _showCount;
+  late bool _halfWidth;
+  late final TextEditingController _nameController;
+  late final TextEditingController _amountController;
+
+  @override
+  void initState() {
+    super.initState();
+    final draft = widget.draft;
+    _type = draft.type;
+    _iconId = draft.iconId;
+    _chartStyle = draft.chartStyle;
+    _budgetCapMode = draft.budgetCapMode;
+    _budgetAverageMonths = draft.budgetAverageMonths;
+    _showIn = draft.showAmountIn;
+    _showOut = draft.showAmountOut;
+    _showCount = draft.showCount;
+    _halfWidth = draft.halfWidth;
+    _nameController = TextEditingController(text: draft.name);
+    final fixed = draft.budgetFixedAmount;
+    _amountController = TextEditingController(
+      text: fixed > 0
+          ? (fixed == fixed.roundToDouble()
+              ? fixed.toStringAsFixed(0)
+              : fixed.toStringAsFixed(2))
+          : '',
+    );
+  }
+
+  @override
+  void dispose() {
+    _nameController.dispose();
+    _amountController.dispose();
+    super.dispose();
+  }
+
+  void _save() {
+    final name = _nameController.text.trim();
+    if (name.isEmpty) return;
+    if (_type == HomeWidgetType.stats && !_showIn && !_showOut && !_showCount) {
+      return;
+    }
+    var fixed = widget.draft.budgetFixedAmount;
+    if (_type == HomeWidgetType.budget &&
+        _budgetCapMode == HomeBudgetCapMode.fixed) {
+      final parsed = double.tryParse(
+        _amountController.text.trim().replaceAll(',', '.'),
+      );
+      if (parsed == null || parsed <= 0) return;
+      fixed = parsed;
+    }
+    Navigator.of(context).pop(
+      widget.draft.copyWith(
+        name: name,
+        type: _type,
+        iconId: _iconId,
+        chartStyle: _chartStyle,
+        budgetCapMode: _budgetCapMode,
+        budgetFixedAmount: fixed,
+        budgetAverageMonths: _budgetAverageMonths,
+        showAmountIn: _showIn,
+        showAmountOut: _showOut,
+        showCount: _showCount,
+        halfWidth: _halfWidth,
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    return AlertDialog(
+      title: const Text('Widget options'),
+      content: SizedBox(
+        width: double.maxFinite,
+        child: SingleChildScrollView(
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            children: [
+              TextField(
+                controller: _nameController,
+                textCapitalization: TextCapitalization.sentences,
+                decoration: const InputDecoration(
+                  labelText: 'Name',
+                  border: OutlineInputBorder(),
+                  isDense: true,
+                ),
+              ),
+              const SizedBox(height: 16),
+              Text('Type', style: theme.textTheme.titleSmall),
+              const SizedBox(height: 8),
+              SegmentedButton<HomeWidgetType>(
+                showSelectedIcon: false,
+                segments: const [
+                  ButtonSegment(
+                    value: HomeWidgetType.stats,
+                    label: Text('Stats'),
+                    icon: Icon(Icons.analytics_outlined),
+                  ),
+                  ButtonSegment(
+                    value: HomeWidgetType.budget,
+                    label: Text('Budget'),
+                    icon: Icon(Icons.savings_outlined),
+                  ),
+                ],
+                selected: {_type},
+                onSelectionChanged: (value) {
+                  setState(() => _type = value.first);
+                },
+              ),
+              const SizedBox(height: 16),
+              Text('Icon', style: theme.textTheme.titleSmall),
+              const SizedBox(height: 8),
+              Wrap(
+                spacing: 6,
+                runSpacing: 6,
+                children: [
+                  for (final entry in HomeWidgetIcons.all)
+                    ChoiceChip(
+                      label: Icon(entry.$2, size: 18),
+                      selected: _iconId == entry.$1,
+                      onSelected: (_) => setState(() => _iconId = entry.$1),
+                      tooltip: entry.$3,
+                      visualDensity: VisualDensity.compact,
+                      padding: const EdgeInsets.all(4),
+                    ),
+                ],
+              ),
+              const SizedBox(height: 12),
+              SwitchListTile(
+                contentPadding: EdgeInsets.zero,
+                title: const Text('Half width'),
+                subtitle: const Text('Share the row with another widget'),
+                value: _halfWidth,
+                onChanged: (value) => setState(() => _halfWidth = value),
+              ),
+              if (_type == HomeWidgetType.stats) ...[
+                const Divider(),
                 CheckboxListTile(
                   contentPadding: EdgeInsets.zero,
                   title: const Text('Amount in'),
-                  value: showIn,
+                  value: _showIn,
                   onChanged: (value) =>
-                      setState(() => showIn = value ?? false),
+                      setState(() => _showIn = value ?? false),
                 ),
                 CheckboxListTile(
                   contentPadding: EdgeInsets.zero,
-                  title: const Text('Amount out'),
-                  value: showOut,
+                  title: const Text('Spent'),
+                  value: _showOut,
                   onChanged: (value) =>
-                      setState(() => showOut = value ?? false),
+                      setState(() => _showOut = value ?? false),
                 ),
                 CheckboxListTile(
                   contentPadding: EdgeInsets.zero,
                   title: const Text('Number of transactions'),
-                  value: showCount,
+                  value: _showCount,
                   onChanged: (value) =>
-                      setState(() => showCount = value ?? false),
+                      setState(() => _showCount = value ?? false),
+                ),
+              ] else ...[
+                const Divider(),
+                Text('Budget cap', style: theme.textTheme.titleSmall),
+                const SizedBox(height: 8),
+                SegmentedButton<HomeBudgetCapMode>(
+                  showSelectedIcon: false,
+                  segments: const [
+                    ButtonSegment(
+                      value: HomeBudgetCapMode.fixed,
+                      label: Text('Fixed'),
+                    ),
+                    ButtonSegment(
+                      value: HomeBudgetCapMode.averageMonths,
+                      label: Text('Average'),
+                    ),
+                  ],
+                  selected: {_budgetCapMode},
+                  onSelectionChanged: (value) {
+                    setState(() => _budgetCapMode = value.first);
+                  },
+                ),
+                const SizedBox(height: 12),
+                if (_budgetCapMode == HomeBudgetCapMode.fixed)
+                  TextField(
+                    controller: _amountController,
+                    keyboardType: const TextInputType.numberWithOptions(
+                      decimal: true,
+                    ),
+                    decoration: const InputDecoration(
+                      labelText: 'Budget amount',
+                      hintText: 'e.g. 500',
+                      border: OutlineInputBorder(),
+                      isDense: true,
+                    ),
+                  )
+                else
+                  DropdownButtonFormField<int>(
+                    key: ValueKey(_budgetAverageMonths),
+                    initialValue: _budgetAverageMonths,
+                    isExpanded: true,
+                    decoration: const InputDecoration(
+                      labelText: 'Average of last N months',
+                      border: OutlineInputBorder(),
+                      isDense: true,
+                    ),
+                    items: [
+                      for (final n in const [1, 2, 3, 6, 12, 24])
+                        DropdownMenuItem(
+                          value: n,
+                          child: Text('$n months'),
+                        ),
+                    ],
+                    onChanged: (value) {
+                      if (value == null) return;
+                      setState(() => _budgetAverageMonths = value);
+                    },
+                  ),
+                const SizedBox(height: 16),
+                Text('Chart', style: theme.textTheme.titleSmall),
+                const SizedBox(height: 8),
+                Wrap(
+                  spacing: 8,
+                  children: [
+                    for (final entry in const [
+                      (HomeWidgetChartStyle.bar, Icons.linear_scale, 'Bar'),
+                      (
+                        HomeWidgetChartStyle.pie,
+                        Icons.pie_chart_outline,
+                        'Pie'
+                      ),
+                      (HomeWidgetChartStyle.ring, Icons.donut_large, 'Ring'),
+                    ])
+                      ChoiceChip(
+                        avatar: Icon(entry.$2, size: 18),
+                        label: Text(entry.$3),
+                        selected: _chartStyle == entry.$1,
+                        onSelected: (_) =>
+                            setState(() => _chartStyle = entry.$1),
+                      ),
+                  ],
+                ),
+                const SizedBox(height: 8),
+                Text(
+                  'Progress uses this month’s net (|in − out|) for the '
+                  'filter toward the cap.',
+                  style: theme.textTheme.bodySmall?.copyWith(
+                    color: theme.colorScheme.onSurfaceVariant,
+                  ),
                 ),
               ],
-            ),
-            actions: [
-              TextButton(
-                onPressed: () => Navigator.of(context).pop(),
-                child: const Text('Cancel'),
-              ),
-              FilledButton(
-                onPressed: () {
-                  if (!showIn && !showOut && !showCount) return;
-                  Navigator.of(context).pop(
-                    draft.copyWith(
-                      showAmountIn: showIn,
-                      showAmountOut: showOut,
-                      showCount: showCount,
-                    ),
-                  );
-                },
-                child: const Text('Save'),
-              ),
             ],
-          );
-        },
-      );
-    },
-  );
+          ),
+        ),
+      ),
+      actions: [
+        TextButton(
+          onPressed: () => Navigator.of(context).pop(),
+          child: const Text('Cancel'),
+        ),
+        FilledButton(
+          onPressed: _save,
+          child: const Text('Save'),
+        ),
+      ],
+    );
+  }
 }
 
 class _HomeWidgetsSheet extends StatelessWidget {
@@ -161,11 +385,11 @@ class _HomeWidgetsSheet extends StatelessWidget {
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                  Text('Home widgets', style: theme.textTheme.titleLarge),
+                  Text('Home layout', style: theme.textTheme.titleLarge),
                   const SizedBox(height: 4),
                   Text(
-                    'Pin saved transaction filters on Home. Check Display to '
-                    'show a widget; edit metrics or remove anytime.',
+                    'Choose which built-in sections and filter widgets appear '
+                    'on Home. Check Display to show an item.',
                     style: theme.textTheme.bodyMedium?.copyWith(
                       color: theme.colorScheme.onSurfaceVariant,
                     ),
@@ -174,12 +398,51 @@ class _HomeWidgetsSheet extends StatelessWidget {
               ),
             ),
             Padding(
-              padding: const EdgeInsets.fromLTRB(16, 0, 16, 8),
+              padding: const EdgeInsets.fromLTRB(8, 0, 8, 0),
+              child: Column(
+                children: [
+                  CheckboxListTile(
+                    value: prefs.homeBuiltInSections.showTransactions,
+                    onChanged: (value) {
+                      if (value == null) return;
+                      prefs.setHomeShowTransactions(value);
+                    },
+                    title: const Text('Transactions'),
+                    subtitle: const Text('Total transaction count'),
+                    controlAffinity: ListTileControlAffinity.leading,
+                  ),
+                  CheckboxListTile(
+                    value: prefs.homeBuiltInSections.showCategorized,
+                    onChanged: (value) {
+                      if (value == null) return;
+                      prefs.setHomeShowCategorized(value);
+                    },
+                    title: const Text('Categorized'),
+                    subtitle: const Text('Labeled transaction count'),
+                    controlAffinity: ListTileControlAffinity.leading,
+                  ),
+                  CheckboxListTile(
+                    value: prefs.homeBuiltInSections.showRecent,
+                    onChanged: (value) {
+                      if (value == null) return;
+                      prefs.setHomeShowRecent(value);
+                    },
+                    title: const Text('Recent transactions'),
+                    subtitle: const Text('Latest activity list'),
+                    controlAffinity: ListTileControlAffinity.leading,
+                  ),
+                ],
+              ),
+            ),
+            const Divider(height: 1),
+            Padding(
+              padding: const EdgeInsets.fromLTRB(16, 8, 16, 8),
               child: OutlinedButton.icon(
                 onPressed: () async {
+                  final preferences = context.read<PreferencesController>();
                   final created = await composeHomeFilterWidget(context);
-                  if (created == null || !context.mounted) return;
-                  await prefs.addHomeFilterWidget(created);
+                  if (created == null) return;
+                  await preferences.addHomeFilterWidget(created);
                 },
                 icon: const Icon(Icons.add),
                 label: const Text('Add filter widget'),
@@ -192,8 +455,8 @@ class _HomeWidgetsSheet extends StatelessWidget {
                       child: Padding(
                         padding: const EdgeInsets.all(24),
                         child: Text(
-                          'No widgets yet. Add a filter, or save one from '
-                          'Transactions.',
+                          'No filter widgets yet. Add one here, or save a '
+                          'filter from Transactions.',
                           textAlign: TextAlign.center,
                           style: theme.textTheme.bodyMedium?.copyWith(
                             color: theme.colorScheme.onSurfaceVariant,
@@ -216,17 +479,35 @@ class _HomeWidgetsSheet extends StatelessWidget {
                               value,
                             );
                           },
-                          secondary: IconButton(
-                            tooltip: 'Edit',
-                            onPressed: () async {
-                              final updated = await composeHomeFilterWidget(
-                                context,
-                                existing: widgetItem,
-                              );
-                              if (updated == null || !context.mounted) return;
-                              await prefs.updateHomeFilterWidget(updated);
+                          secondary: PopupMenuButton<String>(
+                            tooltip: 'Widget actions',
+                            onSelected: (value) async {
+                              if (value == 'edit') {
+                                final preferences =
+                                    context.read<PreferencesController>();
+                                final updated =
+                                    await composeHomeFilterWidget(
+                                  context,
+                                  existing: widgetItem,
+                                );
+                                if (updated == null) return;
+                                await preferences
+                                    .updateHomeFilterWidget(updated);
+                              } else if (value == 'delete') {
+                                await prefs
+                                    .removeHomeFilterWidget(widgetItem.id);
+                              }
                             },
-                            icon: const Icon(Icons.edit_outlined),
+                            itemBuilder: (context) => const [
+                              PopupMenuItem(
+                                value: 'edit',
+                                child: Text('Edit'),
+                              ),
+                              PopupMenuItem(
+                                value: 'delete',
+                                child: Text('Delete'),
+                              ),
+                            ],
                           ),
                           title: Text(widgetItem.name),
                           subtitle: Text(
@@ -247,14 +528,21 @@ class _HomeWidgetsSheet extends StatelessWidget {
 
   static String _subtitle(HomeFilterWidget w) {
     final parts = <String>[
+      w.type == HomeWidgetType.budget ? 'Budget' : 'Stats',
+      if (w.type == HomeWidgetType.budget)
+        w.budgetCapMode == HomeBudgetCapMode.fixed
+            ? 'Fixed'
+            : 'Avg ${w.budgetAverageMonths}mo',
+      if (w.type == HomeWidgetType.budget) w.chartStyle.name,
       if (w.monthOnly) 'This month',
       if (w.flow != TxFlowFilter.all) w.flow.name,
       if (w.labelIds.isNotEmpty) '${w.labelIds.length} labels',
       if (w.query.trim().isNotEmpty) '“${w.query.trim()}”',
-      if (w.showAmountIn) 'In',
-      if (w.showAmountOut) 'Out',
-      if (w.showCount) 'Count',
+      if (w.type == HomeWidgetType.stats && w.showAmountIn) 'In',
+      if (w.type == HomeWidgetType.stats && w.showAmountOut) 'Spent',
+      if (w.type == HomeWidgetType.stats && w.showCount) 'Count',
+      if (w.halfWidth) 'Half',
     ];
-    return parts.isEmpty ? 'All transactions' : parts.join(' · ');
+    return parts.join(' · ');
   }
 }

lib/widgets/skip_build_when_covered.dart

@@ -9,8 +9,9 @@ final RouteObserver<ModalRoute<void>> appRouteObserver =
 
 /// Builds via [builder] only when this route is not covered by a pushed page.
 ///
-/// Uses [ModalRoute.isCurrent] so nested dialogs above a bottom sheet do not
-/// falsely "uncover" the page when the dialog pops (sheet still open).
+/// Only [PageRoute]s count as covering (via [RouteAware]). Modal bottom sheets
+/// and dialogs must not tear down the subtree — async flows started from Home
+/// (e.g. compose widget → name → options) need a mounted context between steps.
 class SkipBuildWhenCovered extends StatefulWidget {
   const SkipBuildWhenCovered({
     super.key,
@@ -29,13 +30,6 @@ class _SkipBuildWhenCoveredState extends State<SkipBuildWhenCovered>
     with RouteAware {
   var _covered = false;
 
-  void _syncCovered() {
-    final route = ModalRoute.of(context);
-    final covered = route != null && !route.isCurrent;
-    if (covered == _covered) return;
-    setState(() => _covered = covered);
-  }
-
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
@@ -43,7 +37,6 @@ class _SkipBuildWhenCoveredState extends State<SkipBuildWhenCovered>
     if (route is PageRoute) {
       appRouteObserver.subscribe(this, route);
     }
-    _syncCovered();
   }
 
   @override
@@ -53,10 +46,14 @@ class _SkipBuildWhenCoveredState extends State<SkipBuildWhenCovered>
   }
 
   @override
-  void didPushNext() => _syncCovered();
+  void didPushNext() {
+    if (!_covered) setState(() => _covered = true);
+  }
 
   @override
-  void didPopNext() => _syncCovered();
+  void didPopNext() {
+    if (_covered) setState(() => _covered = false);
+  }
 
   @override
   Widget build(BuildContext context) {

pocketbase/pb_migrations/1740000004_ingtrak_home_filter_widgets.js

@@ -57,6 +57,46 @@ migrate((app) => {
         required: false,
         onlyInt: true,
       },
+      {
+        type: "bool",
+        name: "half_width",
+        required: false,
+      },
+      {
+        type: "text",
+        name: "widget_type",
+        required: false,
+        max: 40,
+      },
+      {
+        type: "text",
+        name: "icon_id",
+        required: false,
+        max: 40,
+      },
+      {
+        type: "text",
+        name: "chart_style",
+        required: false,
+        max: 40,
+      },
+      {
+        type: "text",
+        name: "budget_cap_mode",
+        required: false,
+        max: 40,
+      },
+      {
+        type: "number",
+        name: "budget_fixed_amount",
+        required: false,
+      },
+      {
+        type: "number",
+        name: "budget_average_months",
+        required: false,
+        onlyInt: true,
+      },
       {
         type: "json",
         name: "label_ids",

pocketbase/pb_migrations/1740000005_ingtrak_home_widgets_half_width.js

@@ -0,0 +1,25 @@
+/// PocketBase migration: half_width on home_filter_widgets.
+///
+/// Apply after 1740000004 if that collection already exists without half_width.
+/// For new installs, 1740000004 already creates half_width — this is a no-op then.
+migrate((app) => {
+  const col = app.findCollectionByNameOrId("home_filter_widgets");
+  if (col.fields.getByName("half_width")) return;
+
+  // Automigrate-style constructor (plain objects are rejected by fields.add).
+  col.fields.add(new Field({
+    type: "bool",
+    name: "half_width",
+    required: false,
+  }));
+  app.save(col);
+}, (app) => {
+  try {
+    const col = app.findCollectionByNameOrId("home_filter_widgets");
+    const field = col.fields.getByName("half_width");
+    if (field) {
+      col.fields.removeById(field.id);
+      app.save(col);
+    }
+  } catch (_) {}
+});

pocketbase/pb_migrations/1740000006_ingtrak_home_widgets_budget.js

@@ -0,0 +1,63 @@
+/// PocketBase migration: budget / chart / icon fields on home_filter_widgets.
+migrate((app) => {
+  const col = app.findCollectionByNameOrId("home_filter_widgets");
+
+  const addIfMissing = (config) => {
+    if (col.fields.getByName(config.name)) return;
+    col.fields.add(new Field(config));
+  };
+
+  addIfMissing({
+    type: "text",
+    name: "widget_type",
+    required: false,
+    max: 40,
+  });
+  addIfMissing({
+    type: "text",
+    name: "icon_id",
+    required: false,
+    max: 40,
+  });
+  addIfMissing({
+    type: "text",
+    name: "chart_style",
+    required: false,
+    max: 40,
+  });
+  addIfMissing({
+    type: "text",
+    name: "budget_cap_mode",
+    required: false,
+    max: 40,
+  });
+  addIfMissing({
+    type: "number",
+    name: "budget_fixed_amount",
+    required: false,
+  });
+  addIfMissing({
+    type: "number",
+    name: "budget_average_months",
+    required: false,
+    onlyInt: true,
+  });
+
+  app.save(col);
+}, (app) => {
+  try {
+    const col = app.findCollectionByNameOrId("home_filter_widgets");
+    for (const name of [
+      "widget_type",
+      "icon_id",
+      "chart_style",
+      "budget_cap_mode",
+      "budget_fixed_amount",
+      "budget_average_months",
+    ]) {
+      const field = col.fields.getByName(name);
+      if (field) col.fields.removeById(field.id);
+    }
+    app.save(col);
+  } catch (_) {}
+});

pocketbase/pb_migrations/1740000007_ingtrak_app_prefs.js

@@ -0,0 +1,67 @@
+/// PocketBase migration: per-user app preferences (Home sections + Look ahead).
+///
+/// Apply on the server:
+///
+///   sudo cp this_file /opt/pocketbase/pb_migrations/
+///   sudo chown pocketbase:pocketbase /opt/pocketbase/pb_migrations/*.js
+///   sudo -u pocketbase /opt/pocketbase/pocketbase migrate up
+///   sudo systemctl restart pocketbase
+///
+/// Depends on usersapp.
+migrate((app) => {
+  const users = app.findCollectionByNameOrId("usersapp");
+
+  const ownerRules = {
+    listRule: "user = @request.auth.id",
+    viewRule: "user = @request.auth.id",
+    createRule: "@request.auth.id != '' && user = @request.auth.id",
+    updateRule: "user = @request.auth.id",
+    deleteRule: "user = @request.auth.id",
+  };
+
+  const appPrefs = new Collection({
+    type: "base",
+    name: "app_prefs",
+    ...ownerRules,
+    fields: [
+      {
+        type: "relation",
+        name: "user",
+        required: true,
+        collectionId: users.id,
+        cascadeDelete: true,
+        maxSelect: 1,
+      },
+      {
+        type: "bool",
+        name: "home_show_transactions",
+        required: false,
+      },
+      {
+        type: "bool",
+        name: "home_show_categorized",
+        required: false,
+      },
+      {
+        type: "bool",
+        name: "home_show_recent",
+        required: false,
+      },
+      {
+        type: "number",
+        name: "look_ahead_max_years",
+        required: false,
+        onlyInt: true,
+      },
+    ],
+    indexes: [
+      "CREATE UNIQUE INDEX idx_app_prefs_user ON app_prefs (user)",
+    ],
+  });
+  app.save(appPrefs);
+}, (app) => {
+  try {
+    const col = app.findCollectionByNameOrId("app_prefs");
+    app.delete(col);
+  } catch (_) {}
+});

pubspec.lock

@@ -33,6 +33,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      sha256: ace891da0862b0e4cabbb064ee3fd87b2728b898949fdb366d83fe98342c9f19
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.2.0"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.7.0"
   async:
     dependency: transitive
     description:
@@ -57,6 +73,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.1"
+  checked_yaml:
+    dependency: transitive
+    description:
+      name: checked_yaml
+      sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.4"
+  cli_util:
+    dependency: transitive
+    description:
+      name: cli_util
+      sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.2"
   clock:
     dependency: transitive
     description:
@@ -150,6 +182,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.0.1"
+  flutter_launcher_icons:
+    dependency: "direct dev"
+    description:
+      name: flutter_launcher_icons
+      sha256: "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.14.4"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -200,6 +240,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.1.2"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      sha256: "1976370a4df3091bb0f72409c187ad1f9132a818bc6b95ca59c0bae1c75c688e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.9.2"
   json_annotation:
     dependency: transitive
     description:
@@ -328,6 +376,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.25.1"
+  posix:
+    dependency: transitive
+    description:
+      name: posix
+      sha256: bc1bad54ad2b735816e31f8d4600cfde6c7839975085ddfbca48b6c9f7c4044e
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.5.2"
   provider:
     dependency: "direct main"
     description:
@@ -525,6 +581,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
+  yaml:
+    dependency: transitive
+    description:
+      name: yaml
+      sha256: f67cdd8e07d3c6329146aaef1ba043542b3134c12489f553ca9a7435d1068aea
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.4"
 sdks:
   dart: ">=3.13.2 <4.0.0"
   flutter: ">=3.44.0"

pubspec.yaml

@@ -53,6 +53,15 @@ dev_dependencies:
   # package. See that file for information about deactivating specific lint
   # rules and activating additional ones.
   flutter_lints: ^6.0.0
+  flutter_launcher_icons: ^0.14.4
+
+flutter_launcher_icons:
+  android: true
+  ios: false
+  image_path: assets/branding/app_icon.png
+  adaptive_icon_background: "#1A1C1B"
+  adaptive_icon_foreground: assets/branding/app_icon_foreground.png
+  min_sdk_android: 21
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
@@ -68,6 +77,7 @@ flutter:
   assets:
     - .env
     - .env.example
+    - assets/branding/app_icon.png
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/to/resolution-aware-images

test/home_filter_widget_test.dart

@@ -22,6 +22,26 @@ void main() {
     expect(restored.showAmountOut, isTrue);
     expect(restored.showAmountIn, isFalse);
     expect(restored.showCount, isTrue);
+    expect(restored.halfWidth, isFalse);
+    expect(restored.type, HomeWidgetType.stats);
+
+    final budget = widget.copyWith(
+      halfWidth: true,
+      type: HomeWidgetType.budget,
+      iconId: 'cart',
+      chartStyle: HomeWidgetChartStyle.ring,
+      budgetCapMode: HomeBudgetCapMode.averageMonths,
+      budgetAverageMonths: 6,
+      budgetFixedAmount: 250,
+    );
+    final budgetRestored = HomeFilterWidget.fromJson(budget.toJson());
+    expect(budgetRestored.halfWidth, isTrue);
+    expect(budgetRestored.type, HomeWidgetType.budget);
+    expect(budgetRestored.iconId, 'cart');
+    expect(budgetRestored.chartStyle, HomeWidgetChartStyle.ring);
+    expect(budgetRestored.budgetCapMode, HomeBudgetCapMode.averageMonths);
+    expect(budgetRestored.budgetAverageMonths, 6);
+    expect(budgetRestored.budgetFixedAmount, 250);
   });
 
   test('mergeHomeFilterWidgets unions by id with local wins', () {