user_changes.patch

diff --git a/CHANGELOG.md b/CHANGELOG.md
index daba9dc..6229513 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,57 @@ All notable changes to ZooPed will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.2.0] - 2026-06-17
+
+### Added
+
+- **Litters & Offspring** - New 4th tab on Dog Profile displaying linked litters and directly-sired offspring.
+- **Dashboard Filtering** - Added comprehensive bottom sheet filters allowing A-Z, Age, Recent sorting, and Male/Female filtering.
+- **Dynamic Theming** - Replaced legacy static colors with dynamic appearance settings. Users can toggle Dark/Light mode and select from 6 premium color accents.
+- **Official Pedigree PDF** - Massively upgraded the "Share PDF" layout to an official A4 Landscape certificate containing the 3-generation visual pedigree tree and preloaded ancestral photos.
+
+### Fixed
+- **Architectural Polish** - Achieved 0 compiler warnings, permanently resolving missing BuildContext checks across deep async gaps and deprecation alerts inside forms.
+
+## [1.1.1] - 2026-06-17
+
+### Added
+
+- **Kennel Contacts** - Added specific Phone, WhatsApp, and Email fields to Kennel Profile
+- **Database Schema v6** - Migrated local database to support expanded profile fields
+
+### Fixed
+
+- **Dashboard Refresh** - Fixed an issue where the dog list wouldn't update immediately after a dog was deleted
+- **Database Size Refresh** - Added SQLite VACUUM optimization to accurately calculate and compress the database size when refreshing backups
+
+## [1.1.0] - 2026-06-17
+
+### Added
+
+- **Edit Dog Screen** - Edit existing dog profiles via `/dog/:id/edit` route
+- **Litter Browse Screen** - List all registered litters with sire/dam names and puppy counts
+- **Dog Photo Support** - Add photos to dog profiles; displayed on detail screen
+- **CSV Import Dedup** - Import validation skips duplicates by registered name and microchip
+
+### Fixed
+
+- **Pedigree Tree Performance** - Replaced N+1 recursive queries with batched ancestor loading
+- **Updated about screen logo and layout**
+
+## [1.0.1] - 2026-06-17
+
+### Added
+
+- Added Great Grandparents to the pedigree tree (5-generation display)
+
+### Fixed
+
+- Fixed pedigree tree connection wires rendering
+- Fixed duplicate dog database insertion error when adding new dogs
+- Patched a memory leak in the pedigree canvas
+- Resolved duplicate search suggestion entries
+
 ## [1.0.0] - 2026-06-14
 
 ### Added
diff --git a/README.md b/README.md
index fe265fc..bcdfeb7 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 
 A Flutter Android application for tracking dog pedigrees, designed for professional breeders and kennel clubs.
 
-**Package:** `com.zooped.niiabe` | **Version:** 1.0.0 | **License:** Private
+**Package:** `com.zooped.niiabe` | **Version:** 1.2.0 | **License:** Private
 
 ## Platform
 
@@ -21,6 +21,7 @@ A Flutter Android application for tracking dog pedigrees, designed for professio
 - **Litter Tracking** - Record matings, whelping dates, and auto-create puppy profiles with inherited parentage
 - **Custom Kennel Branding** - Upload kennel logo and configure breeder profile (logo-driven theme)
 - **CSV Backup & Import** - Export and import all dog/litter data as CSV files from the app documents directory
+- **Dynamic Theming** - Switch between Dark/Light modes and multiple accent colors
 - **Offline-First** - All data stored locally using SQLite via Drift
 
 ## Screenshots
@@ -143,11 +144,13 @@ flutter build apk --release
 
 ## UI Screens
 
-1. **Dashboard** - Search bar, dog list, quick-add FAB
-2. **Dog Detail** - Identity card + interactive 3-gen pedigree canvas with PDF export/share
-3. **Litter Form** - 3-step wizard (parents -> dates -> puppy roster)
-4. **Settings** - Kennel profile, logo upload, CSV backup/import
-5. **About** - Developer info, links, in-app changelog
+1. **Dashboard** - Search bar, dog list, quick-add FAB, litter list link
+2. **Dog Detail** - Identity card, photo, interactive pedigree canvas with PDF export/share
+3. **Dog Edit** - Edit existing dog profiles with photo upload
+4. **Litter List** - Browse all registered litters with details
+5. **Litter Form** - 3-step wizard (parents -> dates -> puppy roster)
+6. **Settings** - Kennel profile, logo upload, CSV backup/import with dedup validation
+7. **About** - Developer info, links, in-app changelog
 
 ## Changelog
 
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 1c62dfe..291a349 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -13,7 +13,6 @@ linter:
     - sized_box_for_whitespace
     - prefer_is_empty
     - prefer_is_not_empty
-    - avoid_relative_lib_imports
     - prefer_relative_imports
     - always_declare_return_types
     - annotate_overrides
diff --git a/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png
index b0673d3..15232b8 100644
Binary files a/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png and b/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png
index 2cb5f65..4f17be1 100644
Binary files a/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png and b/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png
index 0ea785a..55f3882 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png
index eae53e0..f9ecca2 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png
index 3537b9e..2b7a875 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 6e8c343..6f45359 100644
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index bfe7cb1..357ea0f 100644
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 20a279e..32707a8 100644
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 8f0dfc7..401ce4c 100644
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index bd825f2..9f7aeca 100644
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/appbarlogo.png b/appbarlogo.png
deleted file mode 100644
index 81176a5..0000000
Binary files a/appbarlogo.png and /dev/null differ
diff --git a/assets/images/ZooPed.png b/assets/images/ZooPed.png
index abf2f75..20bd6db 100644
Binary files a/assets/images/ZooPed.png and b/assets/images/ZooPed.png differ
diff --git a/assets/images/logo.png b/assets/images/logo.png
index 7f7f811..64cb3a7 100644
Binary files a/assets/images/logo.png and b/assets/images/logo.png differ
diff --git a/lib/core/database/app_database.dart b/lib/core/database/app_database.dart
index fb6a73b..e674ad0 100644
--- a/lib/core/database/app_database.dart
+++ b/lib/core/database/app_database.dart
@@ -10,7 +10,10 @@ class KennelProfile extends Table {
   IntColumn get id => integer().withDefault(const Constant(1))();
   TextColumn get kennelName => text().withLength(min: 1, max: 100)();
   TextColumn get breederName => text().nullable()();
-  TextColumn get contactInfo => text().nullable()();
+  TextColumn get contactInfo => text().nullable()(); // legacy
+  TextColumn get phone => text().nullable()();
+  TextColumn get whatsapp => text().nullable()();
+  TextColumn get email => text().nullable()();
   TextColumn get localLogoPath => text().nullable()();
 
   @override
@@ -27,7 +30,9 @@ class Dogs extends Table {
   TextColumn get colorMarkings => text().nullable()();
   
   // Self-referencing foreign keys for lineage
+  @ReferenceName('siredDogs')
   IntColumn get sireId => integer().references(Dogs, #id).nullable()();
+  @ReferenceName('damDogs')
   IntColumn get damId => integer().references(Dogs, #id).nullable()();
   IntColumn get litterId => integer().nullable()(); // No foreign key to avoid circular reference
   
@@ -37,14 +42,17 @@ class Dogs extends Table {
   TextColumn get registerType => text().nullable()(); // 'SP', 'SR', 'B'
   TextColumn get dnaProfileNumber => text().nullable()();
   
+  TextColumn get photoPath => text().nullable()();
   TextColumn get notes => text().nullable()();
   DateTimeColumn get createdAt => dateTime().withDefault(currentDateAndTime)();
 }
 
 class Litters extends Table {
   IntColumn get id => integer().autoIncrement()();
-  IntColumn get sireId => integer().references(Dogs, #id)();
-  IntColumn get damId => integer().references(Dogs, #id)();
+  @ReferenceName('siredLitters')
+  IntColumn get sireId => integer().references(Dogs, #id).nullable()();
+  @ReferenceName('damLitters')
+  IntColumn get damId => integer().references(Dogs, #id).nullable()();
   DateTimeColumn get matingDate => dateTime().nullable()();
   DateTimeColumn get whelpingDate => dateTime()();
   IntColumn get puppiesBornAlive => integer().withDefault(const Constant(0))();
@@ -52,28 +60,110 @@ class Litters extends Table {
   TextColumn get notes => text().nullable()();
 }
 
-@DriftDatabase(tables: [KennelProfile, Dogs, Litters])
+class DogPhotos extends Table {
+  IntColumn get id => integer().autoIncrement()();
+  IntColumn get dogId => integer().references(Dogs, #id)();
+  TextColumn get photoPath => text()();
+  TextColumn get caption => text().nullable()();
+  DateTimeColumn get dateAdded => dateTime().withDefault(currentDateAndTime)();
+}
+
+class HealthRecords extends Table {
+  IntColumn get id => integer().autoIncrement()();
+  IntColumn get dogId => integer().references(Dogs, #id)();
+  TextColumn get recordType => text().withLength(min: 1, max: 50)(); // 'Vaccine', 'Deworming', 'Vet', 'Heat'
+  DateTimeColumn get date => dateTime()();
+  DateTimeColumn get nextDueDate => dateTime().nullable()();
+  TextColumn get notes => text().nullable()();
+  DateTimeColumn get createdAt => dateTime().withDefault(currentDateAndTime)();
+}
+
+class ShowRecords extends Table {
+  IntColumn get id => integer().autoIncrement()();
+  IntColumn get dogId => integer().references(Dogs, #id)();
+  TextColumn get eventName => text().withLength(min: 1, max: 100)();
+  DateTimeColumn get date => dateTime()();
+  TextColumn get judge => text().nullable()();
+  TextColumn get placement => text().nullable()();
+  TextColumn get titleAwarded => text().nullable()();
+  TextColumn get notes => text().nullable()();
+  DateTimeColumn get createdAt => dateTime().withDefault(currentDateAndTime)();
+}
+
+@DriftDatabase(
+  tables: [KennelProfile, Dogs, Litters, DogPhotos, HealthRecords, ShowRecords],
+  daos: [],
+)
 class AppDatabase extends _$AppDatabase {
   AppDatabase() : super(_openConnection());
 
   @override
-  int get schemaVersion => 1;
+  int get schemaVersion => 7;
 
   @override
   MigrationStrategy get migration {
     return MigrationStrategy(
       onCreate: (Migrator m) async {
         await m.createAll();
-        // Insert default kennel profile
         await into(kennelProfile).insert(
           KennelProfileCompanion.insert(
             kennelName: 'My Kennel',
           ),
         );
       },
+      onUpgrade: (Migrator m, int from, int to) async {
+        if (from < 2) {
+          await m.addColumn(dogs, dogs.photoPath);
+        }
+        if (from < 3) {
+          await m.createTable(dogPhotos);
+        }
+        if (from < 4) {
+          await m.createTable(healthRecords);
+        }
+        if (from < 5) {
+          await m.createTable(showRecords);
+        }
+        if (from < 6) {
+          await m.addColumn(kennelProfile, kennelProfile.phone);
+          await m.addColumn(kennelProfile, kennelProfile.whatsapp);
+          await m.addColumn(kennelProfile, kennelProfile.email);
+        }
+        if (from < 7) {
+          await customStatement('PRAGMA foreign_keys = OFF');
+          await customStatement('CREATE INDEX IF NOT EXISTS idx_dogs_sire_id ON dogs(sire_id)');
+          await customStatement('CREATE INDEX IF NOT EXISTS idx_dogs_dam_id ON dogs(dam_id)');
+          await customStatement('CREATE INDEX IF NOT EXISTS idx_dogs_litter_id ON dogs(litter_id)');
+          await customStatement('CREATE INDEX IF NOT EXISTS idx_dogs_sex ON dogs(sex)');
+          await customStatement('CREATE INDEX IF NOT EXISTS idx_litters_sire_id ON litters(sire_id)');
+          await customStatement('CREATE INDEX IF NOT EXISTS idx_litters_dam_id ON litters(dam_id)');
+          await customStatement('CREATE INDEX IF NOT EXISTS idx_dog_photos_dog_id ON dog_photos(dog_id)');
+          await customStatement('CREATE INDEX IF NOT EXISTS idx_health_records_dog_id ON health_records(dog_id)');
+          await customStatement('CREATE INDEX IF NOT EXISTS idx_show_records_dog_id ON show_records(dog_id)');
+          await customStatement('PRAGMA foreign_keys = ON');
+        }
+      },
+      beforeOpen: (details) async {
+        await customStatement('PRAGMA foreign_keys = ON');
+        if (details.wasCreated) {
+          await _createIndexes();
+        }
+      },
     );
   }
 
+  Future<void> _createIndexes() async {
+    await customStatement('CREATE INDEX IF NOT EXISTS idx_dogs_sire_id ON dogs(sire_id)');
+    await customStatement('CREATE INDEX IF NOT EXISTS idx_dogs_dam_id ON dogs(dam_id)');
+    await customStatement('CREATE INDEX IF NOT EXISTS idx_dogs_litter_id ON dogs(litter_id)');
+    await customStatement('CREATE INDEX IF NOT EXISTS idx_dogs_sex ON dogs(sex)');
+    await customStatement('CREATE INDEX IF NOT EXISTS idx_litters_sire_id ON litters(sire_id)');
+    await customStatement('CREATE INDEX IF NOT EXISTS idx_litters_dam_id ON litters(dam_id)');
+    await customStatement('CREATE INDEX IF NOT EXISTS idx_dog_photos_dog_id ON dog_photos(dog_id)');
+    await customStatement('CREATE INDEX IF NOT EXISTS idx_health_records_dog_id ON health_records(dog_id)');
+    await customStatement('CREATE INDEX IF NOT EXISTS idx_show_records_dog_id ON show_records(dog_id)');
+  }
+
   // Kennel Profile Operations
   Future<KennelProfileData> getKennelProfile() async {
     final profile = await select(kennelProfile).getSingleOrNull();
@@ -104,6 +194,11 @@ class AppDatabase extends _$AppDatabase {
     return await (select(dogs)..where((d) => d.id.equals(id))).getSingle();
   }
 
+  Future<List<Dog>> getDogsByIds(List<int> ids) async {
+    if (ids.isEmpty) return [];
+    return await (select(dogs)..where((d) => d.id.isIn(ids))).get();
+  }
+
   Future<Dog?> getDogByIdOrNull(int id) async {
     return await (select(dogs)..where((d) => d.id.equals(id))).getSingleOrNull();
   }
@@ -122,9 +217,14 @@ class AppDatabase extends _$AppDatabase {
   }
 
   Future<void> deleteDog(int id) async {
-    await (update(dogs)..where((d) => d.sireId.equals(id))).write(const DogsCompanion(sireId: Value(null)));
-    await (update(dogs)..where((d) => d.damId.equals(id))).write(const DogsCompanion(damId: Value(null)));
-    await (delete(dogs)..where((d) => d.id.equals(id))).go();
+    await transaction(() async {
+      await (delete(dogPhotos)..where((p) => p.dogId.equals(id))).go();
+      await (update(dogs)..where((d) => d.sireId.equals(id))).write(const DogsCompanion(sireId: Value(null)));
+      await (update(dogs)..where((d) => d.damId.equals(id))).write(const DogsCompanion(damId: Value(null)));
+      await (update(litters)..where((l) => l.sireId.equals(id))).write(const LittersCompanion(sireId: Value(null)));
+      await (update(litters)..where((l) => l.damId.equals(id))).write(const LittersCompanion(damId: Value(null)));
+      await (delete(dogs)..where((d) => d.id.equals(id))).go();
+    });
   }
 
   Future<List<Dog>> getDogsForDropdown(String sex) async {
@@ -164,6 +264,48 @@ class AppDatabase extends _$AppDatabase {
     return dogMap.values.toList()..sort((a, b) => a.id.compareTo(b.id));
   }
 
+  // Photo Gallery Operations
+  Future<int> addDogPhoto(DogPhotosCompanion photo) async {
+    return await into(dogPhotos).insert(photo);
+  }
+
+  Future<void> deleteDogPhoto(int id) async {
+    await (delete(dogPhotos)..where((p) => p.id.equals(id))).go();
+  }
+
+  Future<List<DogPhoto>> getPhotosForDog(int dogId) async {
+    return await (select(dogPhotos)..where((p) => p.dogId.equals(dogId))
+      ..orderBy([(p) => OrderingTerm.desc(p.dateAdded)])).get();
+  }
+
+  // Health Record Operations
+  Future<int> addHealthRecord(HealthRecordsCompanion record) async {
+    return await into(healthRecords).insert(record);
+  }
+
+  Future<void> deleteHealthRecord(int id) async {
+    await (delete(healthRecords)..where((r) => r.id.equals(id))).go();
+  }
+
+  Future<List<HealthRecord>> getHealthRecordsForDog(int dogId) async {
+    return await (select(healthRecords)..where((r) => r.dogId.equals(dogId))
+      ..orderBy([(r) => OrderingTerm.desc(r.date)])).get();
+  }
+
+  // Show Record Operations
+  Future<int> addShowRecord(ShowRecordsCompanion record) async {
+    return await into(showRecords).insert(record);
+  }
+
+  Future<void> deleteShowRecord(int id) async {
+    await (delete(showRecords)..where((r) => r.id.equals(id))).go();
+  }
+
+  Future<List<ShowRecord>> getShowRecordsForDog(int dogId) async {
+    return await (select(showRecords)..where((r) => r.dogId.equals(dogId))
+      ..orderBy([(r) => OrderingTerm.desc(r.date)])).get();
+  }
+
   // Litter Operations
   Future<int> createLitter(LittersCompanion litter) async {
     return await into(litters).insert(litter);
@@ -178,14 +320,39 @@ class AppDatabase extends _$AppDatabase {
   }
 
   Future<void> deleteLitter(int id) async {
-    await (update(dogs)..where((d) => d.litterId.equals(id))).write(const DogsCompanion(litterId: Value(null)));
-    await (delete(litters)..where((l) => l.id.equals(id))).go();
+    await transaction(() async {
+      await (update(dogs)..where((d) => d.litterId.equals(id))).write(const DogsCompanion(litterId: Value(null)));
+      await (delete(litters)..where((l) => l.id.equals(id))).go();
+    });
+  }
+
+  Future<List<Litter>> getLittersForDog(int dogId) async {
+    return await (select(litters)..where((l) => l.sireId.equals(dogId) | l.damId.equals(dogId))).get();
+  }
+
+  Future<List<Dog>> getOffspringForDog(int dogId) async {
+    return await (select(dogs)..where((d) => d.sireId.equals(dogId) | d.damId.equals(dogId))).get();
   }
 
   Future<List<Dog>> getAllDogs() async {
     return await select(dogs).get();
   }
 
+  Future<List<Dog>> getFilteredDogs({String? sex, String? sortBy}) async {
+    var query = select(dogs);
+    if (sex != null && sex != 'All') {
+      query = query..where((d) => d.sex.equals(sex));
+    }
+    if (sortBy == 'Name (A-Z)') {
+      query = query..orderBy([(d) => OrderingTerm.asc(d.callName)]);
+    } else if (sortBy == 'Recent') {
+      query = query..orderBy([(d) => OrderingTerm.desc(d.id)]);
+    } else if (sortBy == 'Age (Youngest)') {
+      query = query..orderBy([(d) => OrderingTerm.desc(d.dateOfBirth)]);
+    }
+    return await query.get();
+  }
+
   Future<List<Litter>> getAllLitters() async {
     return await select(litters).get();
   }
@@ -201,6 +368,17 @@ class AppDatabase extends _$AppDatabase {
       batch.insertAll(litters, littersList);
     });
   }
+
+  Future<int> createLitterWithPuppies(LittersCompanion litter, List<DogsCompanion> puppies) async {
+    return await transaction(() async {
+      final litterId = await into(litters).insert(litter);
+      for (final puppy in puppies) {
+        final withLitterId = puppy.copyWith(litterId: Value(litterId));
+        await into(dogs).insert(withLitterId);
+      }
+      return litterId;
+    });
+  }
 }
 
 LazyDatabase _openConnection() {
diff --git a/lib/core/router/app_router.dart b/lib/core/router/app_router.dart
index 574c10e..fb7d290 100644
--- a/lib/core/router/app_router.dart
+++ b/lib/core/router/app_router.dart
@@ -3,9 +3,26 @@ import 'package:go_router/go_router.dart';
 import '../../features/pedigree/presentation/screens/dashboard_screen.dart';
 import '../../features/pedigree/presentation/screens/dog_detail_screen.dart';
 import '../../features/pedigree/presentation/screens/add_dog_screen.dart';
+import '../../features/pedigree/presentation/screens/edit_dog_screen.dart';
 import '../../features/pedigree/presentation/screens/litter_form_screen.dart';
+import '../../features/pedigree/presentation/screens/litter_list_screen.dart';
 import '../../features/settings/presentation/screens/settings_screen.dart';
+import '../../features/settings/presentation/screens/kennel_profile_screen.dart';
+import '../../features/settings/presentation/screens/backup_migration_screen.dart';
 import '../../features/settings/presentation/screens/about_screen.dart';
+import '../../features/settings/presentation/screens/appearance_screen.dart';
+import '../../features/pedigree/presentation/screens/add_health_record_screen.dart';
+import '../../features/pedigree/presentation/screens/matchmaker_screen.dart';
+import '../../features/pedigree/presentation/screens/add_show_record_screen.dart';
+
+int? _parseId(GoRouterState state, {String key = 'id'}) {
+  final idStr = state.pathParameters[key];
+  return int.tryParse(idStr ?? '');
+}
+
+Widget _invalidIdScreen() => const Scaffold(
+  body: Center(child: Text('Invalid dog ID')),
+);
 
 class AppRouter {
   static final GoRouter router = GoRouter(
@@ -20,34 +37,87 @@ class AppRouter {
       GoRoute(
         path: '/dog/new',
         builder: (BuildContext context, GoRouterState state) {
-          return const AddDogScreen();
+          final extra = state.extra as Map<String, dynamic>?;
+          return AddDogScreen(
+            childId: extra?['childId'] as int?,
+            isSire: extra?['isSire'] as bool?,
+          );
         },
       ),
       GoRoute(
         path: '/dog/:id',
         builder: (BuildContext context, GoRouterState state) {
-          final idStr = state.pathParameters['id'];
-          final id = int.tryParse(idStr ?? '');
-          if (id == null) {
-            return const Scaffold(
-              body: Center(child: Text('Invalid dog ID')),
-            );
-          }
+          final id = _parseId(state);
+          if (id == null) return _invalidIdScreen();
           return DogDetailScreen(dogId: id);
         },
       ),
+      GoRoute(
+        path: '/dog/:id/edit',
+        builder: (BuildContext context, GoRouterState state) {
+          final id = _parseId(state);
+          if (id == null) return _invalidIdScreen();
+          return EditDogScreen(dogId: id);
+        },
+      ),
+      GoRoute(
+        path: '/dog/:id/health/new',
+        builder: (BuildContext context, GoRouterState state) {
+          final id = _parseId(state);
+          if (id == null) return _invalidIdScreen();
+          return AddHealthRecordScreen(dogId: id);
+        },
+      ),
+      GoRoute(
+        path: '/dog/:id/show/new',
+        builder: (BuildContext context, GoRouterState state) {
+          final id = _parseId(state);
+          if (id == null) return _invalidIdScreen();
+          return AddShowRecordScreen(dogId: id);
+        },
+      ),
       GoRoute(
         path: '/litter/new',
         builder: (BuildContext context, GoRouterState state) {
           return const LitterFormScreen();
         },
       ),
+      GoRoute(
+        path: '/litters',
+        builder: (BuildContext context, GoRouterState state) {
+          return const LitterListScreen();
+        },
+      ),
       GoRoute(
         path: '/settings',
         builder: (BuildContext context, GoRouterState state) {
           return const SettingsScreen();
         },
       ),
+      GoRoute(
+        path: '/settings/kennel',
+        builder: (BuildContext context, GoRouterState state) {
+          return const KennelProfileScreen();
+        },
+      ),
+      GoRoute(
+        path: '/settings/backup',
+        builder: (BuildContext context, GoRouterState state) {
+          return const BackupMigrationScreen();
+        },
+      ),
+      GoRoute(
+        path: '/settings/appearance',
+        builder: (BuildContext context, GoRouterState state) {
+          return const AppearanceScreen();
+        },
+      ),
+      GoRoute(
+        path: '/matchmaker',
+        builder: (BuildContext context, GoRouterState state) {
+          return const MatchmakerScreen();
+        },
+      ),
       GoRoute(
         path: '/about',
         builder: (BuildContext context, GoRouterState state) {
diff --git a/lib/core/services/certificate_service.dart b/lib/core/services/certificate_service.dart
index 66d7b7f..c16278d 100644
--- a/lib/core/services/certificate_service.dart
+++ b/lib/core/services/certificate_service.dart
@@ -1,9 +1,8 @@
 import 'dart:io';
+import 'package:intl/intl.dart';
 import 'package:pdf/pdf.dart';
 import 'package:pdf/widgets.dart' as pw;
 import 'package:printing/printing.dart';
-import 'package:path_provider/path_provider.dart';
-import 'package:path/path.dart' as p;
 import 'package:share_plus/share_plus.dart';
 import '../../features/pedigree/domain/entities/dog.dart';
 import '../../features/settings/domain/entities/kennel_profile.dart';
@@ -13,230 +12,343 @@ class CertificateService {
     required Dog dog,
     required KennelProfile kennelProfile,
     File? logoFile,
+    Map<int, pw.MemoryImage> preloadedImages = const {},
   }) async {
     final pdf = pw.Document();
     final logoBytes = logoFile != null ? await logoFile.readAsBytes() : null;
     final logoImage = logoBytes != null ? pw.MemoryImage(logoBytes) : null;
 
-    pdf.addPage(
-      pw.MultiPage(
-        pageFormat: PdfPageFormat.a4,
-        margin: const pw.EdgeInsets.all(40),
-        build: (context) => [
-          // Header
-          if (logoImage != null)
-            pw.Center(
-              child: pw.Image(logoImage, height: 80),
-            ),
-          pw.SizedBox(height: 20),
-          pw.Center(
-            child: pw.Text(
-              'PEDIGREE CERTIFICATE',
-              style: pw.TextStyle(
-                fontSize: 24,
-                fontWeight: pw.FontWeight.bold,
-                color: PdfColor.fromHex('#3CB91A'),
-              ),
-            ),
-          ),
-          pw.SizedBox(height: 10),
-          pw.Center(
-            child: pw.Text(
-              kennelProfile.kennelName,
-              style: pw.TextStyle(
-                fontSize: 16,
-                color: PdfColor.fromHex('#3D3D3D'),
-              ),
-            ),
-          ),
-          if (kennelProfile.breederName != null)
-            pw.Center(
-              child: pw.Text(
-                'Breeder: ${kennelProfile.breederName}',
-                style: const pw.TextStyle(
-                  fontSize: 12,
-                  color: PdfColors.grey700,
-                ),
-              ),
-            ),
-          pw.Divider(thickness: 2, color: PdfColor.fromHex('#3CB91A')),
-          pw.SizedBox(height: 20),
-
-          // Dog Information
-          pw.Text(
-            'DOG INFORMATION',
-            style: pw.TextStyle(
-              fontSize: 14,
-              fontWeight: pw.FontWeight.bold,
-              color: PdfColor.fromHex('#3D3D3D'),
-            ),
-          ),
-          pw.SizedBox(height: 10),
-          _buildInfoRow('Registered Name', dog.registeredName),
-          _buildInfoRow('Call Name', dog.callName),
-          _buildInfoRow('Sex', dog.sex),
-          if (dog.microchipNumber != null)
-            _buildInfoRow('Microchip', dog.microchipNumber!),
-          if (dog.dateOfBirth != null)
-            _buildInfoRow('Date of Birth', dog.dateOfBirth.toString().split(' ')[0]),
-          if (dog.colorMarkings != null)
-            _buildInfoRow('Color / Markings', dog.colorMarkings!),
-          if (dog.registerType != null)
-            _buildInfoRow('Register Type', dog.registerType!),
-          if (dog.appraisalScore != null)
-            _buildInfoRow('Appraisal Score', dog.appraisalScore.toString()),
-          if (dog.inbreedingCoefficient != null)
-            _buildInfoRow('COI', dog.inbreedingCoefficient.toString()),
-          if (dog.dnaProfileNumber != null)
-            _buildInfoRow('DNA Profile', dog.dnaProfileNumber!),
-          pw.SizedBox(height: 20),
-
-          // Sire (Father)
-          pw.Text(
-            'SIRE (FATHER)',
-            style: pw.TextStyle(
-              fontSize: 14,
-              fontWeight: pw.FontWeight.bold,
-              color: PdfColor.fromHex('#3D3D3D'),
-            ),
-          ),
-          pw.SizedBox(height: 10),
-          if (dog.sire != null) ...[
-            _buildInfoRow('Name', dog.sire!.registeredName),
-            _buildInfoRow('Call Name', dog.sire!.callName),
-            if (dog.sire!.microchipNumber != null)
-              _buildInfoRow('Microchip', dog.sire!.microchipNumber!),
-            if (dog.sire!.sire != null)
-              _buildInfoRow('Sire', dog.sire!.sire!.registeredName),
-            if (dog.sire!.dam != null)
-              _buildInfoRow('Dam', dog.sire!.dam!.registeredName),
-          ] else
-            pw.Text('Not registered', style: const pw.TextStyle(color: PdfColors.grey)),
-          pw.SizedBox(height: 20),
+    final baseColor = PdfColor.fromHex('#2F5E36'); // Elegant dark green
+    final secondaryColor = PdfColor.fromHex('#4A4A4A'); // Dark grey
+    final lightGrey = PdfColor.fromHex('#E8E8E8');
 
-          // Dam (Mother)
-          pw.Text(
-            'DAM (MOTHER)',
-            style: pw.TextStyle(
-              fontSize: 14,
-              fontWeight: pw.FontWeight.bold,
-              color: PdfColor.fromHex('#3D3D3D'),
+    pdf.addPage(
+      pw.Page(
+        pageFormat: PdfPageFormat.a4.landscape,
+        margin: const pw.EdgeInsets.all(32),
+        build: (context) {
+          return pw.Container(
+            decoration: pw.BoxDecoration(
+              border: pw.Border.all(color: baseColor, width: 3),
             ),
-          ),
-          pw.SizedBox(height: 10),
-          if (dog.dam != null) ...[
-            _buildInfoRow('Name', dog.dam!.registeredName),
-            _buildInfoRow('Call Name', dog.dam!.callName),
-            if (dog.dam!.microchipNumber != null)
-              _buildInfoRow('Microchip', dog.dam!.microchipNumber!),
-            if (dog.dam!.sire != null)
-              _buildInfoRow('Sire', dog.dam!.sire!.registeredName),
-            if (dog.dam!.dam != null)
-              _buildInfoRow('Dam', dog.dam!.dam!.registeredName),
-          ] else
-            pw.Text('Not registered', style: const pw.TextStyle(color: PdfColors.grey)),
-          pw.SizedBox(height: 30),
+            padding: const pw.EdgeInsets.all(16),
+            child: pw.Row(
+              crossAxisAlignment: pw.CrossAxisAlignment.start,
+              children: [
+                // LEFT PANEL: Kennel & Dog Info (35% width)
+                pw.Expanded(
+                  flex: 35,
+                  child: pw.Column(
+                    crossAxisAlignment: pw.CrossAxisAlignment.center,
+                    children: [
+                      // Kennel Header
+                      if (logoImage != null)
+                        pw.Container(
+                          height: 80,
+                          child: pw.Image(logoImage),
+                        ),
+                      pw.SizedBox(height: 12),
+                      pw.Text(
+                        'OFFICIAL PEDIGREE',
+                        style: pw.TextStyle(
+                          fontSize: 20,
+                          fontWeight: pw.FontWeight.bold,
+                          color: baseColor,
+                          letterSpacing: 2,
+                        ),
+                      ),
+                      pw.SizedBox(height: 8),
+                      pw.Text(
+                        kennelProfile.kennelName.toUpperCase(),
+                        style: pw.TextStyle(
+                          fontSize: 16,
+                          fontWeight: pw.FontWeight.bold,
+                          color: secondaryColor,
+                        ),
+                      ),
+                      if (kennelProfile.breederName != null)
+                        pw.Text(
+                          'Breeder: ${kennelProfile.breederName}',
+                          style: const pw.TextStyle(fontSize: 10, color: PdfColors.black),
+                        ),
+                      
+                      // Contact Info
+                      pw.SizedBox(height: 8),
+                      pw.Container(
+                        padding: const pw.EdgeInsets.all(8),
+                        decoration: pw.BoxDecoration(
+                          color: lightGrey,
+                          borderRadius: const pw.BorderRadius.all(pw.Radius.circular(4)),
+                        ),
+                        child: pw.Column(
+                          crossAxisAlignment: pw.CrossAxisAlignment.center,
+                          children: [
+                            if (kennelProfile.phone != null)
+                              pw.Text('Phone: ${kennelProfile.phone}', style: const pw.TextStyle(fontSize: 9)),
+                            if (kennelProfile.whatsapp != null)
+                              pw.Text('WhatsApp: ${kennelProfile.whatsapp}', style: const pw.TextStyle(fontSize: 9)),
+                            if (kennelProfile.email != null)
+                              pw.Text('Email: ${kennelProfile.email}', style: const pw.TextStyle(fontSize: 9)),
+                          ],
+                        ),
+                      ),
+                      
+                      pw.Divider(color: baseColor, thickness: 1.5),
+                      pw.SizedBox(height: 8),
 
-          // Grandparents Section (3 Gen)
-          pw.Text(
-            'GRANDPARENTS',
-            style: pw.TextStyle(
-              fontSize: 14,
-              fontWeight: pw.FontWeight.bold,
-              color: PdfColor.fromHex('#3D3D3D'),
-            ),
-          ),
-          pw.SizedBox(height: 10),
-          _buildGrandparentRow('Sire\'s Sire', dog.sire?.sire),
-          _buildGrandparentRow('Sire\'s Dam', dog.sire?.dam),
-          _buildGrandparentRow('Dam\'s Sire', dog.dam?.sire),
-          _buildGrandparentRow('Dam\'s Dam', dog.dam?.dam),
-          pw.SizedBox(height: 30),
+                      // Primary Dog Info
+                      if (preloadedImages.containsKey(dog.id))
+                        pw.Container(
+                          width: 100,
+                          height: 100,
+                          decoration: pw.BoxDecoration(
+                            shape: pw.BoxShape.circle,
+                            image: pw.DecorationImage(
+                              image: preloadedImages[dog.id]!,
+                              fit: pw.BoxFit.cover,
+                            ),
+                          ),
+                        ),
+                      pw.SizedBox(height: 12),
+                      
+                      pw.Text(
+                        dog.registeredName,
+                        textAlign: pw.TextAlign.center,
+                        style: pw.TextStyle(
+                          fontSize: 18,
+                          fontWeight: pw.FontWeight.bold,
+                          color: PdfColors.black,
+                        ),
+                      ),
+                      pw.Text(
+                        'Call Name: "${dog.callName}"',
+                        style: pw.TextStyle(fontSize: 12, fontStyle: pw.FontStyle.italic),
+                      ),
+                      pw.SizedBox(height: 12),
 
-          // Footer
-          pw.Divider(thickness: 1, color: PdfColors.grey300),
-          pw.SizedBox(height: 10),
-          pw.Row(
-            mainAxisAlignment: pw.MainAxisAlignment.spaceBetween,
-            children: [
-              pw.Text(
-                'Generated: ${DateTime.now().toString().split('.')[0]}',
-                style: const pw.TextStyle(
-                  fontSize: 10,
-                  color: PdfColors.grey600,
+                      _buildDogDetailGrid(dog),
+                    ],
+                  ),
                 ),
-              ),
-              pw.Text(
-                'ZooPed - Pedigree Management',
-                style: const pw.TextStyle(
-                  fontSize: 10,
-                  color: PdfColors.grey600,
+                
+                // Vertical Divider
+                pw.SizedBox(width: 16),
+                pw.Container(width: 1, color: lightGrey),
+                pw.SizedBox(width: 16),
+
+                // RIGHT PANEL: Pedigree Tree (65% width)
+                pw.Expanded(
+                  flex: 65,
+                  child: pw.Column(
+                    crossAxisAlignment: pw.CrossAxisAlignment.start,
+                    children: [
+                      pw.Text(
+                        '3-GENERATION PEDIGREE',
+                        style: pw.TextStyle(
+                          fontSize: 14,
+                          fontWeight: pw.FontWeight.bold,
+                          color: baseColor,
+                        ),
+                      ),
+                      pw.SizedBox(height: 16),
+                      pw.Expanded(
+                        child: _buildTree(dog, preloadedImages, baseColor),
+                      ),
+                    ],
+                  ),
                 ),
-              ),
-            ],
-          ),
-          if (kennelProfile.contactInfo != null) ...[
-            pw.SizedBox(height: 5),
-            pw.Text(
-              'Contact: ${kennelProfile.contactInfo}',
-              style: const pw.TextStyle(
-                fontSize: 10,
-                color: PdfColors.grey600,
-              ),
+              ],
             ),
-          ],
-        ],
+          );
+        },
       ),
     );
 
     return pdf;
   }
 
+  static pw.Widget _buildDogDetailGrid(Dog dog) {
+    return pw.Column(
+      children: [
+        _buildInfoRow('Sex', dog.sex),
+        if (dog.dateOfBirth != null)
+          _buildInfoRow('DOB', DateFormat('yyyy-MM-dd').format(dog.dateOfBirth!)),
+        if (dog.microchipNumber != null)
+          _buildInfoRow('Microchip', dog.microchipNumber!),
+        if (dog.colorMarkings != null)
+          _buildInfoRow('Color', dog.colorMarkings!),
+        if (dog.registerType != null)
+          _buildInfoRow('Registry', dog.registerType!),
+        if (dog.dnaProfileNumber != null)
+          _buildInfoRow('DNA Profile', dog.dnaProfileNumber!),
+      ],
+    );
+  }
+
   static pw.Widget _buildInfoRow(String label, String value) {
     return pw.Padding(
-      padding: const pw.EdgeInsets.symmetric(vertical: 3),
+      padding: const pw.EdgeInsets.symmetric(vertical: 2),
       child: pw.Row(
-        crossAxisAlignment: pw.CrossAxisAlignment.start,
+        mainAxisAlignment: pw.MainAxisAlignment.spaceBetween,
         children: [
-          pw.SizedBox(
-            width: 150,
+          pw.Text(label, style: pw.TextStyle(fontSize: 10, fontWeight: pw.FontWeight.bold)),
+          pw.SizedBox(width: 8),
+          pw.Expanded(
             child: pw.Text(
-              '$label:',
-              style: pw.TextStyle(
-                fontWeight: pw.FontWeight.bold,
-                color: PdfColors.grey700,
-              ),
+              value,
+              textAlign: pw.TextAlign.right,
+              style: const pw.TextStyle(fontSize: 10),
             ),
           ),
-          pw.Expanded(
-            child: pw.Text(value),
-          ),
         ],
       ),
     );
   }
 
-  static pw.Widget _buildGrandparentRow(String label, Dog? dog) {
-    return pw.Padding(
-      padding: const pw.EdgeInsets.symmetric(vertical: 3),
+  static pw.Widget _buildTree(Dog dog, Map<int, pw.MemoryImage> images, PdfColor color) {
+    // A standard 3-gen tree has 3 columns: Parents, Grandparents, Great-Grandparents.
+    // The data model goes: sire/dam (gen 1), their sire/dam (gen 2), their sire/dam (gen 3).
+    // In horizontal layout:
+    // Left col: Sire, Dam
+    // Middle col: Grandsire (Paternal), Granddam (Paternal), Grandsire (Maternal), Granddam (Maternal)
+    // Right col: Great-grandsires/dams
+    
+    return pw.Row(
+      crossAxisAlignment: pw.CrossAxisAlignment.stretch,
+      children: [
+        // Parents (Gen 1)
+        pw.Expanded(
+          child: pw.Column(
+            mainAxisAlignment: pw.MainAxisAlignment.spaceAround,
+            children: [
+              _buildTreeNode(dog.sire, 'Sire', images, color),
+              _buildTreeNode(dog.dam, 'Dam', images, color),
+            ],
+          ),
+        ),
+        _buildConnectorLine(color),
+        
+        // Grandparents (Gen 2)
+        pw.Expanded(
+          child: pw.Column(
+            mainAxisAlignment: pw.MainAxisAlignment.spaceAround,
+            children: [
+              _buildTreeNode(dog.sire?.sire, 'Grandsire', images, color),
+              _buildTreeNode(dog.sire?.dam, 'Granddam', images, color),
+              _buildTreeNode(dog.dam?.sire, 'Grandsire', images, color),
+              _buildTreeNode(dog.dam?.dam, 'Granddam', images, color),
+            ],
+          ),
+        ),
+        _buildConnectorLine(color),
+
+        // Great-Grandparents (Gen 3)
+        pw.Expanded(
+          child: pw.Column(
+            mainAxisAlignment: pw.MainAxisAlignment.spaceAround,
+            children: [
+              _buildTreeNode(dog.sire?.sire?.sire, 'G-Grandsire', images, color, isSmall: true),
+              _buildTreeNode(dog.sire?.sire?.dam, 'G-Granddam', images, color, isSmall: true),
+              _buildTreeNode(dog.sire?.dam?.sire, 'G-Grandsire', images, color, isSmall: true),
+              _buildTreeNode(dog.sire?.dam?.dam, 'G-Granddam', images, color, isSmall: true),
+              _buildTreeNode(dog.dam?.sire?.sire, 'G-Grandsire', images, color, isSmall: true),
+              _buildTreeNode(dog.dam?.sire?.dam, 'G-Granddam', images, color, isSmall: true),
+              _buildTreeNode(dog.dam?.dam?.sire, 'G-Grandsire', images, color, isSmall: true),
+              _buildTreeNode(dog.dam?.dam?.dam, 'G-Granddam', images, color, isSmall: true),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+
+  static pw.Widget _buildConnectorLine(PdfColor color) {
+    return pw.Container(
+      width: 12,
+      child: pw.Center(
+        child: pw.Container(
+          width: 1,
+          color: color,
+        ),
+      ),
+    );
+  }
+
+  static pw.Widget _buildTreeNode(Dog? dog, String role, Map<int, pw.MemoryImage> images, PdfColor color, {bool isSmall = false}) {
+    final double boxHeight = isSmall ? 35 : 60;
+    final double fontSizeName = isSmall ? 8 : 10;
+    final double fontSizeRole = isSmall ? 6 : 8;
+
+    if (dog == null) {
+      return pw.Container(
+        height: boxHeight,
+        margin: const pw.EdgeInsets.symmetric(vertical: 2),
+        decoration: pw.BoxDecoration(
+          border: pw.Border.all(color: PdfColors.grey300),
+          color: PdfColors.grey100,
+        ),
+        child: pw.Center(
+          child: pw.Text(
+            'Unknown $role',
+            style: pw.TextStyle(fontSize: fontSizeName, color: PdfColors.grey),
+          ),
+        ),
+      );
+    }
+
+    final hasImage = images.containsKey(dog.id) && !isSmall;
+
+    return pw.Container(
+      height: boxHeight,
+      margin: const pw.EdgeInsets.symmetric(vertical: 2),
+      decoration: pw.BoxDecoration(
+        border: pw.Border.all(color: color, width: 0.5),
+        color: PdfColors.white,
+      ),
       child: pw.Row(
-        crossAxisAlignment: pw.CrossAxisAlignment.start,
         children: [
-          pw.SizedBox(
-            width: 150,
-            child: pw.Text(
-              '$label:',
-              style: pw.TextStyle(
-                fontWeight: pw.FontWeight.bold,
-                color: PdfColors.grey700,
+          if (hasImage)
+            pw.Container(
+              width: boxHeight,
+              height: boxHeight,
+              decoration: pw.BoxDecoration(
+                image: pw.DecorationImage(
+                  image: images[dog.id]!,
+                  fit: pw.BoxFit.cover,
+                ),
               ),
             ),
-          ),
           pw.Expanded(
-            child: pw.Text(
-              dog != null ? '${dog.registeredName} (${dog.callName})' : 'Not registered',
-              style: pw.TextStyle(
-                color: dog != null ? PdfColors.black : PdfColors.grey,
+            child: pw.Padding(
+              padding: const pw.EdgeInsets.all(4),
+              child: pw.Column(
+                crossAxisAlignment: pw.CrossAxisAlignment.start,
+                mainAxisAlignment: pw.MainAxisAlignment.center,
+                children: [
+                  pw.Text(
+                    role,
+                    style: pw.TextStyle(
+                      fontSize: fontSizeRole,
+                      color: color,
+                      fontWeight: pw.FontWeight.bold,
+                    ),
+                  ),
+                  pw.SizedBox(height: 2),
+                  pw.Text(
+                    dog.registeredName,
+                    maxLines: 2,
+                    style: pw.TextStyle(
+                      fontSize: fontSizeName,
+                      fontWeight: pw.FontWeight.bold,
+                    ),
+                  ),
+                  if (dog.colorMarkings != null && !isSmall)
+                    pw.Text(
+                      dog.colorMarkings!,
+                      maxLines: 1,
+                      style: pw.TextStyle(fontSize: fontSizeRole, color: PdfColors.grey700),
+                    ),
+                ],
               ),
             ),
           ),
@@ -245,25 +357,18 @@ class CertificateService {
     );
   }
 
-  static Future<File> savePdfToTemp(pw.Document pdf, String fileName) async {
-    final output = await getTemporaryDirectory();
-    final file = File(p.join(output.path, fileName));
-    await file.writeAsBytes(await pdf.save());
-    return file;
-  }
-
   static Future<void> printPdf(pw.Document pdf) async {
     await Printing.layoutPdf(
       onLayout: (PdfPageFormat format) async => pdf.save(),
-      name: 'ZooPed Pedigree Certificate',
+      name: 'Pedigree_Certificate',
     );
   }
 
-  static Future<void> sharePdf(File pdfFile, String dogName) async {
+  static Future<void> sharePdf(File file, String dogName) async {
     await Share.shareXFiles(
-      [XFile(pdfFile.path)],
+      [XFile(file.path)],
       text: 'Pedigree Certificate for $dogName',
-      subject: 'ZooPed - Pedigree Certificate',
+      subject: 'Pedigree Certificate',
     );
   }
 }
diff --git a/lib/core/services/csv_service.dart b/lib/core/services/csv_service.dart
index a87bb49..f6c3a3a 100644
--- a/lib/core/services/csv_service.dart
+++ b/lib/core/services/csv_service.dart
@@ -73,17 +73,21 @@ class CsvService {
     return file;
   }
 
-  static Future<List<DogsCompanion>> importDogsFromCsv(String filePath) async {
+  static Future<CsvImportResult> importDogsFromCsv(String filePath) async {
     final file = File(filePath);
     final csvString = await file.readAsString();
     final rows = const CsvToListConverter().convert(csvString);
 
-    if (rows.isEmpty) return [];
+    if (rows.isEmpty) return const CsvImportResult(dogs: []);
 
     final dogs = <DogsCompanion>[];
+    final errors = <String>[];
     for (var i = 1; i < rows.length; i++) {
       final row = rows[i];
-      if (row.length < 15) continue;
+      if (row.length < 15) {
+        errors.add('Row ${i + 1}: insufficient columns (${row.length})');
+        continue;
+      }
 
       try {
         final dog = DogsCompanion.insert(
@@ -106,29 +110,33 @@ class CsvService {
         );
         dogs.add(dog);
       } catch (e) {
-        continue;
+        errors.add('Row ${i + 1}: $e');
       }
     }
 
-    return dogs;
+    return CsvImportResult(dogs: dogs, errors: errors);
   }
 
-  static Future<List<LittersCompanion>> importLittersFromCsv(String filePath) async {
+  static Future<CsvLitterImportResult> importLittersFromCsv(String filePath) async {
     final file = File(filePath);
     final csvString = await file.readAsString();
     final rows = const CsvToListConverter().convert(csvString);
 
-    if (rows.isEmpty) return [];
+    if (rows.isEmpty) return const CsvLitterImportResult(litters: []);
 
     final litters = <LittersCompanion>[];
+    final errors = <String>[];
     for (var i = 1; i < rows.length; i++) {
       final row = rows[i];
-      if (row.length < 8) continue;
+      if (row.length < 8) {
+        errors.add('Row ${i + 1}: insufficient columns (${row.length})');
+        continue;
+      }
 
       try {
         final litter = LittersCompanion.insert(
-          sireId: row[1] as int,
-          damId: row[2] as int,
+          sireId: Value(int.parse(row[1].toString())),
+          damId: Value(int.parse(row[2].toString())),
           whelpingDate: DateTime.parse(row[4].toString()),
           matingDate: Value(row[3].toString().isNotEmpty
               ? DateTime.tryParse(row[3].toString())
@@ -139,11 +147,11 @@ class CsvService {
         );
         litters.add(litter);
       } catch (e) {
-        continue;
+        errors.add('Row ${i + 1}: $e');
       }
     }
 
-    return litters;
+    return CsvLitterImportResult(litters: litters, errors: errors);
   }
 
   static Future<void> shareCsvFile(File csvFile, String type) async {
@@ -162,3 +170,15 @@ class CsvService {
     );
   }
 }
+
+class CsvImportResult {
+  final List<DogsCompanion> dogs;
+  final List<String> errors;
+  const CsvImportResult({required this.dogs, this.errors = const []});
+}
+
+class CsvLitterImportResult {
+  final List<LittersCompanion> litters;
+  final List<String> errors;
+  const CsvLitterImportResult({required this.litters, this.errors = const []});
+}
diff --git a/lib/core/theme/app_theme.dart b/lib/core/theme/app_theme.dart
index ca6b333..5cc47bf 100644
--- a/lib/core/theme/app_theme.dart
+++ b/lib/core/theme/app_theme.dart
@@ -1,43 +1,43 @@
 import 'package:flutter/material.dart';
 
 class AppTheme {
-  static const Color primaryColor = Color(0xFF194A1D); // Logo Green
-  static const Color primaryDark = Color(0xFF0F3012); // Darker Green
-  static const Color primaryLight = Color(0xFF2D7A33); // Lighter Green
-  static const Color secondaryColor = Color(0xFF3D3D3D); // Logo Dark Charcoal
-  static const Color secondaryLight = Color(0xFF6B6B6B); // Lighter Charcoal
-  static const Color backgroundColor = Color(0xFFF8FAFC); // Soft Off-White
-  static const Color surfaceColor = Colors.white;
-  static const Color errorColor = Color(0xFFDC2626);
+  static const Color defaultPrimaryColor = Color(0xFF194A1D); // Logo Green
+  
+  // Keep these for backwards compatibility where context isn't easily available
+  static const Color primaryColor = defaultPrimaryColor;
+  static const Color primaryLight = Color(0xFF2D7A33);
 
-  static const Color textPrimary = Color(0xFF1A1A1A);
-  static const Color textSecondary = Color(0xFF64748B);
-  static const Color textTertiary = Color(0xFF94A3B8);
+  static const Color secondaryColor = Color(0xFF3D3D3D); // Logo Dark Charcoal
 
   static const Color maleColor = Color(0xFF2563EB);
   static const Color femaleColor = Color(0xFFDB2777);
 
-  static ThemeData get lightTheme {
+  static const List<Color> premiumColors = [
+    Color(0xFF194A1D), // ZooPed Green
+    Color(0xFF2563EB), // Royal Blue
+    Color(0xFFDC2626), // Ruby Red
+    Color(0xFF7C3AED), // Deep Purple
+    Color(0xFFD97706), // Amber
+    Color(0xFF475569), // Slate
+  ];
+
+  static ThemeData getLightTheme(Color primaryColor) {
+    final colorScheme = ColorScheme.fromSeed(
+      seedColor: primaryColor,
+      brightness: Brightness.light,
+    );
+
     return ThemeData(
       useMaterial3: true,
-      colorScheme: ColorScheme.light( // ignore: prefer_const_constructors
-        primary: primaryColor,
-        primaryContainer: primaryLight,
-        secondary: secondaryColor,
-        secondaryContainer: secondaryLight,
-        surface: surfaceColor,
-        error: errorColor,
-        onPrimary: Colors.white,
-        onSecondary: Colors.white,
-      ),
-      scaffoldBackgroundColor: backgroundColor,
-      appBarTheme: const AppBarTheme(
+      colorScheme: colorScheme,
+      scaffoldBackgroundColor: const Color(0xFFF8FAFC),
+      appBarTheme: AppBarTheme(
         backgroundColor: primaryColor,
         foregroundColor: Colors.white,
         elevation: 0,
         centerTitle: true,
       ),
-      floatingActionButtonTheme: const FloatingActionButtonThemeData(
+      floatingActionButtonTheme: FloatingActionButtonThemeData(
         backgroundColor: primaryColor,
         foregroundColor: Colors.white,
       ),
@@ -50,12 +50,12 @@ class AppTheme {
       outlinedButtonTheme: OutlinedButtonThemeData(
         style: OutlinedButton.styleFrom(
           foregroundColor: primaryColor,
-          side: const BorderSide(color: primaryColor),
+          side: BorderSide(color: primaryColor),
         ),
       ),
       inputDecorationTheme: InputDecorationTheme(
         filled: true,
-        fillColor: surfaceColor,
+        fillColor: Colors.white,
         border: OutlineInputBorder(
           borderRadius: BorderRadius.circular(8.0),
           borderSide: BorderSide(color: Colors.grey.shade300),
@@ -66,9 +66,8 @@ class AppTheme {
         ),
         focusedBorder: OutlineInputBorder(
           borderRadius: BorderRadius.circular(8.0),
-          borderSide: const BorderSide(color: primaryColor, width: 2.0),
+          borderSide: BorderSide(color: primaryColor, width: 2.0),
         ),
-        labelStyle: const TextStyle(color: secondaryColor),
       ),
       cardTheme: CardThemeData(
         elevation: 2,
@@ -76,13 +75,63 @@ class AppTheme {
           borderRadius: BorderRadius.circular(12.0),
         ),
       ),
-      chipTheme: ChipThemeData(
-        backgroundColor: AppTheme.primaryLight.withValues(alpha: 0.1),
-        labelStyle: const TextStyle(color: secondaryColor),
+    );
+  }
+
+  static ThemeData getDarkTheme(Color primaryColor) {
+    final colorScheme = ColorScheme.fromSeed(
+      seedColor: primaryColor,
+      brightness: Brightness.dark,
+    );
+
+    return ThemeData(
+      useMaterial3: true,
+      colorScheme: colorScheme,
+      scaffoldBackgroundColor: const Color(0xFF121212),
+      appBarTheme: const AppBarTheme(
+        backgroundColor: Color(0xFF1E1E1E),
+        foregroundColor: Colors.white,
+        elevation: 0,
+        centerTitle: true,
+      ),
+      floatingActionButtonTheme: FloatingActionButtonThemeData(
+        backgroundColor: primaryColor,
+        foregroundColor: Colors.white,
       ),
-      dividerTheme: const DividerThemeData(
-        color: Color(0xFFE2E8F0),
-        thickness: 1,
+      elevatedButtonTheme: ElevatedButtonThemeData(
+        style: ElevatedButton.styleFrom(
+          backgroundColor: primaryColor,
+          foregroundColor: Colors.white,
+        ),
+      ),
+      outlinedButtonTheme: OutlinedButtonThemeData(
+        style: OutlinedButton.styleFrom(
+          foregroundColor: primaryColor,
+          side: BorderSide(color: primaryColor),
+        ),
+      ),
+      inputDecorationTheme: InputDecorationTheme(
+        filled: true,
+        fillColor: const Color(0xFF1E1E1E),
+        border: OutlineInputBorder(
+          borderRadius: BorderRadius.circular(8.0),
+          borderSide: const BorderSide(color: Color(0xFF333333)),
+        ),
+        enabledBorder: OutlineInputBorder(
+          borderRadius: BorderRadius.circular(8.0),
+          borderSide: const BorderSide(color: Color(0xFF333333)),
+        ),
+        focusedBorder: OutlineInputBorder(
+          borderRadius: BorderRadius.circular(8.0),
+          borderSide: BorderSide(color: primaryColor, width: 2.0),
+        ),
+      ),
+      cardTheme: CardThemeData(
+        color: const Color(0xFF1E1E1E),
+        elevation: 2,
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(12.0),
+        ),
       ),
     );
   }
diff --git a/lib/features/pedigree/data/models/dog_model.dart b/lib/features/pedigree/data/models/dog_model.dart
index f0673c6..3ca9b34 100644
--- a/lib/features/pedigree/data/models/dog_model.dart
+++ b/lib/features/pedigree/data/models/dog_model.dart
@@ -22,6 +22,7 @@ extension DogMapper on Dog {
       inbreedingCoefficient: inbreedingCoefficient,
       registerType: registerType,
       dnaProfileNumber: dnaProfileNumber,
+      photoPath: photoPath,
       notes: notes,
       createdAt: createdAt,
     );
@@ -31,7 +32,7 @@ extension DogMapper on Dog {
 extension DogEntityMapper on domain.Dog {
   DogsCompanion toCompanion() {
     return DogsCompanion(
-      id: Value(id),
+      id: id == 0 ? const Value.absent() : Value(id),
       registeredName: Value(registeredName),
       callName: Value(callName),
       sex: Value(sex),
@@ -45,6 +46,7 @@ extension DogEntityMapper on domain.Dog {
       inbreedingCoefficient: Value(inbreedingCoefficient),
       registerType: Value(registerType),
       dnaProfileNumber: Value(dnaProfileNumber),
+      photoPath: Value(photoPath),
       notes: Value(notes),
     );
   }
diff --git a/lib/features/pedigree/data/models/litter_model.dart b/lib/features/pedigree/data/models/litter_model.dart
index 18a10ef..bda4670 100644
--- a/lib/features/pedigree/data/models/litter_model.dart
+++ b/lib/features/pedigree/data/models/litter_model.dart
@@ -6,8 +6,8 @@ extension LitterMapper on Litter {
   domain.Litter toDomain() {
     return domain.Litter(
       id: id,
-      sireId: sireId,
-      damId: damId,
+      sireId: sireId ?? 0,
+      damId: damId ?? 0,
       matingDate: matingDate,
       whelpingDate: whelpingDate,
       puppiesBornAlive: puppiesBornAlive,
@@ -20,7 +20,7 @@ extension LitterMapper on Litter {
 extension LitterEntityMapper on domain.Litter {
   LittersCompanion toCompanion() {
     return LittersCompanion(
-      id: Value(id),
+      id: id == 0 ? const Value.absent() : Value(id),
       sireId: Value(sireId),
       damId: Value(damId),
       matingDate: Value(matingDate),
diff --git a/lib/features/pedigree/data/repositories/pedigree_repository_impl.dart b/lib/features/pedigree/data/repositories/pedigree_repository_impl.dart
index 919be1b..1804bfc 100644
--- a/lib/features/pedigree/data/repositories/pedigree_repository_impl.dart
+++ b/lib/features/pedigree/data/repositories/pedigree_repository_impl.dart
@@ -12,19 +12,33 @@ class PedigreeRepositoryImpl implements PedigreeRepository {
 
   @override
   Future<domain.Dog> getDogById(int id) async {
-    final dogData = await _database.getDogById(id);
-    final sire = await _hydrate(dogData.sireId);
-    final dam = await _hydrate(dogData.damId);
-    return dogData.toDomain(sire: sire, dam: dam);
+    final ancestors = await _database.getAncestorsForPedigree(id, 3);
+    final dogMap = {for (final d in ancestors) d.id: d};
+    final rootData = dogMap[id];
+    if (rootData == null) throw Exception('Dog not found');
+    return _buildTree(rootData, dogMap);
   }
 
-  Future<domain.Dog?> _hydrate(int? id, {int depth = 0}) async {
-    if (id == null || depth > 6) return null;
-    final data = await _database.getSireOrDam(id);
-    if (data == null) return null;
-    final sire = await _hydrate(data.sireId, depth: depth + 1);
-    final dam = await _hydrate(data.damId, depth: depth + 1);
-    return data.toDomain(sire: sire, dam: dam);
+  Future<List<domain.Dog>> getDogsByIds(List<int> ids) async {
+    final dogsData = await _database.getDogsByIds(ids);
+    return dogsData.map((dog) => dog.toDomain()).toList();
+  }
+
+  @override
+  Future<Map<int, String>> getDogNamesByIds(List<int> ids) async {
+    final dogsData = await _database.getDogsByIds(ids);
+    return {for (final d in dogsData) d.id: d.callName};
+  }
+
+  domain.Dog _buildTree(Dog data, Map<int, Dog> map) {
+    return data.toDomain(
+      sire: data.sireId != null && map.containsKey(data.sireId)
+          ? _buildTree(map[data.sireId]!, map)
+          : null,
+      dam: data.damId != null && map.containsKey(data.damId)
+          ? _buildTree(map[data.damId]!, map)
+          : null,
+    );
   }
 
   @override
@@ -45,6 +59,12 @@ class PedigreeRepositoryImpl implements PedigreeRepository {
     return dogsData.map((dog) => dog.toDomain()).toList();
   }
 
+  @override
+  Future<List<domain.Dog>> getFilteredDogs({String? sex, String? sortBy}) async {
+    final dogsData = await _database.getFilteredDogs(sex: sex, sortBy: sortBy);
+    return dogsData.map((dog) => dog.toDomain()).toList();
+  }
+
   @override
   Future<int> insertDog(domain.Dog dog) async {
     return await _database.insertDog(dog.toCompanion());
@@ -60,6 +80,18 @@ class PedigreeRepositoryImpl implements PedigreeRepository {
     await _database.deleteDog(id);
   }
 
+  @override
+  Future<List<domain.Dog>> getOffspringForDog(int dogId) async {
+    final dogsData = await _database.getOffspringForDog(dogId);
+    return dogsData.map((dog) => dog.toDomain()).toList();
+  }
+
+  @override
+  Future<List<domain_litter.Litter>> getLittersForDog(int dogId) async {
+    final littersData = await _database.getLittersForDog(dogId);
+    return littersData.map((litter) => litter.toDomain()).toList();
+  }
+
   @override
   Future<List<domain.Dog>> getAncestorsForPedigree(int dogId, int maxGenerationDepth) async {
     final dogsData = await _database.getAncestorsForPedigree(dogId, maxGenerationDepth);
@@ -71,6 +103,13 @@ class PedigreeRepositoryImpl implements PedigreeRepository {
     return await _database.createLitter(litter.toCompanion());
   }
 
+  @override
+  Future<int> createLitterWithPuppies(domain_litter.Litter litter, List<domain.Dog> puppies) async {
+    final litterCompanion = litter.toCompanion();
+    final puppyCompanions = puppies.map((p) => p.toCompanion()).toList();
+    return await _database.createLitterWithPuppies(litterCompanion, puppyCompanions);
+  }
+
   @override
   Future<domain_litter.Litter?> getLitterById(int litterId) async {
     final litterData = await _database.getLitterById(litterId);
diff --git a/lib/features/pedigree/domain/entities/dog.dart b/lib/features/pedigree/domain/entities/dog.dart
index 387d41a..7c617e3 100644
--- a/lib/features/pedigree/domain/entities/dog.dart
+++ b/lib/features/pedigree/domain/entities/dog.dart
@@ -17,6 +17,7 @@ class Dog {
   final double? inbreedingCoefficient;
   final String? registerType; // 'SP', 'SR', 'B'
   final String? dnaProfileNumber;
+  final String? photoPath;
 
   final String? notes;
   final DateTime createdAt;
@@ -36,6 +37,7 @@ class Dog {
     this.inbreedingCoefficient,
     this.registerType,
     this.dnaProfileNumber,
+    this.photoPath,
     this.notes,
     required this.createdAt,
   });
@@ -60,6 +62,7 @@ class Dog {
     double? inbreedingCoefficient,
     String? registerType,
     String? dnaProfileNumber,
+    String? photoPath,
     String? notes,
     DateTime? createdAt,
   }) {
@@ -78,6 +81,7 @@ class Dog {
       inbreedingCoefficient: inbreedingCoefficient ?? this.inbreedingCoefficient,
       registerType: registerType ?? this.registerType,
       dnaProfileNumber: dnaProfileNumber ?? this.dnaProfileNumber,
+      photoPath: photoPath ?? this.photoPath,
       notes: notes ?? this.notes,
       createdAt: createdAt ?? this.createdAt,
     );
diff --git a/lib/features/pedigree/domain/repositories/pedigree_repository.dart b/lib/features/pedigree/domain/repositories/pedigree_repository.dart
index c7a026c..5f44d7a 100644
--- a/lib/features/pedigree/domain/repositories/pedigree_repository.dart
+++ b/lib/features/pedigree/domain/repositories/pedigree_repository.dart
@@ -6,16 +6,21 @@ abstract class PedigreeRepository {
   Future<Dog> getDogById(int id);
   Future<List<Dog>> searchDogs(String query);
   Future<List<Dog>> getAllDogs();
+  Future<List<Dog>> getFilteredDogs({String? sex, String? sortBy});
   Future<List<Dog>> getDogsForDropdown(String sex);
+  Future<Map<int, String>> getDogNamesByIds(List<int> ids);
   Future<int> insertDog(Dog dog);
   Future<void> updateDog(Dog dog);
   Future<void> deleteDog(int id);
+  Future<List<Dog>> getOffspringForDog(int dogId);
+  Future<List<Litter>> getLittersForDog(int dogId);
 
   // Custom Pedigree Engine Contract
   Future<List<Dog>> getAncestorsForPedigree(int dogId, int maxGenerationDepth);
 
   // Litter Data Contracts
   Future<int> createLitter(Litter litter);
+  Future<int> createLitterWithPuppies(Litter litter, List<Dog> puppies);
   Future<List<Litter>> getAllLitters();
   Future<Litter?> getLitterById(int litterId);
   Future<List<Dog>> getPuppiesInLitter(int litterId);
diff --git a/lib/features/pedigree/presentation/providers/pedigree_providers.dart b/lib/features/pedigree/presentation/providers/pedigree_providers.dart
index 7e81d4f..794457b 100644
--- a/lib/features/pedigree/presentation/providers/pedigree_providers.dart
+++ b/lib/features/pedigree/presentation/providers/pedigree_providers.dart
@@ -1,19 +1,18 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import '../../domain/entities/dog.dart' as domain;
+import '../../domain/entities/litter.dart' as domain_litter;
 import '../../../../core/database/app_database.dart';
 import '../../data/repositories/pedigree_repository_impl.dart';
 import '../../domain/repositories/pedigree_repository.dart';
-import '../../domain/use_cases/search_dogs_use_case.dart';
 import '../../domain/use_cases/get_all_dogs_use_case.dart';
 import '../../domain/use_cases/get_dog_by_id_use_case.dart';
 import '../../domain/use_cases/insert_dog_use_case.dart';
 import '../../domain/use_cases/update_dog_use_case.dart';
 import '../../domain/use_cases/delete_dog_use_case.dart';
-import '../../domain/use_cases/get_ancestors_use_case.dart';
 import '../../domain/use_cases/get_dogs_for_dropdown_use_case.dart';
-import '../../domain/use_cases/create_litter_use_case.dart';
-import '../../domain/use_cases/delete_litter_use_case.dart';
-
-// Database Provider (singleton via AppDatabase factory constructor)
+import '../../domain/use_cases/get_offspring_use_case.dart';
+import '../../domain/use_cases/get_litters_for_dog_use_case.dart';
+// Database Provider
 final databaseProvider = Provider<AppDatabase>((ref) {
   final db = AppDatabase();
   ref.onDispose(() => db.close());
@@ -26,15 +25,13 @@ final pedigreeRepositoryProvider = Provider<PedigreeRepository>((ref) {
   return PedigreeRepositoryImpl(database);
 });
 
-// Use Case Providers
-final searchDogsUseCaseProvider = Provider<SearchDogsUseCase>((ref) {
-  final repository = ref.watch(pedigreeRepositoryProvider);
-  return SearchDogsUseCase(repository);
+// Use Case Providers (kept for backward compatibility)
+final getOffspringUseCaseProvider = Provider<GetOffspringUseCase>((ref) {
+  return GetOffspringUseCase(ref.watch(pedigreeRepositoryProvider));
 });
 
-final getAllDogsUseCaseProvider = Provider<GetAllDogsUseCase>((ref) {
-  final repository = ref.watch(pedigreeRepositoryProvider);
-  return GetAllDogsUseCase(repository);
+final getLittersForDogUseCaseProvider = Provider<GetLittersForDogUseCase>((ref) {
+  return GetLittersForDogUseCase(ref.watch(pedigreeRepositoryProvider));
 });
 
 final getDogByIdUseCaseProvider = Provider<GetDogByIdUseCase>((ref) {
@@ -57,9 +54,9 @@ final deleteDogUseCaseProvider = Provider<DeleteDogUseCase>((ref) {
   return DeleteDogUseCase(repository);
 });
 
-final getAncestorsUseCaseProvider = Provider<GetAncestorsUseCase>((ref) {
+final getAllDogsUseCaseProvider = Provider<GetAllDogsUseCase>((ref) {
   final repository = ref.watch(pedigreeRepositoryProvider);
-  return GetAncestorsUseCase(repository);
+  return GetAllDogsUseCase(repository);
 });
 
 final getDogsForDropdownUseCaseProvider = Provider<GetDogsForDropdownUseCase>((ref) {
@@ -67,12 +64,33 @@ final getDogsForDropdownUseCaseProvider = Provider<GetDogsForDropdownUseCase>((r
   return GetDogsForDropdownUseCase(repository);
 });
 
-final createLitterUseCaseProvider = Provider<CreateLitterUseCase>((ref) {
-  final repository = ref.watch(pedigreeRepositoryProvider);
-  return CreateLitterUseCase(repository);
+// Family Providers for Dog Details
+final dogOffspringProvider = FutureProvider.family.autoDispose<List<domain.Dog>, int>((ref, dogId) async {
+  final useCase = ref.watch(getOffspringUseCaseProvider);
+  return await useCase(dogId);
 });
 
-final deleteLitterUseCaseProvider = Provider<DeleteLitterUseCase>((ref) {
-  final repository = ref.watch(pedigreeRepositoryProvider);
-  return DeleteLitterUseCase(repository);
+final dogLittersProvider = FutureProvider.family.autoDispose<List<domain_litter.Litter>, int>((ref, dogId) async {
+  final useCase = ref.watch(getLittersForDogUseCaseProvider);
+  return await useCase(dogId);
 });
+
+// Photo Gallery Provider
+final dogGalleryProvider = FutureProvider.family.autoDispose<List<DogPhoto>, int>((ref, dogId) async {
+  final db = ref.watch(databaseProvider);
+  return await db.getPhotosForDog(dogId);
+});
+
+// Health Records Provider
+final healthRecordsProvider = FutureProvider.family.autoDispose<List<HealthRecord>, int>((ref, dogId) async {
+  final db = ref.watch(databaseProvider);
+  return await db.getHealthRecordsForDog(dogId);
+});
+
+// Show Records Provider
+final showRecordsProvider = FutureProvider.family.autoDispose<List<ShowRecord>, int>((ref, dogId) async {
+  final db = ref.watch(databaseProvider);
+  return await db.getShowRecordsForDog(dogId);
+});
+
+
diff --git a/lib/features/pedigree/presentation/providers/shared_providers.dart b/lib/features/pedigree/presentation/providers/shared_providers.dart
index f33d4f6..3c6b0c6 100644
--- a/lib/features/pedigree/presentation/providers/shared_providers.dart
+++ b/lib/features/pedigree/presentation/providers/shared_providers.dart
@@ -4,17 +4,41 @@ import '../../../settings/domain/entities/kennel_profile.dart';
 import '../../domain/entities/dog.dart';
 import 'pedigree_providers.dart';
 
-final siresProvider = FutureProvider<List<Dog>>((ref) async {
+final siresProvider = FutureProvider.autoDispose<List<Dog>>((ref) async {
   final useCase = ref.watch(getDogsForDropdownUseCaseProvider);
   return await useCase('Male');
 });
 
-final damsProvider = FutureProvider<List<Dog>>((ref) async {
+final damsProvider = FutureProvider.autoDispose<List<Dog>>((ref) async {
   final useCase = ref.watch(getDogsForDropdownUseCaseProvider);
   return await useCase('Female');
 });
 
-final kennelProfileProvider = FutureProvider<KennelProfile>((ref) async {
+final kennelProfileProvider = FutureProvider.autoDispose<KennelProfile>((ref) async {
   final useCase = ref.watch(getKennelProfileUseCaseProvider);
   return await useCase();
 });
+
+class DashboardFilter {
+  final String sex;
+  final String sortBy;
+
+  const DashboardFilter({
+    this.sex = 'All',
+    this.sortBy = 'Name (A-Z)',
+  });
+
+  DashboardFilter copyWith({
+    String? sex,
+    String? sortBy,
+  }) {
+    return DashboardFilter(
+      sex: sex ?? this.sex,
+      sortBy: sortBy ?? this.sortBy,
+    );
+  }
+}
+
+final dashboardFilterProvider = StateProvider<DashboardFilter>((ref) {
+  return const DashboardFilter();
+});
diff --git a/lib/features/pedigree/presentation/screens/add_dog_screen.dart b/lib/features/pedigree/presentation/screens/add_dog_screen.dart
index 09c5d4b..9d37641 100644
--- a/lib/features/pedigree/presentation/screens/add_dog_screen.dart
+++ b/lib/features/pedigree/presentation/screens/add_dog_screen.dart
@@ -1,6 +1,10 @@
+import 'dart:io';
+import 'package:sqlite3/sqlite3.dart' show SqliteException;
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
+import 'package:image_picker/image_picker.dart';
+import 'package:intl/intl.dart';
 import '../../../../core/theme/app_theme.dart';
 import '../../../../core/utils/responsive.dart';
 import '../../domain/entities/dog.dart';
@@ -9,7 +13,10 @@ import '../providers/shared_providers.dart';
 import 'dashboard_screen.dart';
 
 class AddDogScreen extends ConsumerStatefulWidget {
-  const AddDogScreen({super.key});
+  final int? childId;
+  final bool? isSire;
+
+  const AddDogScreen({super.key, this.childId, this.isSire});
 
   @override
   ConsumerState<AddDogScreen> createState() => _AddDogScreenState();
@@ -22,11 +29,22 @@ class _AddDogScreenState extends ConsumerState<AddDogScreen> {
   final _microchipController = TextEditingController();
   final _colorController = TextEditingController();
   final _notesController = TextEditingController();
+  final _dateOfBirthController = TextEditingController();
+  final _imagePicker = ImagePicker();
 
   String _sex = 'Male';
   int? _selectedSireId;
   int? _selectedDamId;
   DateTime? _dateOfBirth;
+  String? _photoPath;
+
+  @override
+  void initState() {
+    super.initState();
+    if (widget.isSire != null) {
+      _sex = widget.isSire! ? 'Male' : 'Female';
+    }
+  }
 
   @override
   void dispose() {
@@ -35,6 +53,7 @@ class _AddDogScreenState extends ConsumerState<AddDogScreen> {
     _microchipController.dispose();
     _colorController.dispose();
     _notesController.dispose();
+    _dateOfBirthController.dispose();
     super.dispose();
   }
 
@@ -66,6 +85,38 @@ class _AddDogScreenState extends ConsumerState<AddDogScreen> {
               ),
               SizedBox(height: padding),
 
+              GestureDetector(
+                onTap: () async {
+                  final picked = await _imagePicker.pickImage(source: ImageSource.gallery);
+                  if (picked != null) {
+                    setState(() => _photoPath = picked.path);
+                  }
+                },
+                child: Container(
+                  width: double.infinity,
+                  height: 120,
+                  decoration: BoxDecoration(
+                    color: Colors.grey.shade100,
+                    borderRadius: BorderRadius.circular(12),
+                    border: Border.all(color: Colors.grey.shade300),
+                  ),
+                  child: _photoPath != null
+                      ? ClipRRect(
+                          borderRadius: BorderRadius.circular(12),
+                          child: Image.file(File(_photoPath!), fit: BoxFit.cover),
+                        )
+                      : Column(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: [
+                            Icon(Icons.camera_alt, size: 32, color: Colors.grey.shade400),
+                            const SizedBox(height: 8),
+                            Text('Tap to add photo', style: TextStyle(color: Colors.grey.shade500)),
+                          ],
+                        ),
+                ),
+              ),
+              SizedBox(height: padding),
+
               TextFormField(
                 controller: _registeredNameController,
                 decoration: const InputDecoration(
@@ -106,22 +157,31 @@ class _AddDogScreenState extends ConsumerState<AddDogScreen> {
                   DropdownMenuItem(value: 'Male', child: Text('Male')),
                   DropdownMenuItem(value: 'Female', child: Text('Female')),
                 ],
-                onChanged: (value) {
-                  setState(() {
-                    _sex = value!;
-                    _selectedSireId = null;
-                    _selectedDamId = null;
-                  });
-                },
+                onChanged: widget.isSire != null
+                    ? null // Disable changing sex if we are specifically adding a Sire or Dam
+                    : (value) {
+                        setState(() {
+                          _sex = value!;
+                        });
+                      },
               ),
               SizedBox(height: padding),
 
               TextFormField(
                 controller: _microchipController,
                 decoration: const InputDecoration(
-                  labelText: 'Microchip Number',
+                  labelText: 'Microchip Number (9-15 digits)',
                   border: OutlineInputBorder(),
                 ),
+                keyboardType: TextInputType.number,
+                validator: (value) {
+                  if (value != null && value.isNotEmpty) {
+                    if (value.length < 9 || value.length > 15) {
+                      return 'Must be 9-15 digits';
+                    }
+                  }
+                  return null;
+                },
               ),
               SizedBox(height: padding),
 
@@ -136,10 +196,10 @@ class _AddDogScreenState extends ConsumerState<AddDogScreen> {
 
               TextFormField(
                 readOnly: true,
-                decoration: InputDecoration(
+                decoration: const InputDecoration(
                   labelText: 'Date of Birth',
-                  border: const OutlineInputBorder(),
-                  suffixIcon: const Icon(Icons.calendar_today),
+                  border: OutlineInputBorder(),
+                  suffixIcon: Icon(Icons.calendar_today),
                 ),
                 onTap: () async {
                   final date = await showDatePicker(
@@ -154,9 +214,10 @@ class _AddDogScreenState extends ConsumerState<AddDogScreen> {
                     });
                   }
                 },
-                controller: TextEditingController(
-                  text: _dateOfBirth?.toString().split(' ')[0] ?? '',
-                ),
+                  controller: _dateOfBirthController
+                    ..text = _dateOfBirth != null
+                        ? DateFormat('yyyy-MM-dd').format(_dateOfBirth!)
+                        : '',
               ),
               SizedBox(height: padding * 2),
 
@@ -170,51 +231,69 @@ class _AddDogScreenState extends ConsumerState<AddDogScreen> {
               ),
               SizedBox(height: padding),
 
-              if (_sex == 'Male') ...[
-                siresAsync.when(
-                  loading: () => const LinearProgressIndicator(),
-                  error: (e, _) => Text('Error: $e'),
-                  data: (sires) => DropdownButtonFormField<int>(
-                    decoration: const InputDecoration(
-                      labelText: 'Sire (Father)',
-                      border: OutlineInputBorder(),
+              siresAsync.when(
+                loading: () => const LinearProgressIndicator(),
+                error: (e, _) => Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    Text('Error: $e'),
+                    const SizedBox(height: 16),
+                    ElevatedButton(
+                      onPressed: () => ref.invalidate(siresProvider),
+                      child: const Text('Retry'),
                     ),
-                    items: sires.map((dog) {
-                      return DropdownMenuItem(
-                        value: dog.id,
-                        child: Text('${dog.callName} (${dog.registeredName})'),
-                      );
-                    }).toList(),
-                    onChanged: (value) {
-                      setState(() {
-                        _selectedSireId = value;
-                      });
-                    },
+                  ],
+                ),
+                data: (sires) => DropdownButtonFormField<int>(
+                  decoration: const InputDecoration(
+                    labelText: 'Sire (Father) - Optional',
+                    border: OutlineInputBorder(),
                   ),
+                  items: sires.map((dog) {
+                    return DropdownMenuItem(
+                      value: dog.id,
+                      child: Text('${dog.callName} (${dog.registeredName})'),
+                    );
+                  }).toList(),
+                  onChanged: (value) {
+                    setState(() {
+                      _selectedSireId = value;
+                    });
+                  },
                 ),
-              ] else ...[
-                damsAsync.when(
-                  loading: () => const LinearProgressIndicator(),
-                  error: (e, _) => Text('Error: $e'),
-                  data: (dams) => DropdownButtonFormField<int>(
-                    decoration: const InputDecoration(
-                      labelText: 'Dam (Mother)',
-                      border: OutlineInputBorder(),
+              ),
+              SizedBox(height: padding),
+              damsAsync.when(
+                loading: () => const LinearProgressIndicator(),
+                error: (e, _) => Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    Text('Error: $e'),
+                    const SizedBox(height: 16),
+                    ElevatedButton(
+                      onPressed: () => ref.invalidate(damsProvider),
+                      child: const Text('Retry'),
                     ),
-                    items: dams.map((dog) {
-                      return DropdownMenuItem(
-                        value: dog.id,
-                        child: Text('${dog.callName} (${dog.registeredName})'),
-                      );
-                    }).toList(),
-                    onChanged: (value) {
-                      setState(() {
-                        _selectedDamId = value;
-                      });
-                    },
+                  ],
+                ),
+                data: (dams) => DropdownButtonFormField<int>(
+                  decoration: const InputDecoration(
+                    labelText: 'Dam (Mother) - Optional',
+                    border: OutlineInputBorder(),
                   ),
+                  items: dams.map((dog) {
+                    return DropdownMenuItem(
+                      value: dog.id,
+                      child: Text('${dog.callName} (${dog.registeredName})'),
+                    );
+                  }).toList(),
+                  onChanged: (value) {
+                    setState(() {
+                      _selectedDamId = value;
+                    });
+                  },
                 ),
-              ],
+              ),
               SizedBox(height: padding),
 
               TextFormField(
@@ -272,20 +351,41 @@ class _AddDogScreenState extends ConsumerState<AddDogScreen> {
             : _colorController.text.trim(),
         sire: sire,
         dam: dam,
+        photoPath: _photoPath,
         notes: _notesController.text.isEmpty
             ? null
             : _notesController.text.trim(),
         createdAt: DateTime.now(),
       );
 
-      await insertUseCase(dog);
+      final newDogId = await insertUseCase(dog);
+
+      if (widget.childId != null && widget.isSire != null) {
+        final getDog = ref.read(getDogByIdUseCaseProvider);
+        final childDog = await getDog(widget.childId!);
+        final newDog = await getDog(newDogId);
+        final updatedChild = widget.isSire!
+            ? childDog.copyWith(sire: newDog)
+            : childDog.copyWith(dam: newDog);
+        await ref.read(updateDogUseCaseProvider)(updatedChild);
+      }
 
       if (mounted) {
         ref.invalidate(dogsProvider);
         ScaffoldMessenger.of(context).showSnackBar(
           const SnackBar(content: Text('Dog added successfully')),
         );
-        context.pop();
+        context.pop(true);
+      }
+    } on SqliteException catch (e) {
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(e.message.contains('UNIQUE')
+                ? 'A dog with this name or microchip already exists'
+                : 'Error saving dog: $e'),
+          ),
+        );
       }
     } catch (e) {
       if (mounted) {
diff --git a/lib/features/pedigree/presentation/screens/dashboard_screen.dart b/lib/features/pedigree/presentation/screens/dashboard_screen.dart
index 47bf435..890afcd 100644
--- a/lib/features/pedigree/presentation/screens/dashboard_screen.dart
+++ b/lib/features/pedigree/presentation/screens/dashboard_screen.dart
@@ -1,22 +1,39 @@
+import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
+import 'package:shimmer/shimmer.dart';
 import '../../../../core/utils/responsive.dart';
+import '../../domain/entities/dog.dart';
 import '../providers/pedigree_providers.dart';
+import '../providers/shared_providers.dart';
 import '../widgets/dog_list_item.dart';
 
 final _searchQueryProvider = StateProvider<String>((ref) => '');
+final _debouncedSearchProvider = Provider<String>((ref) {
+  return ref.watch(_searchQueryProvider);
+});
+
+final dogsProvider = FutureProvider.autoDispose<List<Dog>>((ref) async {
+  final query = ref.watch(_debouncedSearchProvider);
+  final filter = ref.watch(dashboardFilterProvider);
+  final repo = ref.watch(pedigreeRepositoryProvider);
 
-final dogsProvider = FutureProvider.autoDispose<List>((ref) async {
-  final query = ref.watch(_searchQueryProvider);
-  if (query.isEmpty) {
-    final useCase = ref.watch(getAllDogsUseCaseProvider);
-    return await useCase();
+  if (query.isNotEmpty) {
+    return await repo.searchDogs(query);
   }
-  final useCase = ref.watch(searchDogsUseCaseProvider);
-  return await useCase(query);
+  return await repo.getFilteredDogs(sex: filter.sex, sortBy: filter.sortBy);
 });
 
+class _SearchDebouncer {
+  Timer? _timer;
+  void call(String value, void Function(String) onDone) {
+    _timer?.cancel();
+    _timer = Timer(const Duration(milliseconds: 300), () => onDone(value));
+  }
+  void dispose() => _timer?.cancel();
+}
+
 class DashboardScreen extends ConsumerStatefulWidget {
   const DashboardScreen({super.key});
 
@@ -26,10 +43,12 @@ class DashboardScreen extends ConsumerStatefulWidget {
 
 class _DashboardScreenState extends ConsumerState<DashboardScreen> {
   final TextEditingController _searchController = TextEditingController();
+  final _debouncer = _SearchDebouncer();
 
   @override
   void dispose() {
     _searchController.dispose();
+    _debouncer.dispose();
     super.dispose();
   }
 
@@ -41,13 +60,28 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
 
     return Scaffold(
       appBar: AppBar(
-        title: Image.asset(
-          'assets/images/appbarlogo.png',
-          height: 36,
-          fit: BoxFit.contain,
-          errorBuilder: (context, error, stackTrace) => const Text('ZooPed'),
+        toolbarHeight: 48,
+        title: Container(
+          decoration: const BoxDecoration(
+            shape: BoxShape.circle,
+            color: Colors.white,
+          ),
+          padding: const EdgeInsets.all(6),
+          child: Image.asset(
+            'assets/images/logo.png',
+            height: 40,
+            width: 40,
+            fit: BoxFit.contain,
+            errorBuilder: (context, error, stackTrace) => const Text('ZooPed'),
+          ),
         ),
+        centerTitle: false,
         actions: [
+          IconButton(
+            icon: const Icon(Icons.family_restroom),
+            tooltip: 'View Litters',
+            onPressed: () => context.push('/litters'),
+          ),
           IconButton(
             icon: const Icon(Icons.settings),
             onPressed: () => context.push('/settings'),
@@ -58,29 +92,73 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
         children: [
           Padding(
             padding: EdgeInsets.all(padding),
-            child: TextField(
-              controller: _searchController,
-              decoration: InputDecoration(
-                hintText: 'Search dogs by name, registered name, or microchip...',
-                prefixIcon: const Icon(Icons.search),
-                suffixIcon: _searchController.text.isNotEmpty
-                    ? IconButton(
-                        icon: const Icon(Icons.clear),
-                        onPressed: () {
-                          _searchController.clear();
-                          ref.read(_searchQueryProvider.notifier).state = '';
-                        },
-                      )
-                    : null,
-              ),
-              onChanged: (value) {
-                ref.read(_searchQueryProvider.notifier).state = value;
-              },
+            child: Row(
+              children: [
+                Expanded(
+                  child: TextField(
+                    controller: _searchController,
+                    decoration: InputDecoration(
+                      hintText: 'Search dogs...',
+                      prefixIcon: const Icon(Icons.search),
+                      suffixIcon: _searchController.text.isNotEmpty
+                          ? IconButton(
+                              icon: const Icon(Icons.clear),
+                              onPressed: () {
+                                _searchController.clear();
+                                ref.read(_searchQueryProvider.notifier).state = '';
+                                FocusScope.of(context).unfocus();
+                              },
+                            )
+                          : null,
+                    ),
+                    onChanged: (value) {
+                      _debouncer(value, (v) {
+                        if (mounted) {
+                          ref.read(_searchQueryProvider.notifier).state = v;
+                        }
+                      });
+                    },
+                  ),
+                ),
+                const SizedBox(width: 8),
+                IconButton.filledTonal(
+                  icon: const Icon(Icons.tune),
+                  onPressed: () => _showFilterBottomSheet(context),
+                  tooltip: 'Filter List',
+                ),
+              ],
             ),
           ),
+          _buildActiveFilterChips(),
           Expanded(
             child: dogsAsync.when(
-              loading: () => const Center(child: CircularProgressIndicator()),
+              loading: () => ListView.builder(
+                padding: EdgeInsets.all(padding),
+                itemCount: 5,
+                itemBuilder: (context, index) {
+                  return Shimmer.fromColors(
+                    baseColor: Colors.grey.shade300,
+                    highlightColor: Colors.grey.shade100,
+                    child: Card(
+                      margin: EdgeInsets.only(bottom: padding),
+                      child: ListTile(
+                        leading: const CircleAvatar(radius: 24),
+                        title: Container(
+                          height: 16,
+                          width: double.infinity,
+                          color: Colors.white,
+                        ),
+                        subtitle: Container(
+                          height: 12,
+                          width: 100,
+                          color: Colors.white,
+                          margin: const EdgeInsets.only(top: 8),
+                        ),
+                      ),
+                    ),
+                  );
+                },
+              ),
               error: (e, _) => Center(
                 child: Column(
                   mainAxisAlignment: MainAxisAlignment.center,
@@ -197,9 +275,137 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
                 context.push('/litter/new');
               },
             ),
+            ListTile(
+              leading: const Icon(Icons.list_alt),
+              title: const Text('View Litters'),
+              onTap: () {
+                Navigator.pop(context);
+                context.push('/litters');
+              },
+            ),
+            const Divider(),
+            ListTile(
+              leading: const Icon(Icons.science, color: Colors.purple),
+              title: const Text('Matchmaker Predictions'),
+              onTap: () {
+                Navigator.pop(context);
+                context.push('/matchmaker');
+              },
+            ),
           ],
         ),
       ),
     );
   }
+
+  void _showFilterBottomSheet(BuildContext context) {
+    showModalBottomSheet(
+      context: context,
+      isScrollControlled: true,
+      builder: (ctx) => const _FilterBottomSheet(),
+    );
+  }
+
+  Widget _buildActiveFilterChips() {
+    final filter = ref.watch(dashboardFilterProvider);
+    if (filter.sex == 'All' && filter.sortBy == 'Name (A-Z)') return const SizedBox.shrink();
+
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 16.0).copyWith(bottom: 8.0),
+      child: Row(
+        children: [
+          const Icon(Icons.filter_list, size: 16, color: Colors.grey),
+          const SizedBox(width: 8),
+          if (filter.sex != 'All')
+            Padding(
+              padding: const EdgeInsets.only(right: 8.0),
+              child: Chip(
+                label: Text(filter.sex),
+                onDeleted: () => ref.read(dashboardFilterProvider.notifier).state = filter.copyWith(sex: 'All'),
+                visualDensity: VisualDensity.compact,
+              ),
+            ),
+          if (filter.sortBy != 'Name (A-Z)')
+            Chip(
+              label: Text('Sort: ${filter.sortBy}'),
+              onDeleted: () => ref.read(dashboardFilterProvider.notifier).state = filter.copyWith(sortBy: 'Name (A-Z)'),
+              visualDensity: VisualDensity.compact,
+            ),
+        ],
+      ),
+    );
+  }
+}
+
+class _FilterBottomSheet extends ConsumerWidget {
+  const _FilterBottomSheet();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final filter = ref.watch(dashboardFilterProvider);
+    final notifier = ref.read(dashboardFilterProvider.notifier);
+
+    return Padding(
+      padding: EdgeInsets.only(
+        bottom: MediaQuery.of(context).viewInsets.bottom,
+        left: 16,
+        right: 16,
+        top: 24,
+      ),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              const Text('Filter & Sort', style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold)),
+              IconButton(
+                icon: const Icon(Icons.close),
+                onPressed: () => Navigator.pop(context),
+              ),
+            ],
+          ),
+          const Divider(),
+          const SizedBox(height: 8),
+          const Text('Sex', style: TextStyle(fontWeight: FontWeight.w600)),
+          const SizedBox(height: 8),
+          SegmentedButton<String>(
+            segments: const [
+              ButtonSegment(value: 'All', label: Text('All')),
+              ButtonSegment(value: 'Male', label: Text('Male')),
+              ButtonSegment(value: 'Female', label: Text('Female')),
+            ],
+            selected: {filter.sex},
+            onSelectionChanged: (set) => notifier.state = filter.copyWith(sex: set.first),
+            style: SegmentedButton.styleFrom(visualDensity: VisualDensity.compact),
+          ),
+          const SizedBox(height: 24),
+          const Text('Sort By', style: TextStyle(fontWeight: FontWeight.w600)),
+          const SizedBox(height: 8),
+          Wrap(
+            spacing: 8,
+            children: ['Name (A-Z)', 'Recent', 'Age (Youngest)'].map((sortOption) {
+              return ChoiceChip(
+                label: Text(sortOption),
+                selected: filter.sortBy == sortOption,
+                onSelected: (selected) {
+                  if (selected) notifier.state = filter.copyWith(sortBy: sortOption);
+                },
+              );
+            }).toList(),
+          ),
+          const SizedBox(height: 32),
+          SizedBox(
+            width: double.infinity,
+            child: ElevatedButton(
+              onPressed: () => Navigator.pop(context),
+              child: const Text('Apply'),
+            ),
+          ),
+          const SizedBox(height: 24),
+        ],
+      ),
+    );
+  }
 }
diff --git a/lib/features/pedigree/presentation/screens/dog_detail_screen.dart b/lib/features/pedigree/presentation/screens/dog_detail_screen.dart
index 199f627..b8f4f1c 100644
--- a/lib/features/pedigree/presentation/screens/dog_detail_screen.dart
+++ b/lib/features/pedigree/presentation/screens/dog_detail_screen.dart
@@ -1,7 +1,12 @@
 import 'dart:io';
+import 'package:sqlite3/sqlite3.dart' show SqliteException;
+import 'package:pdf/widgets.dart' as pw;
+import '../../../../core/database/app_database.dart' hide Dog;
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
+import 'package:image_picker/image_picker.dart';
+import 'package:intl/intl.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:path/path.dart' as p;
 import '../../../../core/services/certificate_service.dart';
@@ -11,6 +16,7 @@ import '../../domain/entities/dog.dart';
 import '../providers/pedigree_providers.dart';
 import '../providers/shared_providers.dart';
 import '../widgets/pedigree_canvas.dart';
+import 'dashboard_screen.dart';
 
 final _dogProvider = FutureProvider.family<Dog, int>((ref, dogId) async {
   final useCase = ref.watch(getDogByIdUseCaseProvider);
@@ -28,6 +34,8 @@ class DogDetailScreen extends ConsumerStatefulWidget {
 
 class _DogDetailScreenState extends ConsumerState<DogDetailScreen> {
   bool _generatingPdf = false;
+  Dog? _dog;
+  final _imagePicker = ImagePicker();
 
   @override
   Widget build(BuildContext context) {
@@ -36,8 +44,22 @@ class _DogDetailScreenState extends ConsumerState<DogDetailScreen> {
     final isTablet = Responsive.isTablet(context);
 
     return Scaffold(
+      backgroundColor: Colors.grey.shade50,
       appBar: AppBar(
-        title: const Text('Dog Profile'),
+        title: const Text('Dog Profile', style: TextStyle(fontWeight: FontWeight.w600)),
+        elevation: 0,
+        backgroundColor: Colors.white,
+        foregroundColor: AppTheme.secondaryColor,
+        actions: [
+          IconButton(
+            icon: const Icon(Icons.edit_outlined),
+            onPressed: () => context.push('/dog/${widget.dogId}/edit'),
+          ),
+          IconButton(
+            icon: const Icon(Icons.delete_outline),
+            onPressed: _dog != null ? () => _confirmDelete(context) : null,
+          ),
+        ],
       ),
       body: dogAsync.when(
         loading: () => const Center(child: CircularProgressIndicator()),
@@ -57,62 +79,199 @@ class _DogDetailScreenState extends ConsumerState<DogDetailScreen> {
           ),
         ),
         data: (dog) {
+          _dog = dog;
+          
+          const tabBar = TabBar(
+            labelColor: AppTheme.primaryColor,
+            unselectedLabelColor: Colors.grey,
+            indicatorColor: AppTheme.primaryColor,
+            tabs: [
+              Tab(text: 'Pedigree Map'),
+              Tab(text: 'Health Records'),
+              Tab(text: 'Shows & Titles'),
+              Tab(text: 'Litters & Offspring'),
+            ],
+          );
+
+          final tabBarView = TabBarView(
+            children: [
+              PedigreeCanvas(
+                rootDog: dog,
+                onDogTap: (selectedDog) {
+                  context.push('/dog/${selectedDog.id}');
+                },
+                onUnknownTap: (childDog, isSire, roleName) async {
+                  if (childDog == null) {
+                    ScaffoldMessenger.of(context).showSnackBar(
+                      const SnackBar(content: Text('Please add the missing parent first before adding grandparents.')),
+                    );
+                    return;
+                  }
+
+                  final confirmed = await showDialog<bool>(
+                    context: context,
+                    builder: (ctx) => AlertDialog(
+                      title: Text('Add $roleName'),
+                      content: Text('Would you like to add a new dog as the $roleName for ${childDog.callName}?'),
+                      actions: [
+                        TextButton(
+                          onPressed: () => Navigator.pop(ctx, false),
+                          child: const Text('Cancel'),
+                        ),
+                        ElevatedButton(
+                          onPressed: () => Navigator.pop(ctx, true),
+                          child: const Text('Add Dog'),
+                        ),
+                      ],
+                    ),
+                  );
+
+                  if (confirmed == true && context.mounted) {
+                    final result = await context.push<bool>('/dog/new', extra: {
+                      'childId': childDog.id,
+                      'isSire': isSire,
+                    });
+                    
+                    if (result == true && context.mounted) {
+                      ref.invalidate(_dogProvider(widget.dogId));
+                    }
+                  }
+                },
+              ),
+              _buildHealthTab(context, dog),
+              _buildShowTab(context, dog),
+              _buildOffspringTab(context, dog),
+            ],
+          );
+
           if (isTablet) {
-            return Row(
-              children: [
-                Expanded(
-                  flex: 1,
-                  child: _buildIdentityPanel(context, dog, padding),
-                ),
-                const VerticalDivider(width: 1),
-                Expanded(
-                  flex: 2,
-                  child: PedigreeCanvas(
-                    rootDog: dog,
-                    onDogTap: (selectedDog) {
-                      context.push('/dog/${selectedDog.id}');
-                    },
+            return DefaultTabController(
+              length: 4,
+              child: Row(
+                crossAxisAlignment: CrossAxisAlignment.stretch,
+                children: [
+                  Container(
+                    width: 350.0,
+                    decoration: BoxDecoration(
+                      color: Colors.white,
+                      boxShadow: [
+                        BoxShadow(
+                          color: Colors.black.withValues(alpha: 0.05),
+                          blurRadius: 15.0,
+                          offset: const Offset(4, 0),
+                        ),
+                      ],
+                    ),
+                    child: SingleChildScrollView(
+                      child: _buildIdentityPanel(context, dog, padding),
+                    ),
                   ),
-                ),
-              ],
+                  Expanded(
+                    child: Column(
+                      children: [
+                        tabBar,
+                        Expanded(child: tabBarView),
+                      ],
+                    ),
+                  ),
+                ],
+              ),
             );
           }
 
-          return Column(
-            children: [
-              ConstrainedBox(
-                constraints: BoxConstraints(
-                  maxHeight: MediaQuery.of(context).size.height * 0.45,
-                ),
-                child: _buildIdentityPanel(context, dog, padding),
-              ),
-              const Divider(height: 1),
-              Expanded(
-                child: PedigreeCanvas(
-                  rootDog: dog,
-                  onDogTap: (selectedDog) {
-                    context.push('/dog/${selectedDog.id}');
-                  },
-                ),
-              ),
-            ],
+          return DefaultTabController(
+            length: 4,
+            child: NestedScrollView(
+              headerSliverBuilder: (context, innerBoxIsScrolled) {
+                return [
+                  SliverToBoxAdapter(
+                    child: Container(
+                      decoration: BoxDecoration(
+                        color: Colors.white,
+                        boxShadow: [
+                          BoxShadow(
+                            color: Colors.black.withValues(alpha: 0.05),
+                            blurRadius: 15.0,
+                            offset: const Offset(0, 4),
+                          ),
+                        ],
+                        borderRadius: const BorderRadius.only(
+                          bottomLeft: Radius.circular(24.0),
+                          bottomRight: Radius.circular(24.0),
+                        ),
+                      ),
+                      child: ClipRRect(
+                        borderRadius: const BorderRadius.only(
+                          bottomLeft: Radius.circular(24.0),
+                          bottomRight: Radius.circular(24.0),
+                        ),
+                        child: _buildIdentityPanel(context, dog, padding),
+                      ),
+                    ),
+                  ),
+                  SliverPersistentHeader(
+                    pinned: true,
+                    delegate: _SliverAppBarDelegate(tabBar),
+                  ),
+                ];
+              },
+              body: tabBarView,
+            ),
           );
         },
       ),
     );
   }
 
+  Future<Map<int, pw.MemoryImage>> _preloadDogImages(Dog rootDog) async {
+    final Map<int, pw.MemoryImage> imageMap = {};
+    final List<Dog> queue = [rootDog];
+    
+    while (queue.isNotEmpty) {
+      final current = queue.removeAt(0);
+      if (current.photoPath != null && current.photoPath!.isNotEmpty) {
+        try {
+          final file = File(current.photoPath!);
+          if (await file.exists()) {
+            final bytes = await file.readAsBytes();
+            imageMap[current.id] = pw.MemoryImage(bytes);
+          }
+        } catch (_) {
+          // Ignore failed image loads
+        }
+      }
+      
+      if (current.sire != null) queue.add(current.sire!);
+      if (current.dam != null) queue.add(current.dam!);
+    }
+    
+    return imageMap;
+  }
+
   Future<void> _generateAndPrintCertificate(Dog dog) async {
     setState(() => _generatingPdf = true);
     try {
       final profile = await ref.read(kennelProfileProvider.future);
       final logoFile = profile.localLogoPath != null ? File(profile.localLogoPath!) : null;
+      final preloadedImages = await _preloadDogImages(dog);
+      
       final pdf = await CertificateService.generateCertificate(
         dog: dog,
         kennelProfile: profile,
         logoFile: logoFile,
+        preloadedImages: preloadedImages,
       );
       await CertificateService.printPdf(pdf);
+    } on SqliteException catch (e) {
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(e.message.contains('UNIQUE')
+                ? 'A record with this name or microchip already exists'
+                : 'Error generating certificate: $e'),
+          ),
+        );
+      }
     } catch (e) {
       if (mounted) {
         ScaffoldMessenger.of(context).showSnackBar(
@@ -129,15 +288,28 @@ class _DogDetailScreenState extends ConsumerState<DogDetailScreen> {
     try {
       final profile = await ref.read(kennelProfileProvider.future);
       final logoFile = profile.localLogoPath != null ? File(profile.localLogoPath!) : null;
+      final preloadedImages = await _preloadDogImages(dog);
+      
       final pdf = await CertificateService.generateCertificate(
         dog: dog,
         kennelProfile: profile,
         logoFile: logoFile,
+        preloadedImages: preloadedImages,
       );
       final tempDir = await getTemporaryDirectory();
       final file = File(p.join(tempDir.path, 'zooped_certificate_${dog.id}.pdf'));
       await file.writeAsBytes(await pdf.save());
       await CertificateService.sharePdf(file, dog.registeredName);
+    } on SqliteException catch (e) {
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(e.message.contains('UNIQUE')
+                ? 'A record with this name or microchip already exists'
+                : 'Error generating certificate: $e'),
+          ),
+        );
+      }
     } catch (e) {
       if (mounted) {
         ScaffoldMessenger.of(context).showSnackBar(
@@ -149,90 +321,244 @@ class _DogDetailScreenState extends ConsumerState<DogDetailScreen> {
     }
   }
 
+  Widget _buildOffspringTab(BuildContext context, Dog dog) {
+    final offspringAsync = ref.watch(dogOffspringProvider(dog.id));
+    
+    return offspringAsync.when(
+      loading: () => const Center(child: CircularProgressIndicator()),
+      error: (err, stack) => Center(
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Text('Error: $err'),
+            const SizedBox(height: 16),
+            ElevatedButton(
+              onPressed: () => ref.invalidate(dogOffspringProvider(dog.id)),
+              child: const Text('Retry'),
+            ),
+          ],
+        ),
+      ),
+      data: (offspring) {
+        if (offspring.isEmpty) {
+          return Center(
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                const Icon(Icons.pets, size: 64, color: Colors.grey),
+                const SizedBox(height: 16),
+                Text('No offspring recorded yet', style: TextStyle(fontSize: 18, color: Colors.grey.shade600)),
+              ],
+            ),
+          );
+        }
+        
+        return ListView.builder(
+          padding: const EdgeInsets.all(16),
+          itemCount: offspring.length,
+          itemBuilder: (context, index) {
+            final puppy = offspring[index];
+            return Card(
+              margin: const EdgeInsets.only(bottom: 12),
+              child: ListTile(
+                leading: const CircleAvatar(child: Icon(Icons.pets)),
+                title: Text(puppy.callName),
+                subtitle: Text(puppy.registeredName),
+                onTap: () => context.push('/dog/${puppy.id}'),
+              ),
+            );
+          },
+        );
+      },
+    );
+  }
+
+  Future<void> _confirmDelete(BuildContext context) async {
+    final dog = _dog;
+    if (dog == null) return;
+
+    final confirmed = await showDialog<bool>(
+      context: context,
+      builder: (ctx) => AlertDialog(
+        title: const Text('Delete Dog'),
+        content: Text(
+          'Are you sure you want to delete ${dog.callName}? This will remove all records related to this dog, including pedigree links and associated litters.',
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(ctx, false),
+            child: const Text('Cancel'),
+          ),
+          TextButton(
+            onPressed: () => Navigator.pop(ctx, true),
+            style: TextButton.styleFrom(foregroundColor: Colors.red),
+            child: const Text('Delete'),
+          ),
+        ],
+      ),
+    );
+
+    if (confirmed == true && context.mounted) {
+      try {
+        await ref.read(deleteDogUseCaseProvider).call(widget.dogId);
+        if (context.mounted) {
+          ref.invalidate(dogsProvider);
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(content: Text('${dog.callName} has been deleted.')),
+          );
+          context.go('/');
+        }
+      } on SqliteException catch (e) {
+        if (context.mounted) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(
+              content: Text(e.message.contains('UNIQUE')
+                  ? 'A record with this name or microchip already exists'
+                  : 'Error deleting dog: $e'),
+            ),
+          );
+        }
+      } catch (e) {
+        if (context.mounted) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(content: Text('Error deleting dog: $e')),
+          );
+        }
+      }
+    }
+  }
+
   Widget _buildIdentityPanel(BuildContext context, Dog dog, double padding) {
     final isTablet = Responsive.isTablet(context);
 
     return Column(
       mainAxisSize: MainAxisSize.min,
+      crossAxisAlignment: CrossAxisAlignment.stretch,
       children: [
-        Expanded(
-          child: SingleChildScrollView(
-            padding: EdgeInsets.all(padding),
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text(
-                  dog.registeredName,
-                  style: TextStyle(
-                    fontSize: isTablet ? 24.0 : 20.0,
-                    fontWeight: FontWeight.bold,
-                    color: AppTheme.secondaryColor,
-                  ),
+        // Premium Gradient Header
+        Container(
+          padding: EdgeInsets.fromLTRB(padding, padding * 1.5, padding, padding),
+          decoration: BoxDecoration(
+            gradient: LinearGradient(
+              colors: [
+                AppTheme.primaryColor.withValues(alpha: 0.1),
+                Colors.white,
+              ],
+              begin: Alignment.topCenter,
+              end: Alignment.bottomCenter,
+            ),
+          ),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                dog.registeredName,
+                style: TextStyle(
+                  fontSize: isTablet ? 28.0 : 22.0,
+                  fontWeight: FontWeight.w800,
+                  color: AppTheme.secondaryColor,
+                  letterSpacing: -0.5,
                 ),
-                SizedBox(height: padding * 0.25),
-                Text(
-                  'Call Name: ${dog.callName}',
-                  style: TextStyle(
-                    fontSize: isTablet ? 16.0 : 14.0,
-                    color: Colors.grey.shade600,
+              ),
+              const SizedBox(height: 6.0),
+              Row(
+                children: [
+                  Icon(
+                    dog.sex == 'Male' ? Icons.male : Icons.female,
+                    color: dog.sex == 'Male' ? Colors.blue : Colors.pink,
+                    size: 20.0,
                   ),
+                  const SizedBox(width: 4.0),
+                  Text(
+                    dog.callName,
+                    style: TextStyle(
+                      fontSize: isTablet ? 18.0 : 16.0,
+                      fontWeight: FontWeight.w500,
+                      color: Colors.grey.shade600,
+                    ),
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ),
+
+        // Photo
+        if (dog.photoPath != null)
+          Padding(
+            padding: EdgeInsets.all(padding),
+            child: Hero(
+              tag: 'dog_photo_${dog.id}',
+              child: ClipRRect(
+                borderRadius: BorderRadius.circular(12),
+                child: Image.file(
+                  File(dog.photoPath!),
+                  height: 200,
+                  width: double.infinity,
+                  fit: BoxFit.cover,
+                  errorBuilder: (context, error, stackTrace) => const SizedBox.shrink(),
                 ),
-                SizedBox(height: padding),
-                Wrap(
-                  spacing: padding,
-                  runSpacing: padding * 0.5,
-                  children: [
-                    _buildDetailChip('Sex', dog.sex, isTablet),
-                    if (dog.microchipNumber != null)
-                      _buildDetailChip('Microchip', dog.microchipNumber!, isTablet),
-                    if (dog.dateOfBirth != null)
-                      _buildDetailChip('DOB', dog.dateOfBirth.toString().split(' ')[0], isTablet),
-                    if (dog.colorMarkings != null)
-                      _buildDetailChip('Color', dog.colorMarkings!, isTablet),
-                    if (dog.registerType != null)
-                      _buildDetailChip('Register', dog.registerType!, isTablet),
-                    if (dog.appraisalScore != null)
-                      _buildDetailChip('Appraisal', dog.appraisalScore.toString(), isTablet),
-                    if (dog.inbreedingCoefficient != null)
-                      _buildDetailChip('COI', dog.inbreedingCoefficient.toString(), isTablet),
-                  ],
-                ),
-              ],
+              ),
             ),
           ),
+        
+        // Chips Area
+        Padding(
+          padding: EdgeInsets.symmetric(horizontal: padding),
+          child: Wrap(
+            spacing: 8.0,
+            runSpacing: 10.0,
+            children: [
+              if (dog.microchipNumber != null && dog.microchipNumber!.isNotEmpty)
+                _buildDetailChip(Icons.memory, 'Chip', dog.microchipNumber!),
+              if (dog.dateOfBirth != null)
+                if (dog.dateOfBirth != null)
+                  _buildDetailChip(Icons.cake, 'DOB', DateFormat('yyyy-MM-dd').format(dog.dateOfBirth!)),
+              if (dog.colorMarkings != null && dog.colorMarkings!.isNotEmpty)
+                _buildDetailChip(Icons.palette, 'Color', dog.colorMarkings!),
+              if (dog.registerType != null && dog.registerType!.isNotEmpty)
+                _buildDetailChip(Icons.badge, 'Reg', dog.registerType!),
+              if (dog.appraisalScore != null)
+                _buildDetailChip(Icons.military_tech, 'Score', dog.appraisalScore.toString()),
+              if (dog.inbreedingCoefficient != null)
+                _buildDetailChip(Icons.science, 'COI', '${dog.inbreedingCoefficient}%'),
+            ],
+          ),
         ),
+
+        // Action Buttons
         SafeArea(
           top: false,
           child: Padding(
-            padding: EdgeInsets.fromLTRB(padding, 0, padding, padding),
+            padding: EdgeInsets.all(padding),
             child: Row(
               children: [
                 Expanded(
                   child: ElevatedButton.icon(
                     onPressed: _generatingPdf ? null : () => _generateAndPrintCertificate(dog),
                     icon: _generatingPdf
-                        ? const SizedBox(width: 16, height: 16, child: CircularProgressIndicator(strokeWidth: 2))
-                        : const Icon(Icons.print),
-                    label: const Text('Print Certificate'),
+                        ? const SizedBox(width: 16, height: 16, child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white))
+                        : const Icon(Icons.print, size: 20),
+                    label: const Text('Print'),
                     style: ElevatedButton.styleFrom(
-                      padding: EdgeInsets.symmetric(
-                        vertical: isTablet ? 16.0 : 12.0,
-                      ),
+                      padding: EdgeInsets.symmetric(vertical: isTablet ? 16.0 : 14.0),
+                      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12.0)),
+                      elevation: 0,
                     ),
                   ),
                 ),
-                SizedBox(width: padding),
+                SizedBox(width: padding * 0.75),
                 Expanded(
-                  child: ElevatedButton.icon(
+                  child: OutlinedButton.icon(
                     onPressed: _generatingPdf ? null : () => _generateAndShareCertificate(dog),
                     icon: _generatingPdf
                         ? const SizedBox(width: 16, height: 16, child: CircularProgressIndicator(strokeWidth: 2))
-                        : const Icon(Icons.share),
+                        : const Icon(Icons.share, size: 20),
                     label: const Text('Share'),
-                    style: ElevatedButton.styleFrom(
-                      padding: EdgeInsets.symmetric(
-                        vertical: isTablet ? 16.0 : 12.0,
-                      ),
+                    style: OutlinedButton.styleFrom(
+                      padding: EdgeInsets.symmetric(vertical: isTablet ? 16.0 : 14.0),
+                      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12.0)),
+                      side: BorderSide(color: AppTheme.primaryColor.withValues(alpha: 0.5)),
                     ),
                   ),
                 ),
@@ -240,38 +566,418 @@ class _DogDetailScreenState extends ConsumerState<DogDetailScreen> {
             ),
           ),
         ),
+
+        // Photo Gallery Section
+        _buildPhotoGallery(context, dog),
+        const SizedBox(height: 16.0),
       ],
     );
   }
 
-  Widget _buildDetailChip(String label, String value, bool isTablet) {
-    return Chip(
-      label: RichText(
-        text: TextSpan(
-          children: [
-            TextSpan(
-              text: '$label: ',
-              style: TextStyle(
-                fontWeight: FontWeight.bold,
-                color: Colors.grey.shade700,
-                fontSize: isTablet ? 14.0 : 12.0,
+  Widget _buildDetailChip(IconData icon, String label, String value) {
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 10.0, vertical: 8.0),
+      decoration: BoxDecoration(
+        color: Colors.grey.shade100,
+        borderRadius: BorderRadius.circular(10.0),
+        border: Border.all(color: Colors.grey.shade200),
+      ),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Icon(icon, size: 14.0, color: Colors.grey.shade600),
+          const SizedBox(width: 6.0),
+          Text(
+            '$label: ',
+            style: TextStyle(
+              fontWeight: FontWeight.w600,
+              color: Colors.grey.shade600,
+              fontSize: 12.0,
+            ),
+          ),
+          Text(
+            value,
+            style: const TextStyle(
+              fontWeight: FontWeight.bold,
+              color: AppTheme.secondaryColor,
+              fontSize: 12.0,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildPhotoGallery(BuildContext context, Dog dog) {
+    final galleryAsync = ref.watch(dogGalleryProvider(dog.id));
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              const Text('Photo Gallery', style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
+              TextButton.icon(
+                onPressed: () => _addGalleryPhoto(dog.id),
+                icon: const Icon(Icons.add_a_photo, size: 18),
+                label: const Text('Add'),
               ),
+            ],
+          ),
+        ),
+        galleryAsync.when(
+          loading: () => const Center(child: CircularProgressIndicator()),
+          error: (e, _) => Center(
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                Text('Error loading gallery: $e'),
+                const SizedBox(height: 16),
+                ElevatedButton(
+                  onPressed: () => ref.invalidate(dogGalleryProvider(dog.id)),
+                  child: const Text('Retry'),
+                ),
+              ],
             ),
-            TextSpan(
-              text: value,
-              style: TextStyle(
-                color: Colors.grey.shade600,
-                fontSize: isTablet ? 14.0 : 12.0,
+          ),
+          data: (photos) {
+            if (photos.isEmpty) {
+              return const Padding(
+                padding: EdgeInsets.symmetric(horizontal: 16.0),
+                child: Text('No photos yet. Add some to build a gallery!', style: TextStyle(color: Colors.grey)),
+              );
+            }
+            return SizedBox(
+              height: 120,
+              child: ListView.builder(
+                scrollDirection: Axis.horizontal,
+                padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                itemCount: photos.length,
+                itemBuilder: (context, index) {
+                  final photo = photos[index];
+                  return Stack(
+                    children: [
+                      Container(
+                        width: 120,
+                        margin: const EdgeInsets.only(right: 8.0),
+                        child: ClipRRect(
+                          borderRadius: BorderRadius.circular(12),
+                          child: Image.file(
+                            File(photo.photoPath),
+                            fit: BoxFit.cover,
+                            errorBuilder: (context, error, stackTrace) => Container(
+                              color: Colors.grey.shade200,
+                              child: const Icon(Icons.broken_image, color: Colors.grey),
+                            ),
+                          ),
+                        ),
+                      ),
+                      Positioned(
+                        top: 4,
+                        right: 12,
+                        child: GestureDetector(
+                          onTap: () => _deleteGalleryPhoto(photo.id, dog.id),
+                          child: Container(
+                            padding: const EdgeInsets.all(4),
+                            decoration: const BoxDecoration(
+                              color: Colors.black54,
+                              shape: BoxShape.circle,
+                            ),
+                            child: const Icon(Icons.close, size: 14, color: Colors.white),
+                          ),
+                        ),
+                      ),
+                    ],
+                  );
+                },
+              ),
+            );
+          },
+        ),
+      ],
+    );
+  }
+
+  Future<void> _addGalleryPhoto(int dogId) async {
+    final picked = await _imagePicker.pickImage(source: ImageSource.gallery);
+    if (picked != null) {
+      final db = ref.read(databaseProvider);
+      await db.addDogPhoto(DogPhotosCompanion.insert(
+        dogId: dogId,
+        photoPath: picked.path,
+      ));
+      ref.invalidate(dogGalleryProvider(dogId));
+    }
+  }
+
+  Future<void> _deleteGalleryPhoto(int photoId, int dogId) async {
+    final confirmed = await showDialog<bool>(
+      context: context,
+      builder: (ctx) => AlertDialog(
+        title: const Text('Delete Photo'),
+        content: const Text('Remove this photo from the gallery?'),
+        actions: [
+          TextButton(onPressed: () => Navigator.pop(ctx, false), child: const Text('Cancel')),
+          TextButton(
+            onPressed: () => Navigator.pop(ctx, true),
+            style: TextButton.styleFrom(foregroundColor: Colors.red),
+            child: const Text('Delete'),
+          ),
+        ],
+      ),
+    );
+
+    if (confirmed == true && mounted) {
+      final db = ref.read(databaseProvider);
+      await db.deleteDogPhoto(photoId);
+      ref.invalidate(dogGalleryProvider(dogId));
+    }
+  }
+
+  Widget _buildHealthTab(BuildContext context, Dog dog) {
+    final healthAsync = ref.watch(healthRecordsProvider(dog.id));
+    
+    return Column(
+      children: [
+        Padding(
+          padding: const EdgeInsets.all(16.0),
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              const Text('Medical History', style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
+              ElevatedButton.icon(
+                onPressed: () => context.push('/dog/${dog.id}/health/new'),
+                icon: const Icon(Icons.add, size: 18),
+                label: const Text('Add Record'),
+              ),
+            ],
+          ),
+        ),
+        Expanded(
+          child: healthAsync.when(
+            loading: () => const Center(child: CircularProgressIndicator()),
+            error: (e, _) => Center(
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Text('Error: $e'),
+                  const SizedBox(height: 16),
+                  ElevatedButton(
+                    onPressed: () => ref.invalidate(healthRecordsProvider(dog.id)),
+                    child: const Text('Retry'),
+                  ),
+                ],
               ),
             ),
-          ],
+            data: (records) {
+              if (records.isEmpty) {
+                return const Center(
+                  child: Text('No health records found.', style: TextStyle(color: Colors.grey)),
+                );
+              }
+              return ListView.builder(
+                padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                itemCount: records.length,
+                itemBuilder: (context, index) {
+                  final record = records[index];
+                  final dateStr = DateFormat('yyyy-MM-dd').format(record.date);
+                  final nextDueStr = record.nextDueDate != null ? DateFormat('yyyy-MM-dd').format(record.nextDueDate!) : 'None';
+                  
+                  return Card(
+                    margin: const EdgeInsets.only(bottom: 12.0),
+                    child: ListTile(
+                      leading: CircleAvatar(
+                        backgroundColor: AppTheme.primaryColor.withValues(alpha: 0.1),
+                        child: Icon(
+                          record.recordType == 'Vaccine' ? Icons.vaccines : 
+                          record.recordType == 'Vet Visit' ? Icons.local_hospital :
+                          record.recordType == 'Deworming' ? Icons.medication : Icons.favorite,
+                          color: AppTheme.primaryColor,
+                        ),
+                      ),
+                      title: Text('${record.recordType} - $dateStr'),
+                      subtitle: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          if (record.notes != null && record.notes!.isNotEmpty)
+                            Text(record.notes!),
+                          const SizedBox(height: 4),
+                          Text('Next Due: $nextDueStr', style: TextStyle(color: Colors.grey.shade600, fontSize: 12)),
+                        ],
+                      ),
+                      trailing: IconButton(
+                        icon: const Icon(Icons.delete_outline, color: Colors.red),
+                        onPressed: () => _deleteHealthRecord(record.id, dog.id),
+                      ),
+                    ),
+                  );
+                },
+              );
+            },
+          ),
         ),
+      ],
+    );
+  }
+
+  Future<void> _deleteHealthRecord(int recordId, int dogId) async {
+    final confirmed = await showDialog<bool>(
+      context: context,
+      builder: (ctx) => AlertDialog(
+        title: const Text('Delete Record'),
+        content: const Text('Are you sure you want to delete this health record?'),
+        actions: [
+          TextButton(onPressed: () => Navigator.pop(ctx, false), child: const Text('Cancel')),
+          TextButton(
+            onPressed: () => Navigator.pop(ctx, true),
+            style: TextButton.styleFrom(foregroundColor: Colors.red),
+            child: const Text('Delete'),
+          ),
+        ],
       ),
-      backgroundColor: Colors.grey.shade100,
-      padding: EdgeInsets.symmetric(
-        horizontal: isTablet ? 12.0 : 8.0,
-        vertical: isTablet ? 6.0 : 4.0,
+    );
+
+    if (confirmed == true && mounted) {
+      final db = ref.read(databaseProvider);
+      await db.deleteHealthRecord(recordId);
+      ref.invalidate(healthRecordsProvider(dogId));
+    }
+  }
+
+  Widget _buildShowTab(BuildContext context, Dog dog) {
+    final showAsync = ref.watch(showRecordsProvider(dog.id));
+    
+    return Column(
+      children: [
+        Padding(
+          padding: const EdgeInsets.all(16.0),
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              const Text('Show & Title History', style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
+              ElevatedButton.icon(
+                onPressed: () => context.push('/dog/${dog.id}/show/new'),
+                icon: const Icon(Icons.add, size: 18),
+                label: const Text('Add Show'),
+              ),
+            ],
+          ),
+        ),
+        Expanded(
+          child: showAsync.when(
+            loading: () => const Center(child: CircularProgressIndicator()),
+            error: (e, _) => Center(
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Text('Error: $e'),
+                  const SizedBox(height: 16),
+                  ElevatedButton(
+                    onPressed: () => ref.invalidate(showRecordsProvider(dog.id)),
+                    child: const Text('Retry'),
+                  ),
+                ],
+              ),
+            ),
+            data: (records) {
+              if (records.isEmpty) {
+                return const Center(
+                  child: Text('No show records found.', style: TextStyle(color: Colors.grey)),
+                );
+              }
+              return ListView.builder(
+                padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                itemCount: records.length,
+                itemBuilder: (context, index) {
+                  final record = records[index];
+                  final dateStr = DateFormat('yyyy-MM-dd').format(record.date);
+                  
+                  return Card(
+                    margin: const EdgeInsets.only(bottom: 12.0),
+                    child: ListTile(
+                      leading: CircleAvatar(
+                        backgroundColor: Colors.amber.withValues(alpha: 0.2),
+                        child: const Icon(Icons.emoji_events, color: Colors.amber),
+                      ),
+                      title: Text(record.eventName, style: const TextStyle(fontWeight: FontWeight.w600)),
+                      subtitle: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          const SizedBox(height: 4),
+                          Text('Date: $dateStr'),
+                          if (record.judge != null && record.judge!.isNotEmpty) Text('Judge: ${record.judge}'),
+                          if (record.placement != null && record.placement!.isNotEmpty) 
+                            Text('Placement: ${record.placement}', style: const TextStyle(fontWeight: FontWeight.w500, color: AppTheme.secondaryColor)),
+                          if (record.titleAwarded != null && record.titleAwarded!.isNotEmpty) 
+                            Text('Title: ${record.titleAwarded}', style: const TextStyle(fontWeight: FontWeight.bold, color: AppTheme.primaryColor)),
+                          if (record.notes != null && record.notes!.isNotEmpty) ...[
+                            const SizedBox(height: 4),
+                            Text('Notes: ${record.notes}', style: const TextStyle(fontStyle: FontStyle.italic)),
+                          ],
+                        ],
+                      ),
+                      trailing: IconButton(
+                        icon: const Icon(Icons.delete_outline, color: Colors.red),
+                        onPressed: () => _deleteShowRecord(record.id, dog.id),
+                      ),
+                    ),
+                  );
+                },
+              );
+            },
+          ),
+        ),
+      ],
+    );
+  }
+
+  Future<void> _deleteShowRecord(int recordId, int dogId) async {
+    final confirmed = await showDialog<bool>(
+      context: context,
+      builder: (ctx) => AlertDialog(
+        title: const Text('Delete Record'),
+        content: const Text('Are you sure you want to delete this show record?'),
+        actions: [
+          TextButton(onPressed: () => Navigator.pop(ctx, false), child: const Text('Cancel')),
+          TextButton(
+            onPressed: () => Navigator.pop(ctx, true),
+            style: TextButton.styleFrom(foregroundColor: Colors.red),
+            child: const Text('Delete'),
+          ),
+        ],
       ),
     );
+
+    if (confirmed == true && mounted) {
+      final db = ref.read(databaseProvider);
+      await db.deleteShowRecord(recordId);
+      ref.invalidate(showRecordsProvider(dogId));
+    }
+  }
+}
+
+class _SliverAppBarDelegate extends SliverPersistentHeaderDelegate {
+  _SliverAppBarDelegate(this._tabBar);
+
+  final TabBar _tabBar;
+
+  @override
+  double get minExtent => _tabBar.preferredSize.height;
+  @override
+  double get maxExtent => _tabBar.preferredSize.height;
+
+  @override
+  Widget build(BuildContext context, double shrinkOffset, bool overlapsContent) {
+    return Container(
+      color: Colors.white,
+      child: _tabBar,
+    );
+  }
+
+  @override
+  bool shouldRebuild(_SliverAppBarDelegate oldDelegate) {
+    return false;
   }
 }
diff --git a/lib/features/pedigree/presentation/screens/litter_form_screen.dart b/lib/features/pedigree/presentation/screens/litter_form_screen.dart
index 22c7791..705fe44 100644
--- a/lib/features/pedigree/presentation/screens/litter_form_screen.dart
+++ b/lib/features/pedigree/presentation/screens/litter_form_screen.dart
@@ -1,6 +1,8 @@
+import 'package:sqlite3/sqlite3.dart' show SqliteException;
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
+import 'package:intl/intl.dart';
 import '../../../../core/theme/app_theme.dart';
 import '../../../../core/utils/responsive.dart';
 import '../../domain/entities/dog.dart';
@@ -77,7 +79,17 @@ class _LitterFormScreenState extends ConsumerState<LitterFormScreen> {
                     Expanded(
                       child: siresAsync.when(
                         loading: () => const LinearProgressIndicator(),
-                        error: (e, _) => Text('Error loading sires: $e'),
+                        error: (e, _) => Column(
+                          mainAxisSize: MainAxisSize.min,
+                          children: [
+                            Text('Error loading sires: $e'),
+                            const SizedBox(height: 8),
+                            ElevatedButton(
+                              onPressed: () => ref.invalidate(siresProvider),
+                              child: const Text('Retry'),
+                            ),
+                          ],
+                        ),
                         data: (sires) => _buildSireDropdown(sires),
                       ),
                     ),
@@ -85,7 +97,17 @@ class _LitterFormScreenState extends ConsumerState<LitterFormScreen> {
                     Expanded(
                       child: damsAsync.when(
                         loading: () => const LinearProgressIndicator(),
-                        error: (e, _) => Text('Error loading dams: $e'),
+                        error: (e, _) => Column(
+                          mainAxisSize: MainAxisSize.min,
+                          children: [
+                            Text('Error loading dams: $e'),
+                            const SizedBox(height: 8),
+                            ElevatedButton(
+                              onPressed: () => ref.invalidate(damsProvider),
+                              child: const Text('Retry'),
+                            ),
+                          ],
+                        ),
                         data: (dams) => _buildDamDropdown(dams),
                       ),
                     ),
@@ -96,13 +118,33 @@ class _LitterFormScreenState extends ConsumerState<LitterFormScreen> {
                   children: [
                     siresAsync.when(
                       loading: () => const LinearProgressIndicator(),
-                      error: (e, _) => Text('Error loading sires: $e'),
+                      error: (e, _) => Column(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          Text('Error loading sires: $e'),
+                          const SizedBox(height: 8),
+                          ElevatedButton(
+                            onPressed: () => ref.invalidate(siresProvider),
+                            child: const Text('Retry'),
+                          ),
+                        ],
+                      ),
                       data: (sires) => _buildSireDropdown(sires),
                     ),
                     SizedBox(height: padding),
                     damsAsync.when(
                       loading: () => const LinearProgressIndicator(),
-                      error: (e, _) => Text('Error loading dams: $e'),
+                      error: (e, _) => Column(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          Text('Error loading dams: $e'),
+                          const SizedBox(height: 8),
+                          ElevatedButton(
+                            onPressed: () => ref.invalidate(damsProvider),
+                            child: const Text('Retry'),
+                          ),
+                        ],
+                      ),
                       data: (dams) => _buildDamDropdown(dams),
                     ),
                   ],
@@ -303,7 +345,7 @@ class _LitterFormScreenState extends ConsumerState<LitterFormScreen> {
         if (date != null) {
           setState(() {
             _matingDate = date;
-            _matingDateController.text = date.toString().split(' ')[0];
+            _matingDateController.text = DateFormat('yyyy-MM-dd').format(date);
           });
         }
       },
@@ -329,7 +371,7 @@ class _LitterFormScreenState extends ConsumerState<LitterFormScreen> {
         if (date != null) {
           setState(() {
             _whelpingDate = date;
-            _whelpingDateController.text = date.toString().split(' ')[0];
+            _whelpingDateController.text = DateFormat('yyyy-MM-dd').format(date);
           });
         }
       },
@@ -405,6 +447,7 @@ class _LitterFormScreenState extends ConsumerState<LitterFormScreen> {
     final padding = Responsive.padding(context);
 
     return Card(
+      key: ValueKey('puppy_entry_$index'),
       margin: EdgeInsets.only(bottom: padding * 0.5),
       child: Padding(
         padding: EdgeInsets.all(padding * 0.75),
@@ -487,8 +530,7 @@ class _LitterFormScreenState extends ConsumerState<LitterFormScreen> {
     if (!_formKey.currentState!.validate()) return;
 
     try {
-      final createUseCase = ref.read(createLitterUseCaseProvider);
-      final insertDogUseCase = ref.read(insertDogUseCaseProvider);
+      final repo = ref.read(pedigreeRepositoryProvider);
 
       final litter = Litter(
         id: 0,
@@ -501,8 +543,7 @@ class _LitterFormScreenState extends ConsumerState<LitterFormScreen> {
         notes: _notesController.text.isEmpty ? null : _notesController.text,
       );
 
-      final litterId = await createUseCase(litter);
-
+      final puppies = <Dog>[];
       for (final entry in _puppyEntries) {
         final callName = (entry['callName'] as String?)?.trim() ?? '';
         if (callName.isEmpty) continue;
@@ -510,28 +551,21 @@ class _LitterFormScreenState extends ConsumerState<LitterFormScreen> {
         final sex = entry['sex'] as String;
         final microchip = (entry['microchip'] as String?)?.trim();
 
-        final sire = _selectedSireId != null
-            ? await ref.read(getDogByIdUseCaseProvider)(_selectedSireId!)
-            : null;
-        final dam = _selectedDamId != null
-            ? await ref.read(getDogByIdUseCaseProvider)(_selectedDamId!)
-            : null;
-
-        final puppy = Dog(
+        puppies.add(Dog(
           id: 0,
           registeredName: callName,
           callName: callName,
           sex: sex,
           microchipNumber: microchip?.isEmpty == true ? null : microchip,
-          sire: sire,
-          dam: dam,
-          litterId: litterId,
+          sire: null,
+          dam: null,
+          litterId: 0,
           createdAt: DateTime.now(),
-        );
-
-        await insertDogUseCase(puppy);
+        ));
       }
 
+      await repo.createLitterWithPuppies(litter, puppies);
+
       if (mounted) {
         ref.invalidate(dogsProvider);
         ScaffoldMessenger.of(context).showSnackBar(
@@ -539,6 +573,15 @@ class _LitterFormScreenState extends ConsumerState<LitterFormScreen> {
         );
         context.pop();
       }
+    } on SqliteException catch (e) {
+      if (mounted) {
+        final message = e.message.contains('UNIQUE')
+            ? 'A dog with this name or microchip already exists'
+            : 'Database error: ${e.message}';
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(message)),
+        );
+      }
     } catch (e) {
       if (mounted) {
         ScaffoldMessenger.of(context).showSnackBar(
diff --git a/lib/features/pedigree/presentation/widgets/dog_list_item.dart b/lib/features/pedigree/presentation/widgets/dog_list_item.dart
index 8c2dbf2..6c947a9 100644
--- a/lib/features/pedigree/presentation/widgets/dog_list_item.dart
+++ b/lib/features/pedigree/presentation/widgets/dog_list_item.dart
@@ -1,3 +1,4 @@
+import 'dart:io';
 import 'package:flutter/material.dart';
 import '../../../../core/theme/app_theme.dart';
 import '../../../../core/utils/responsive.dart';
@@ -29,15 +30,19 @@ class DogListItem extends StatelessWidget {
           horizontal: padding,
           vertical: padding * 0.5,
         ),
-        leading: CircleAvatar(
-          radius: isTablet ? 24.0 : 20.0,
-          backgroundColor: dog.sex == 'Male' 
-              ? Colors.blue.shade100 
-              : Colors.pink.shade100,
-          child: Icon(
-            dog.sex == 'Male' ? Icons.male : Icons.female,
-            color: dog.sex == 'Male' ? Colors.blue.shade700 : Colors.pink.shade700,
-            size: isTablet ? 24.0 : 20.0,
+        leading: Hero(
+          tag: 'dog_photo_${dog.id}',
+          child: CircleAvatar(
+            radius: isTablet ? 24.0 : 20.0,
+            backgroundColor: dog.sex == 'Male' ? Colors.blue.shade100 : Colors.pink.shade100,
+            backgroundImage: dog.photoPath != null ? FileImage(File(dog.photoPath!)) : null,
+            child: dog.photoPath == null
+                ? Icon(
+                    dog.sex == 'Male' ? Icons.male : Icons.female,
+                    color: dog.sex == 'Male' ? Colors.blue.shade700 : Colors.pink.shade700,
+                    size: isTablet ? 24.0 : 20.0,
+                  )
+                : null,
           ),
         ),
         title: Column(
diff --git a/lib/features/pedigree/presentation/widgets/pedigree_canvas.dart b/lib/features/pedigree/presentation/widgets/pedigree_canvas.dart
index bfb8bd0..a34b733 100644
--- a/lib/features/pedigree/presentation/widgets/pedigree_canvas.dart
+++ b/lib/features/pedigree/presentation/widgets/pedigree_canvas.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import '../../../../core/theme/app_theme.dart';
 import '../../../../core/utils/responsive.dart';
 import '../../domain/entities/dog.dart';
 import 'pedigree_card_node.dart';
@@ -6,164 +7,360 @@ import 'pedigree_card_node.dart';
 class PedigreeCanvas extends StatelessWidget {
   final Dog rootDog;
   final Function(Dog) onDogTap;
+  final Function(Dog? childDog, bool isSire, String roleName)? onUnknownTap;
 
   const PedigreeCanvas({
     super.key,
     required this.rootDog,
     required this.onDogTap,
+    this.onUnknownTap,
   });
 
   @override
   Widget build(BuildContext context) {
     final bool isMobile = Responsive.isMobile(context);
     final bool isTablet = Responsive.isTablet(context);
-    final double spacing = isMobile ? 8.0 : (isTablet ? 14.0 : 20.0);
+    final double spacing = isMobile ? 12.0 : (isTablet ? 20.0 : 30.0);
+    final double nodeH = isMobile ? 80.0 : (isTablet ? 90.0 : 100.0);
+    final double cardW = isMobile ? 150.0 : (isTablet ? 170.0 : 200.0);
+    final double gen4Gap = isMobile ? 6.0 : (isTablet ? 8.0 : 10.0);
+
+    final double colH = nodeH * 8 + gen4Gap * 7;
+
+    // Great-grandparent centers (8 nodes, spaceBetween)
+    final List<double> ggCenters = List.generate(8, (i) =>
+      i * (colH - nodeH) / 7 + nodeH / 2);
+
+    // Grandparent centers - each centered between their 2 children in gen4
+    final double g1Center = (ggCenters[0] + ggCenters[1]) / 2;
+    final double g2Center = (ggCenters[2] + ggCenters[3]) / 2;
+    final double g3Center = (ggCenters[4] + ggCenters[5]) / 2;
+    final double g4Center = (ggCenters[6] + ggCenters[7]) / 2;
+    final List<double> grandCenters = [g1Center, g2Center, g3Center, g4Center];
+
+    // Parent centers - each centered between their 2 children in gen3
+    final double sireCenter = (g1Center + g2Center) / 2;
+    final double damCenter = (g3Center + g4Center) / 2;
+
+    // Root center - centered between sire and dam
+    final double rootCenter = colH / 2;
 
     return InteractiveViewer(
-      boundaryMargin: const EdgeInsets.all(50.0),
-      minScale: 0.3,
-      maxScale: 2.5,
+      constrained: false,
+      boundaryMargin: const EdgeInsets.all(80.0),
+      minScale: 0.2,
+      maxScale: 3.0,
       clipBehavior: Clip.hardEdge,
       child: Padding(
         padding: EdgeInsets.all(spacing),
         child: Row(
           mainAxisAlignment: MainAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            // Generation 1: Root Dog
-            _buildGeneration1(context),
+            // Gen1: Root
+            SizedBox(
+              height: colH,
+              child: Center(
+                child: PedigreeCardNode(
+                  roleName: 'Target',
+                  isMale: rootDog.sex == 'Male',
+                  callName: rootDog.callName,
+                  registeredName: rootDog.registeredName,
+                  microchip: rootDog.microchipNumber,
+                  registerType: rootDog.registerType,
+                  onTap: () => onDogTap(rootDog),
+                ),
+              ),
+            ),
             SizedBox(width: spacing),
-            // Connector lines
-            _buildConnectorLines(context, 1),
+            // Connector 1: Root → Sire & Dam
+            _buildConnector(spacing, colH, ConnectorType.oneToTwo,
+              leftY1: rootCenter,
+              rightY1: sireCenter,
+              rightY2: damCenter,
+            ),
             SizedBox(width: spacing),
-            // Generation 2: Parents
-            _buildGeneration2(context),
+            // Gen2: Parents
+            SizedBox(
+              width: cardW,
+              height: colH,
+              child: Stack(
+                clipBehavior: Clip.none,
+                children: [
+                  _positionedNode(sireCenter - nodeH / 2, 'Sire', true, rootDog.sire, rootDog, true),
+                  _positionedNode(damCenter - nodeH / 2, 'Dam', false, rootDog.dam, rootDog, false),
+                ],
+              ),
+            ),
+            SizedBox(width: spacing),
+            // Connector 2: Sire & Dam → 4 Grandparents
+            _buildConnector(spacing, colH, ConnectorType.twoToFour,
+              leftY1: sireCenter,
+              leftY2: damCenter,
+              rightY1: grandCenters[0],
+              rightY2: grandCenters[1],
+              rightY3: grandCenters[2],
+              rightY4: grandCenters[3],
+            ),
             SizedBox(width: spacing),
-            // Connector lines
-            _buildConnectorLines(context, 2),
+            // Gen3: Grandparents
+            SizedBox(
+              width: cardW,
+              height: colH,
+              child: Stack(
+                clipBehavior: Clip.none,
+                children: [
+                  _positionedNode(grandCenters[0] - nodeH / 2, 'Grandparent', true, rootDog.sire?.sire, rootDog.sire, true),
+                  _positionedNode(grandCenters[1] - nodeH / 2, 'Grandparent', false, rootDog.sire?.dam, rootDog.sire, false),
+                  _positionedNode(grandCenters[2] - nodeH / 2, 'Grandparent', true, rootDog.dam?.sire, rootDog.dam, true),
+                  _positionedNode(grandCenters[3] - nodeH / 2, 'Grandparent', false, rootDog.dam?.dam, rootDog.dam, false),
+                ],
+              ),
+            ),
+            SizedBox(width: spacing),
+            // Connector 3: 4 Grandparents → 8 Great-grandparents
+            _buildConnector(spacing, colH, ConnectorType.fourToEight,
+              leftY1: grandCenters[0],
+              leftY2: grandCenters[1],
+              leftY3: grandCenters[2],
+              leftY4: grandCenters[3],
+              rightY1: ggCenters[0],
+              rightY2: ggCenters[1],
+              rightY3: ggCenters[2],
+              rightY4: ggCenters[3],
+              rightY5: ggCenters[4],
+              rightY6: ggCenters[5],
+              rightY7: ggCenters[6],
+              rightY8: ggCenters[7],
+            ),
             SizedBox(width: spacing),
-            // Generation 3: Grandparents
-            _buildGeneration3(context),
+            // Gen4: Great-grandparents
+            SizedBox(
+              width: cardW,
+              height: colH,
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  _grandNode(rootDog.sire?.sire?.sire, rootDog.sire?.sire, true),
+                  _grandNode(rootDog.sire?.sire?.dam, rootDog.sire?.sire, false),
+                  _grandNode(rootDog.sire?.dam?.sire, rootDog.sire?.dam, true),
+                  _grandNode(rootDog.sire?.dam?.dam, rootDog.sire?.dam, false),
+                  _grandNode(rootDog.dam?.sire?.sire, rootDog.dam?.sire, true),
+                  _grandNode(rootDog.dam?.sire?.dam, rootDog.dam?.sire, false),
+                  _grandNode(rootDog.dam?.dam?.sire, rootDog.dam?.dam, true),
+                  _grandNode(rootDog.dam?.dam?.dam, rootDog.dam?.dam, false),
+                ],
+              ),
+            ),
           ],
         ),
       ),
     );
   }
 
-  Widget _buildGeneration1(BuildContext context) {
-    final bool isMobile = Responsive.isMobile(context);
-
-    return Column(
-      mainAxisAlignment: MainAxisAlignment.center,
-      children: [
-        PedigreeCardNode(
-          roleName: 'Target',
-          isMale: rootDog.sex == 'Male',
-          callName: rootDog.callName,
-          registeredName: rootDog.registeredName,
-          microchip: rootDog.microchipNumber,
-          registerType: rootDog.registerType,
-          onTap: () => onDogTap(rootDog),
-        ),
-        if (!isMobile) ...[
-          const SizedBox(height: 8.0),
-          Text(
-            rootDog.callName,
-            style: TextStyle(
-              fontSize: 10.0,
-              color: Colors.grey.shade600,
-            ),
-            overflow: TextOverflow.ellipsis,
-          ),
-        ],
-      ],
+  Widget _positionedNode(double top, String role, bool isMale,
+      Dog? dog, Dog? childDog, bool isSire) {
+    return Positioned(
+      top: top,
+      child: PedigreeCardNode(
+        roleName: role,
+        isMale: isMale,
+        callName: dog?.callName,
+        registeredName: dog?.registeredName,
+        microchip: dog?.microchipNumber,
+        registerType: dog?.registerType,
+        onTap: () {
+          if (dog != null) {
+            onDogTap(dog);
+          } else if (onUnknownTap != null) {
+            onUnknownTap!(childDog, isSire, role);
+          }
+        },
+      ),
     );
   }
 
-  Widget _buildGeneration2(BuildContext context) {
-    final bool isMobile = Responsive.isMobile(context);
-    final double gap = isMobile ? 40.0 : 64.0;
-
-    return Column(
-      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-      children: [
-        // Sire
-        PedigreeCardNode(
-          roleName: 'Sire',
-          isMale: true,
-          callName: rootDog.sire?.callName,
-          registeredName: rootDog.sire?.registeredName,
-          microchip: rootDog.sire?.microchipNumber,
-          registerType: rootDog.sire?.registerType,
-          onTap: rootDog.sire != null ? () => onDogTap(rootDog.sire!) : () {},
-        ),
-        SizedBox(height: gap),
-        // Dam
-        PedigreeCardNode(
-          roleName: 'Dam',
-          isMale: false,
-          callName: rootDog.dam?.callName,
-          registeredName: rootDog.dam?.registeredName,
-          microchip: rootDog.dam?.microchipNumber,
-          registerType: rootDog.dam?.registerType,
-          onTap: rootDog.dam != null ? () => onDogTap(rootDog.dam!) : () {},
-        ),
-      ],
+  Widget _grandNode(Dog? dog, Dog? childDog, bool isSire) {
+    if (dog != null) {
+      return PedigreeCardNode(
+        roleName: 'Great Grandparent',
+        isMale: dog.sex == 'Male',
+        callName: dog.callName,
+        registeredName: dog.registeredName,
+        microchip: dog.microchipNumber,
+        registerType: dog.registerType,
+        onTap: () => onDogTap(dog),
+      );
+    }
+    return PedigreeCardNode(
+      roleName: 'Great Grandparent',
+      isMale: isSire,
+      onTap: () {
+        if (onUnknownTap != null) {
+          onUnknownTap!(childDog, isSire, 'Great Grandparent');
+        }
+      },
     );
   }
 
-  Widget _buildGeneration3(BuildContext context) {
-    final bool isMobile = Responsive.isMobile(context);
-    final double gap = isMobile ? 8.0 : 12.0;
-
-    // Grandparents: Sire's parents, then Dam's parents
-    final grandparents = [
-      rootDog.sire?.sire, // Sire's Sire
-      rootDog.sire?.dam,  // Sire's Dam
-      rootDog.dam?.sire,  // Dam's Sire
-      rootDog.dam?.dam,   // Dam's Dam
-    ];
-
-    return Column(
-      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-      children: grandparents.map((dog) {
-        return Padding(
-          padding: EdgeInsets.symmetric(vertical: gap * 0.5),
-          child: PedigreeCardNode(
-            roleName: 'Grandparent',
-            isMale: dog?.sex == 'Male',
-            callName: dog?.callName,
-            registeredName: dog?.registeredName,
-            microchip: dog?.microchipNumber,
-            registerType: dog?.registerType,
-            onTap: dog != null ? () => onDogTap(dog) : () {},
-          ),
-        );
-      }).toList(),
+  Widget _buildConnector(double spacing, double height, ConnectorType type,
+      {double? leftY1, double? leftY2, double? leftY3, double? leftY4,
+       double? rightY1, double? rightY2, double? rightY3, double? rightY4,
+       double? rightY5, double? rightY6, double? rightY7, double? rightY8}) {
+    return SizedBox(
+      width: spacing * 0.6,
+      height: height,
+      child: CustomPaint(
+        painter: BezierConnectorPainter(
+          type: type,
+          color: AppTheme.primaryColor.withValues(alpha: 0.3),
+          leftY1: leftY1,
+          leftY2: leftY2,
+          leftY3: leftY3,
+          leftY4: leftY4,
+          rightY1: rightY1,
+          rightY2: rightY2,
+          rightY3: rightY3,
+          rightY4: rightY4,
+          rightY5: rightY5,
+          rightY6: rightY6,
+          rightY7: rightY7,
+          rightY8: rightY8,
+        ),
+      ),
     );
   }
+}
 
-  Widget _buildConnectorLines(BuildContext context, int generation) {
-    final bool isMobile = Responsive.isMobile(context);
-    final double width = isMobile ? 10.0 : 20.0;
-    final double height;
-
-    if (generation == 1) {
-      height = isMobile ? 70.0 : 86.0;
-    } else if (generation == 2) {
-      height = isMobile ? 160.0 : 200.0;
-    } else {
-      height = isMobile ? 280.0 : 350.0;
+enum ConnectorType { oneToTwo, twoToFour, fourToEight }
+
+class BezierConnectorPainter extends CustomPainter {
+  final Color color;
+  final ConnectorType type;
+  final double? leftY1;
+  final double? leftY2;
+  final double? leftY3;
+  final double? leftY4;
+  final double? rightY1;
+  final double? rightY2;
+  final double? rightY3;
+  final double? rightY4;
+  final double? rightY5;
+  final double? rightY6;
+  final double? rightY7;
+  final double? rightY8;
+
+  BezierConnectorPainter({
+    required this.color,
+    required this.type,
+    this.leftY1,
+    this.leftY2,
+    this.leftY3,
+    this.leftY4,
+    this.rightY1,
+    this.rightY2,
+    this.rightY3,
+    this.rightY4,
+    this.rightY5,
+    this.rightY6,
+    this.rightY7,
+    this.rightY8,
+  });
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    final paint = Paint()
+      ..color = color
+      ..strokeWidth = 2.5
+      ..style = PaintingStyle.stroke
+      ..strokeCap = StrokeCap.round;
+
+    switch (type) {
+      case ConnectorType.oneToTwo:
+        _drawOneToTwo(canvas, size, paint);
+      case ConnectorType.twoToFour:
+        _drawTwoToFour(canvas, size, paint);
+      case ConnectorType.fourToEight:
+        _drawFourToEight(canvas, size, paint);
     }
+  }
 
-    return Container(
-      width: width,
-      height: height,
-      decoration: BoxDecoration(
-        border: Border.all(
-          color: Colors.grey.shade300,
-          width: 1.0,
-        ),
-      ),
+  void _drawCurve(Path path, double w, double y1, double y2) {
+    path.moveTo(0, y1);
+    path.cubicTo(
+      w * 0.6, y1,
+      w * 0.4, y2,
+      w, y2,
     );
   }
+
+  void _drawOneToTwo(Canvas canvas, Size size, Paint paint) {
+    final path = Path();
+    final lY = leftY1 ?? size.height / 2;
+    final rY1 = rightY1 ?? 0;
+    final rY2 = rightY2 ?? size.height;
+
+    _drawCurve(path, size.width, lY, rY1);
+    _drawCurve(path, size.width, lY, rY2);
+    canvas.drawPath(path, paint);
+  }
+
+  void _drawTwoToFour(Canvas canvas, Size size, Paint paint) {
+    final path = Path();
+    final lY1 = leftY1 ?? size.height / 4;
+    final lY2 = leftY2 ?? size.height * 3 / 4;
+    final rY1 = rightY1 ?? size.height / 8;
+    final rY2 = rightY2 ?? size.height * 3 / 8;
+    final rY3 = rightY3 ?? size.height * 5 / 8;
+    final rY4 = rightY4 ?? size.height * 7 / 8;
+
+    _drawCurve(path, size.width, lY1, rY1);
+    _drawCurve(path, size.width, lY1, rY2);
+    _drawCurve(path, size.width, lY2, rY3);
+    _drawCurve(path, size.width, lY2, rY4);
+    canvas.drawPath(path, paint);
+  }
+
+  void _drawFourToEight(Canvas canvas, Size size, Paint paint) {
+    final path = Path();
+    final lY1 = leftY1 ?? size.height / 8;
+    final lY2 = leftY2 ?? size.height * 3 / 8;
+    final lY3 = leftY3 ?? size.height * 5 / 8;
+    final lY4 = leftY4 ?? size.height * 7 / 8;
+    final rY1 = rightY1 ?? size.height / 16;
+    final rY2 = rightY2 ?? size.height * 3 / 16;
+    final rY3 = rightY3 ?? size.height * 5 / 16;
+    final rY4 = rightY4 ?? size.height * 7 / 16;
+    final rY5 = rightY5 ?? size.height * 9 / 16;
+    final rY6 = rightY6 ?? size.height * 11 / 16;
+    final rY7 = rightY7 ?? size.height * 13 / 16;
+    final rY8 = rightY8 ?? size.height * 15 / 16;
+
+    _drawCurve(path, size.width, lY1, rY1);
+    _drawCurve(path, size.width, lY1, rY2);
+    _drawCurve(path, size.width, lY2, rY3);
+    _drawCurve(path, size.width, lY2, rY4);
+    _drawCurve(path, size.width, lY3, rY5);
+    _drawCurve(path, size.width, lY3, rY6);
+    _drawCurve(path, size.width, lY4, rY7);
+    _drawCurve(path, size.width, lY4, rY8);
+    canvas.drawPath(path, paint);
+  }
+
+  @override
+  bool shouldRepaint(covariant BezierConnectorPainter oldDelegate) =>
+      oldDelegate.color != color ||
+      oldDelegate.type != type ||
+      oldDelegate.leftY1 != leftY1 ||
+      oldDelegate.leftY2 != leftY2 ||
+      oldDelegate.leftY3 != leftY3 ||
+      oldDelegate.leftY4 != leftY4 ||
+      oldDelegate.rightY1 != rightY1 ||
+      oldDelegate.rightY2 != rightY2 ||
+      oldDelegate.rightY3 != rightY3 ||
+      oldDelegate.rightY4 != rightY4 ||
+      oldDelegate.rightY5 != rightY5 ||
+      oldDelegate.rightY6 != rightY6 ||
+      oldDelegate.rightY7 != rightY7 ||
+      oldDelegate.rightY8 != rightY8;
 }
diff --git a/lib/features/pedigree/presentation/widgets/pedigree_card_node.dart b/lib/features/pedigree/presentation/widgets/pedigree_card_node.dart
index aa93517..7b5a98c 100644
--- a/lib/features/pedigree/presentation/widgets/pedigree_card_node.dart
+++ b/lib/features/pedigree/presentation/widgets/pedigree_card_node.dart
@@ -28,37 +28,60 @@ class PedigreeCardNode extends StatelessWidget {
     final bool isMobile = Responsive.isMobile(context);
     final bool isTablet = Responsive.isTablet(context);
 
-    // Responsive card dimensions
-    final double cardWidth = isMobile ? 140.0 : (isTablet ? 160.0 : 180.0);
-    final double cardHeight = isMobile ? 70.0 : (isTablet ? 78.0 : 86.0);
-    final double padding = isMobile ? 6.0 : 8.0;
+    // Dynamic width, minimum height
+    final double cardWidth = isMobile ? 150.0 : (isTablet ? 170.0 : 200.0);
+    final double minHeight = isMobile ? 80.0 : (isTablet ? 90.0 : 100.0);
 
     return GestureDetector(
       onTap: onTap,
       child: Container(
         width: cardWidth,
-        height: cardHeight,
-        padding: EdgeInsets.symmetric(horizontal: padding, vertical: padding * 0.8),
+        constraints: BoxConstraints(minHeight: minHeight),
         decoration: BoxDecoration(
           color: isEmptyPlaceholder ? Colors.transparent : Colors.white,
-          borderRadius: BorderRadius.circular(8.0),
+          borderRadius: BorderRadius.circular(12.0),
           border: Border.all(
-            color: isEmptyPlaceholder ? Colors.grey.shade400 : Colors.grey.shade200,
+            color: isEmptyPlaceholder 
+                ? Colors.grey.shade300 
+                : (isMale ? Colors.blue.shade100 : Colors.pink.shade100),
             width: isEmptyPlaceholder ? 1.5 : 1.0,
+            strokeAlign: BorderSide.strokeAlignOutside,
           ),
           boxShadow: isEmptyPlaceholder
               ? []
               : [
                   BoxShadow(
-                    color: Colors.black.withValues(alpha: 0.04),
-                    blurRadius: 6.0,
-                    offset: const Offset(0, 2),
+                    color: (isMale ? Colors.blue : Colors.pink).withValues(alpha: 0.05),
+                    blurRadius: 10.0,
+                    offset: const Offset(0, 4),
                   ),
                 ],
         ),
-        child: isEmptyPlaceholder 
-            ? _buildEmptyState(context) 
-            : _buildFilledState(context),
+        child: ClipRRect(
+          borderRadius: BorderRadius.circular(12.0),
+          child: IntrinsicHeight(
+            child: Row(
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                // Gender color accent bar
+                Container(
+                  width: 4.0,
+                  color: isEmptyPlaceholder 
+                      ? Colors.transparent 
+                      : (isMale ? Colors.blue.shade400 : Colors.pink.shade400),
+                ),
+                Expanded(
+                  child: Padding(
+                    padding: const EdgeInsets.symmetric(horizontal: 10.0, vertical: 8.0),
+                    child: isEmptyPlaceholder 
+                        ? _buildEmptyState(context) 
+                        : _buildFilledState(context),
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
       ),
     );
   }
@@ -68,91 +91,95 @@ class PedigreeCardNode extends StatelessWidget {
 
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
-      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      mainAxisSize: MainAxisSize.min,
+      mainAxisAlignment: MainAxisAlignment.center,
       children: [
-        // Role Title and Gender Accent Line
+        // Role Title
         Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
-            Flexible(
+            Expanded(
               child: Text(
                 roleName.toUpperCase(),
                 style: TextStyle(
-                  fontSize: isMobile ? 7.0 : 9.0,
-                  fontWeight: FontWeight.bold,
-                  color: isMale ? Colors.blue.shade700 : Colors.pink.shade700,
-                  letterSpacing: 0.5,
+                  fontSize: isMobile ? 8.0 : 10.0,
+                  fontWeight: FontWeight.w800,
+                  color: Colors.grey.shade500,
+                  letterSpacing: 0.8,
                 ),
                 overflow: TextOverflow.ellipsis,
               ),
             ),
             Icon(
               isMale ? Icons.male : Icons.female,
-              size: isMobile ? 10.0 : 12.0,
+              size: isMobile ? 12.0 : 14.0,
               color: isMale ? Colors.blue.shade400 : Colors.pink.shade400,
             ),
           ],
         ),
+        const SizedBox(height: 4.0),
         // Core Identity Content Block
-        Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text(
-              callName!,
-              maxLines: 1,
-              overflow: TextOverflow.ellipsis,
-              style: TextStyle(
-                fontSize: isMobile ? 11.0 : 13.0,
-                fontWeight: FontWeight.bold,
-                color: AppTheme.secondaryColor,
-              ),
-            ),
-            Text(
-              registeredName ?? '',
+        Text(
+          callName!,
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
+          style: TextStyle(
+            fontSize: isMobile ? 12.0 : 14.0,
+            fontWeight: FontWeight.bold,
+            color: AppTheme.secondaryColor,
+          ),
+        ),
+        if (registeredName != null && registeredName!.isNotEmpty)
+          Padding(
+            padding: const EdgeInsets.only(top: 2.0),
+            child: Text(
+              registeredName!,
               maxLines: 1,
               overflow: TextOverflow.ellipsis,
               style: TextStyle(
-                fontSize: isMobile ? 8.0 : 10.0,
+                fontSize: isMobile ? 9.0 : 11.0,
                 fontStyle: FontStyle.italic,
                 color: Colors.grey.shade600,
               ),
             ),
-          ],
-        ),
+          ),
+        const SizedBox(height: 6.0),
         // Microchip Summary Row
         Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
             Expanded(
               child: Text(
-                microchip != null ? 'Chip: $microchip' : 'No Chip',
+                microchip != null && microchip!.isNotEmpty ? 'Chip: $microchip' : 'No Chip',
                 maxLines: 1,
                 overflow: TextOverflow.ellipsis,
                 style: TextStyle(
-                  fontSize: isMobile ? 7.0 : 9.0,
+                  fontSize: isMobile ? 9.0 : 10.0,
                   color: Colors.grey.shade500,
                 ),
               ),
             ),
-            if (registerType != null)
+            if (registerType != null && registerType!.isNotEmpty) ...[
+              const SizedBox(width: 4.0),
               Container(
                 padding: EdgeInsets.symmetric(
-                  horizontal: isMobile ? 2.0 : 4.0,
-                  vertical: 1.0,
+                  horizontal: isMobile ? 4.0 : 6.0,
+                  vertical: 2.0,
                 ),
                 decoration: BoxDecoration(
-                  color: AppTheme.primaryLight.withValues(alpha: 0.1),
-                  borderRadius: BorderRadius.circular(2.0),
+                  color: Theme.of(context).colorScheme.primaryContainer.withValues(alpha: 0.1),
+                  borderRadius: BorderRadius.circular(4.0),
                 ),
                 child: Text(
                   registerType!,
                   style: TextStyle(
-                    fontSize: isMobile ? 6.0 : 8.0,
-                    fontWeight: FontWeight.bold,
-                    color: AppTheme.secondaryColor,
+                    fontSize: isMobile ? 8.0 : 9.0,
+                    fontWeight: FontWeight.w700,
+                    color: Theme.of(context).colorScheme.primary,
                   ),
                 ),
               ),
+            ]
           ],
         ),
       ],
@@ -164,20 +191,22 @@ class PedigreeCardNode extends StatelessWidget {
 
     return Column(
       mainAxisAlignment: MainAxisAlignment.center,
+      mainAxisSize: MainAxisSize.min,
       children: [
         Icon(
           Icons.add_circle_outline,
-          size: isMobile ? 14.0 : 18.0,
-          color: Colors.grey.shade500,
+          size: isMobile ? 18.0 : 24.0,
+          color: Colors.grey.shade400,
         ),
-        const SizedBox(height: 4.0),
+        const SizedBox(height: 6.0),
         Text(
           'Link $roleName',
           style: TextStyle(
-            fontSize: isMobile ? 8.0 : 10.0,
-            fontWeight: FontWeight.w500,
-            color: Colors.grey.shade600,
+            fontSize: isMobile ? 10.0 : 12.0,
+            fontWeight: FontWeight.w600,
+            color: Colors.grey.shade500,
           ),
+          textAlign: TextAlign.center,
         ),
       ],
     );
diff --git a/lib/features/settings/data/models/kennel_profile_model.dart b/lib/features/settings/data/models/kennel_profile_model.dart
index ea4d2e4..f7f37b3 100644
--- a/lib/features/settings/data/models/kennel_profile_model.dart
+++ b/lib/features/settings/data/models/kennel_profile_model.dart
@@ -9,6 +9,9 @@ extension KennelProfileMapper on KennelProfileData {
       kennelName: kennelName,
       breederName: breederName,
       contactInfo: contactInfo,
+      phone: phone,
+      whatsapp: whatsapp,
+      email: email,
       localLogoPath: localLogoPath,
     );
   }
@@ -21,6 +24,9 @@ extension KennelProfileEntityMapper on domain.KennelProfile {
       kennelName: Value(kennelName),
       breederName: Value(breederName),
       contactInfo: Value(contactInfo),
+      phone: Value(phone),
+      whatsapp: Value(whatsapp),
+      email: Value(email),
       localLogoPath: Value(localLogoPath),
     );
   }
diff --git a/lib/features/settings/domain/entities/kennel_profile.dart b/lib/features/settings/domain/entities/kennel_profile.dart
index dbb2412..57f8823 100644
--- a/lib/features/settings/domain/entities/kennel_profile.dart
+++ b/lib/features/settings/domain/entities/kennel_profile.dart
@@ -3,13 +3,19 @@ class KennelProfile {
   final String kennelName;
   final String? breederName;
   final String? contactInfo;
+  final String? phone;
+  final String? whatsapp;
+  final String? email;
   final String? localLogoPath;
 
   const KennelProfile({
     required this.id,
     required this.kennelName,
     this.breederName,
-    this.contactInfo,
+    this.contactInfo, // Legacy
+    this.phone,
+    this.whatsapp,
+    this.email,
     this.localLogoPath,
   });
 
diff --git a/lib/features/settings/presentation/screens/about_screen.dart b/lib/features/settings/presentation/screens/about_screen.dart
index 9e613b6..a165ff6 100644
--- a/lib/features/settings/presentation/screens/about_screen.dart
+++ b/lib/features/settings/presentation/screens/about_screen.dart
@@ -7,6 +7,50 @@ class AboutScreen extends StatelessWidget {
   const AboutScreen({super.key});
 
   static const _changelog = [
+    (
+      version: '1.2.0',
+      date: '2026-06-17',
+      entries: [
+        'Added Litters & Offspring tab to Dog Details',
+        'Added dynamic Dashboard Sorting and Sex Filtering',
+        'Introduced Appearance Settings: Dark/Light modes & 6 custom accent colors',
+        'Completely overhauled Pedigree Certificate PDF into an A4 Landscape format with generation tree and inline images',
+        'Achieved zero-warning compiler architecture and fixed context leaks',
+      ],
+    ),
+    (
+      version: '1.1.1',
+      date: '2026-06-17',
+      entries: [
+        'Added specific Phone, WhatsApp, and Email fields to Kennel Profile',
+        'Fixed dashboard not updating instantly after deleting a dog',
+        'Added SQLite VACUUM to properly compress database on size refresh',
+        'Migrated database schema to v6',
+      ],
+    ),
+    (
+      version: '1.1.0',
+      date: '2026-06-17',
+      entries: [
+        'Edit existing dog profiles via /dog/:id/edit route',
+        'List all registered litters with sire/dam names and puppy counts',
+        'Add photos to dog profiles; displayed on detail screen',
+        'CSV Import validation skips duplicates by registered name and microchip',
+        'Replaced N+1 recursive queries with batched ancestor loading',
+      ],
+    ),
+    (
+      version: '1.0.1',
+      date: '2026-06-17',
+      entries: [
+        'Added Great Grandparents to pedigree tree (5-generation display)',
+        'Fixed pedigree tree connection wires rendering',
+        'Fixed duplicate dog database insertion error',
+        'Patched memory leak in pedigree canvas',
+        'Resolved duplicate search suggestion entries',
+        'Updated about screen logo and layout',
+      ],
+    ),
     (
       version: '1.0.0',
       date: '2026-06-14',
@@ -44,34 +88,17 @@ class AboutScreen extends StatelessWidget {
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
                 Image.asset(
-                  'assets/images/appbarlogo.png',
-                  height: isTablet ? 100.0 : 80.0,
+                  'assets/images/logo.png',
+                  height: isTablet ? 200.0 : 160.0,
                   fit: BoxFit.contain,
                   errorBuilder: (context, error, stackTrace) => const Text(
                     'ZooPed',
                     style: TextStyle(fontSize: 32, fontWeight: FontWeight.bold),
                   ),
                 ),
-                SizedBox(height: padding * 2),
-                Text(
-                  'ZooPed',
-                  style: TextStyle(
-                    fontSize: isTablet ? 28.0 : 24.0,
-                    fontWeight: FontWeight.bold,
-                    color: AppTheme.primaryColor,
-                  ),
-                ),
-                const SizedBox(height: 4),
-                Text(
-                  'Pedigree Documentation',
-                  style: TextStyle(
-                    fontSize: isTablet ? 16.0 : 14.0,
-                    color: Colors.grey.shade600,
-                  ),
-                ),
-                const SizedBox(height: 8),
+                SizedBox(height: padding),
                 Text(
-                  'Version 1.0.0',
+                  'Version 1.1.1',
                   style: TextStyle(
                     fontSize: isTablet ? 14.0 : 12.0,
                     color: Colors.grey.shade500,
@@ -120,7 +147,7 @@ class AboutScreen extends StatelessWidget {
       children: [
         Row(
           children: [
-            Icon(Icons.history, size: 20, color: AppTheme.primaryColor),
+            const Icon(Icons.history, size: 20, color: AppTheme.primaryColor),
             SizedBox(width: isTablet ? 12 : 8),
             Text(
               'Changelog',
@@ -182,7 +209,7 @@ class AboutScreen extends StatelessWidget {
                   child: Row(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
-                      Text(
+                      const Text(
                         '\u2022 ',
                         style: TextStyle(
                           color: AppTheme.primaryColor,
diff --git a/lib/features/settings/presentation/screens/settings_screen.dart b/lib/features/settings/presentation/screens/settings_screen.dart
index 98776d5..6627f1b 100644
--- a/lib/features/settings/presentation/screens/settings_screen.dart
+++ b/lib/features/settings/presentation/screens/settings_screen.dart
@@ -1,510 +1,137 @@
-import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
-import 'package:image_picker/image_picker.dart';
-import 'package:path_provider/path_provider.dart';
-import 'package:path/path.dart' as p;
-import '../../../../core/services/csv_service.dart';
 import '../../../../core/theme/app_theme.dart';
 import '../../../../core/utils/responsive.dart';
-import '../../domain/entities/kennel_profile.dart';
-import '../providers/settings_providers.dart';
-import '../../../pedigree/presentation/providers/pedigree_providers.dart';
-import '../../../pedigree/presentation/providers/shared_providers.dart';
 
-class SettingsScreen extends ConsumerStatefulWidget {
+class SettingsScreen extends ConsumerWidget {
   const SettingsScreen({super.key});
 
   @override
-  ConsumerState<SettingsScreen> createState() => _SettingsScreenState();
-}
-
-class _SettingsScreenState extends ConsumerState<SettingsScreen> {
-  final _formKey = GlobalKey<FormState>();
-  final _kennelNameController = TextEditingController();
-  final _breederNameController = TextEditingController();
-  final _contactInfoController = TextEditingController();
-
-  String? _logoPath;
-  bool _controllersInitialized = false;
-
-  @override
-  void dispose() {
-    _kennelNameController.dispose();
-    _breederNameController.dispose();
-    _contactInfoController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final profileAsync = ref.watch(kennelProfileProvider);
-    final padding = Responsive.padding(context);
+  Widget build(BuildContext context, WidgetRef ref) {
     final isTablet = Responsive.isTablet(context);
+    final padding = Responsive.padding(context);
 
     return Scaffold(
       appBar: AppBar(
         title: const Text('Settings'),
       ),
-      body: profileAsync.when(
-        loading: () => const Center(child: CircularProgressIndicator()),
-        error: (e, _) => Center(
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              const Icon(Icons.error_outline, size: 48, color: Colors.red),
-              const SizedBox(height: 16),
-              Text('Error: $e'),
-              const SizedBox(height: 16),
-              ElevatedButton(
-                onPressed: () => ref.invalidate(kennelProfileProvider),
-                child: const Text('Retry'),
+      body: SingleChildScrollView(
+        padding: EdgeInsets.all(padding),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              'Application Settings',
+              style: TextStyle(
+                fontSize: isTablet ? 22.0 : 20.0,
+                fontWeight: FontWeight.bold,
+                color: AppTheme.secondaryColor,
               ),
-            ],
-          ),
-        ),
-        data: (profile) {
-          if (!_controllersInitialized) {
-            _kennelNameController.text = profile.kennelName;
-            _breederNameController.text = profile.breederName ?? '';
-            _contactInfoController.text = profile.contactInfo ?? '';
-            _logoPath = profile.localLogoPath;
-            _controllersInitialized = true;
-          }
-
-          return SingleChildScrollView(
-            padding: EdgeInsets.all(padding),
-            child: Form(
-              key: _formKey,
-              child: isTablet
-                  ? _buildTabletLayout(padding)
-                  : _buildPhoneLayout(padding),
             ),
-          );
-        },
-      ),
-    );
-  }
-
-  Widget _buildPhoneLayout(double padding) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        _buildKennelProfileSection(padding),
-        SizedBox(height: padding * 2),
-        _buildLogoSection(padding),
-        SizedBox(height: padding * 2),
-        _buildBackupSection(padding),
-        SizedBox(height: padding * 2),
-        _buildSaveButton(padding),
-        SizedBox(height: padding * 2),
-        _buildAboutSection(padding),
-      ],
-    );
-  }
-
-  Widget _buildTabletLayout(double padding) {
-    return Row(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Expanded(
-          flex: 1,
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              _buildKennelProfileSection(padding),
-              SizedBox(height: padding * 2),
-              _buildLogoSection(padding),
-            ],
-          ),
-        ),
-        SizedBox(width: padding * 2),
-        Expanded(
-          flex: 1,
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              _buildBackupSection(padding),
-              SizedBox(height: padding * 2),
-              _buildSaveButton(padding),
-              SizedBox(height: padding * 2),
-              _buildAboutSection(padding),
-            ],
-          ),
-        ),
-      ],
-    );
-  }
-
-  Widget _buildKennelProfileSection(double padding) {
-    final isTablet = Responsive.isTablet(context);
-
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text(
-          'Kennel Profile',
-          style: TextStyle(
-            fontSize: isTablet ? 20.0 : 18.0,
-            fontWeight: FontWeight.bold,
-            color: AppTheme.secondaryColor,
-          ),
-        ),
-        SizedBox(height: padding),
-        TextFormField(
-          controller: _kennelNameController,
-          decoration: const InputDecoration(
-            labelText: 'Kennel Name',
-            border: OutlineInputBorder(),
-          ),
-          validator: (value) {
-            if (value == null || value.isEmpty) {
-              return 'Please enter a kennel name';
-            }
-            return null;
-          },
-        ),
-        SizedBox(height: padding),
-        TextFormField(
-          controller: _breederNameController,
-          decoration: const InputDecoration(
-            labelText: 'Breeder Name',
-            border: OutlineInputBorder(),
-          ),
-        ),
-        SizedBox(height: padding),
-        TextFormField(
-          controller: _contactInfoController,
-          decoration: const InputDecoration(
-            labelText: 'Contact Information',
-            border: OutlineInputBorder(),
-          ),
-          maxLines: 3,
+            SizedBox(height: padding * 1.5),
+            _buildSectionCard(
+              context,
+              icon: Icons.palette,
+              title: 'Appearance',
+              subtitle: 'Theme mode and accent colors',
+              color: Colors.purple.shade600,
+              onTap: () => context.push('/settings/appearance'),
+            ),
+            SizedBox(height: padding),
+            _buildSectionCard(
+              context,
+              icon: Icons.pets,
+              title: 'Kennel Profile',
+              subtitle: 'Manage your kennel name, breeder info, and logo',
+              color: AppTheme.defaultPrimaryColor,
+              onTap: () => context.push('/settings/kennel'),
+            ),
+            SizedBox(height: padding),
+            _buildSectionCard(
+              context,
+              icon: Icons.backup,
+              title: 'Backup & Migration',
+              subtitle: 'Export or import your database, view storage usage',
+              color: Colors.orange.shade700,
+              onTap: () => context.push('/settings/backup'),
+            ),
+            SizedBox(height: padding),
+            _buildSectionCard(
+              context,
+              icon: Icons.info_outline,
+              title: 'About ZooPed',
+                subtitle: 'Version 1.2.0',
+              color: Colors.blue.shade700,
+              onTap: () => context.push('/about'),
+            ),
+          ],
         ),
-      ],
+      ),
     );
   }
 
-  Widget _buildLogoSection(double padding) {
+  Widget _buildSectionCard(
+    BuildContext context, {
+    required IconData icon,
+    required String title,
+    required String subtitle,
+    required Color color,
+    required VoidCallback onTap,
+  }) {
     final isTablet = Responsive.isTablet(context);
+    final padding = Responsive.padding(context);
 
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text(
-          'Kennel Logo',
-          style: TextStyle(
-            fontSize: isTablet ? 20.0 : 18.0,
-            fontWeight: FontWeight.bold,
-            color: AppTheme.secondaryColor,
-          ),
-        ),
-        SizedBox(height: padding),
-        Center(
-          child: GestureDetector(
-            onTap: () => _showImagePickerOptions(context),
-            child: Container(
-              width: isTablet ? 200.0 : 150.0,
-              height: isTablet ? 200.0 : 150.0,
-              decoration: BoxDecoration(
-                color: Colors.grey.shade200,
-                borderRadius: BorderRadius.circular(8.0),
-                border: Border.all(
-                  color: Colors.grey.shade400,
-                  width: 2.0,
+    return Card(
+      elevation: 0,
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(16),
+        side: BorderSide(color: Colors.grey.shade200),
+      ),
+      child: InkWell(
+        onTap: onTap,
+        borderRadius: BorderRadius.circular(16),
+        child: Padding(
+          padding: EdgeInsets.all(padding),
+          child: Row(
+            children: [
+              Container(
+                padding: const EdgeInsets.all(12),
+                decoration: BoxDecoration(
+                  color: color.withValues(alpha: 0.1),
+                  borderRadius: BorderRadius.circular(12),
                 ),
+                child: Icon(icon, color: color, size: isTablet ? 32 : 28),
               ),
-              child: _logoPath != null
-                  ? ClipRRect(
-                      borderRadius: BorderRadius.circular(8.0),
-                      child: Image.file(
-                        File(_logoPath!),
-                        fit: BoxFit.cover,
-                        cacheHeight: 300,
-                        errorBuilder: (context, error, stackTrace) {
-                          return const Center(
-                            child: Icon(
-                              Icons.image,
-                              size: 50.0,
-                              color: Colors.grey,
-                            ),
-                          );
-                        },
+              SizedBox(width: padding),
+              Expanded(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      title,
+                      style: TextStyle(
+                        fontSize: isTablet ? 18.0 : 16.0,
+                        fontWeight: FontWeight.w600,
+                        color: AppTheme.secondaryColor,
                       ),
-                    )
-                  : const Center(
-                      child: Column(
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        children: [
-                          Icon(
-                            Icons.add_a_photo,
-                            size: 40.0,
-                            color: Colors.grey,
-                          ),
-                          SizedBox(height: 8.0),
-                          Text(
-                            'Tap to add logo',
-                            style: TextStyle(
-                              color: Colors.grey,
-                              fontSize: 12.0,
-                            ),
-                          ),
-                        ],
+                    ),
+                    const SizedBox(height: 4),
+                    Text(
+                      subtitle,
+                      style: TextStyle(
+                        fontSize: isTablet ? 14.0 : 13.0,
+                        color: Colors.grey.shade600,
                       ),
                     ),
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  Widget _buildBackupSection(double padding) {
-    final isTablet = Responsive.isTablet(context);
-
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text(
-          'Backup & Migration',
-          style: TextStyle(
-            fontSize: isTablet ? 20.0 : 18.0,
-            fontWeight: FontWeight.bold,
-            color: AppTheme.secondaryColor,
-          ),
-        ),
-        SizedBox(height: padding),
-        SizedBox(
-          width: double.infinity,
-          child: ElevatedButton.icon(
-            onPressed: () async {
-              await _exportDatabase(context);
-            },
-            icon: const Icon(Icons.upload_file),
-            label: const Text('Export Database to CSV'),
-            style: ElevatedButton.styleFrom(
-              padding: EdgeInsets.symmetric(
-                vertical: isTablet ? 16.0 : 12.0,
-              ),
-            ),
-          ),
-        ),
-        SizedBox(height: padding),
-        SizedBox(
-          width: double.infinity,
-          child: OutlinedButton.icon(
-            onPressed: () async {
-              await _importDatabase(context);
-            },
-            icon: const Icon(Icons.download),
-            label: const Text('Import Database from CSV'),
-            style: OutlinedButton.styleFrom(
-              padding: EdgeInsets.symmetric(
-                vertical: isTablet ? 16.0 : 12.0,
+                  ],
+                ),
               ),
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  Widget _buildSaveButton(double padding) {
-    final isTablet = Responsive.isTablet(context);
-
-    return SizedBox(
-      width: double.infinity,
-      child: ElevatedButton(
-        onPressed: _saveProfile,
-        style: ElevatedButton.styleFrom(
-          padding: EdgeInsets.symmetric(
-            vertical: isTablet ? 16.0 : 12.0,
+              Icon(Icons.chevron_right, color: Colors.grey.shade400),
+            ],
           ),
         ),
-        child: const Text('Save Settings'),
-      ),
-    );
-  }
-
-  Widget _buildAboutSection(double padding) {
-    return ListTile(
-      leading: const Icon(Icons.info_outline),
-      title: const Text('About ZooPed'),
-      subtitle: const Text('Version 1.0.0'),
-      trailing: const Icon(Icons.chevron_right),
-      onTap: () => context.push('/about'),
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(8),
-      ),
-    );
-  }
-
-  Future<void> _saveProfile() async {
-    if (!_formKey.currentState!.validate()) return;
-
-    try {
-      final updateUseCase = ref.read(updateKennelProfileUseCaseProvider);
-      final currentProfile = await ref.read(kennelProfileProvider.future);
-
-      final updatedProfile = KennelProfile(
-        id: currentProfile.id,
-        kennelName: _kennelNameController.text.trim(),
-        breederName: _breederNameController.text.trim().isEmpty
-            ? null
-            : _breederNameController.text.trim(),
-        contactInfo: _contactInfoController.text.trim().isEmpty
-            ? null
-            : _contactInfoController.text.trim(),
-        localLogoPath: _logoPath,
-      );
-
-      await updateUseCase(updatedProfile);
-      ref.invalidate(kennelProfileProvider);
-
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          const SnackBar(content: Text('Settings saved successfully')),
-        );
-      }
-    } catch (e) {
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text('Error saving settings: $e')),
-        );
-      }
-    }
-  }
-
-  void _showImagePickerOptions(BuildContext context) {
-    showModalBottomSheet(
-      context: context,
-      builder: (context) => SafeArea(
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            ListTile(
-              leading: const Icon(Icons.camera_alt),
-              title: const Text('Take Photo'),
-              onTap: () {
-                Navigator.pop(context);
-                _pickImage(ImageSource.camera);
-              },
-            ),
-            ListTile(
-              leading: const Icon(Icons.photo_library),
-              title: const Text('Choose from Gallery'),
-              onTap: () {
-                Navigator.pop(context);
-                _pickImage(ImageSource.gallery);
-              },
-            ),
-          ],
-        ),
       ),
     );
   }
-
-  Future<void> _pickImage(ImageSource source) async {
-    final picker = ImagePicker();
-    final pickedFile = await picker.pickImage(source: source);
-
-    if (pickedFile != null) {
-      setState(() {
-        _logoPath = pickedFile.path;
-      });
-    }
-  }
-
-  Future<void> _exportDatabase(BuildContext context) async {
-    try {
-      final repository = ref.read(pedigreeRepositoryProvider);
-      final dogs = await repository.getAllDogs();
-      final litters = await repository.getAllLitters();
-
-      final dogsFile = await CsvService.exportDogs(dogs);
-      final littersFile = await CsvService.exportLitters(litters);
-
-      await CsvService.shareCsvFiles([dogsFile, littersFile]);
-      if (context.mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          const SnackBar(content: Text('Database exported successfully')),
-        );
-      }
-    } catch (e) {
-      if (context.mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text('Error exporting database: $e')),
-        );
-      }
-    }
-  }
-
-  Future<void> _importDatabase(BuildContext context) async {
-    try {
-      final appDir = await getApplicationDocumentsDirectory();
-      final csvFiles = await appDir
-          .list()
-          .where((f) => f.path.endsWith('.csv'))
-          .toList();
-
-      if (csvFiles.isEmpty) {
-        if (context.mounted) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            const SnackBar(content: Text('No CSV files found in app storage')),
-          );
-        }
-        return;
-      }
-
-      if (!context.mounted) return;
-
-      final selected = await showDialog<File>(
-        context: context,
-        builder: (ctx) => SimpleDialog(
-          title: const Text('Select CSV to import'),
-          children: csvFiles.map((f) {
-            final file = File(f.path);
-            final name = p.basename(f.path);
-            final isDogs = name.contains('dogs');
-            return SimpleDialogOption(
-              onPressed: () => Navigator.pop(ctx, file),
-              child: Row(
-                children: [
-                  Icon(isDogs ? Icons.pets : Icons.family_restroom, size: 20),
-                  const SizedBox(width: 12),
-                  Text(name),
-                ],
-              ),
-            );
-          }).toList(),
-        ),
-      );
-
-      if (selected == null) return;
-
-      final db = ref.read(databaseProvider);
-      final filePath = selected.path;
-
-      if (filePath.contains('dogs')) {
-        final dogsCompanion = await CsvService.importDogsFromCsv(filePath);
-        await db.bulkInsertDogs(dogsCompanion);
-      } else if (filePath.contains('litters')) {
-        final littersCompanion = await CsvService.importLittersFromCsv(filePath);
-        await db.bulkInsertLitters(littersCompanion);
-      }
-
-      if (context.mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          const SnackBar(content: Text('Database imported successfully')),
-        );
-      }
-    } catch (e) {
-      if (context.mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text('Error importing database: $e')),
-        );
-      }
-    }
-  }
 }
diff --git a/lib/main.dart b/lib/main.dart
index a47a597..9330931 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,26 +1,59 @@
+import 'dart:ui';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 import 'core/theme/app_theme.dart';
+import 'core/theme/theme_provider.dart';
 import 'core/router/app_router.dart';
 
-void main() {
+void main() async {
   WidgetsFlutterBinding.ensureInitialized();
-  runApp(
-    const ProviderScope(
-      child: ZooPedApp(),
-    ),
-  );
+
+  FlutterError.onError = (details) {
+    FlutterError.presentError(details);
+  };
+
+  PlatformDispatcher.instance.onError = (error, stack) {
+    debugPrint('Unhandled error: $error\n$stack');
+    return true;
+  };
+
+  try {
+    final prefs = await SharedPreferences.getInstance();
+    runApp(
+      ProviderScope(
+        overrides: [
+          sharedPreferencesProvider.overrideWithValue(prefs),
+        ],
+        child: const ZooPedApp(),
+      ),
+    );
+  } catch (e) {
+    runApp(
+      MaterialApp(
+        home: Scaffold(
+          body: Center(
+            child: Text('Failed to initialize: $e'),
+          ),
+        ),
+      ),
+    );
+  }
 }
 
-class ZooPedApp extends StatelessWidget {
+class ZooPedApp extends ConsumerWidget {
   const ZooPedApp({super.key});
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
+    final themeState = ref.watch(themeProvider);
+
     return MaterialApp.router(
       title: 'ZooPed',
       debugShowCheckedModeBanner: false,
-      theme: AppTheme.lightTheme,
+      theme: AppTheme.getLightTheme(themeState.primaryColor),
+      darkTheme: AppTheme.getDarkTheme(themeState.primaryColor),
+      themeMode: themeState.themeMode,
       routerConfig: AppRouter.router,
     );
   }
diff --git a/pubspec.lock b/pubspec.lock
index e237bfa..47825a9 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -249,14 +249,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.0.0"
-  cupertino_icons:
-    dependency: "direct main"
-    description:
-      name: cupertino_icons
-      sha256: "41e005c33bd814be4d3096aff55b1908d419fde52ca656c8c47719ec745873cd"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.9"
   custom_lint_core:
     dependency: transitive
     description:
@@ -448,14 +440,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "14.8.1"
-  google_fonts:
-    dependency: "direct main"
-    description:
-      name: google_fonts
-      sha256: ba03d03bcaa2f6cb7bd920e3b5027181db75ab524f8891c8bc3aa603885b8055
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.3.3"
   graphs:
     dependency: transitive
     description:
@@ -905,7 +889,7 @@ packages:
     source: hosted
     version: "0.5.10"
   riverpod_annotation:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: riverpod_annotation
       sha256: e14b0bf45b71326654e2705d462f21b958f987087be850afd60578fcd502d1b8
@@ -936,6 +920,62 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.0.2"
+  shared_preferences:
+    dependency: "direct main"
+    description:
+      name: shared_preferences
+      sha256: c3025c5534b01739267eb7d76959bbc25a6d10f6988e1c2a3036940133dd10bf
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.5"
+  shared_preferences_android:
+    dependency: transitive
+    description:
+      name: shared_preferences_android
+      sha256: "93ae5884a9df5d3bb696825bceb3a17590754548b5d740eba51500afc8d088f5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.26"
+  shared_preferences_foundation:
+    dependency: transitive
+    description:
+      name: shared_preferences_foundation
+      sha256: "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.6"
+  shared_preferences_linux:
+    dependency: transitive
+    description:
+      name: shared_preferences_linux
+      sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
+  shared_preferences_platform_interface:
+    dependency: transitive
+    description:
+      name: shared_preferences_platform_interface
+      sha256: "649dc798a33931919ea356c4305c2d1f81619ea6e92244070b520187b5140ef9"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.2"
+  shared_preferences_web:
+    dependency: transitive
+    description:
+      name: shared_preferences_web
+      sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.3"
+  shared_preferences_windows:
+    dependency: transitive
+    description:
+      name: shared_preferences_windows
+      sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
   shelf:
     dependency: transitive
     description:
@@ -952,6 +992,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.0"
+  shimmer:
+    dependency: "direct main"
+    description:
+      name: shimmer
+      sha256: "5f88c883a22e9f9f299e5ba0e4f7e6054857224976a5d9f839d4ebdc94a14ac9"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -974,7 +1022,7 @@ packages:
     source: hosted
     version: "1.10.2"
   sqlite3:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: sqlite3
       sha256: "3145bd74dcdb4fd6f5c6dda4d4e4490a8087d7f286a14dee5d37087290f0f8a2"
@@ -1142,7 +1190,7 @@ packages:
     source: hosted
     version: "3.1.5"
   uuid:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: uuid
       sha256: "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489"
diff --git a/pubspec.yaml b/pubspec.yaml
index 42f6adb..078c7d5 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -2,7 +2,7 @@ name: zooped
 description: "Zoo Pedigree - Dog Pedigree Tracking App"
 publish_to: 'none'
 
-version: 1.0.0+1
+version: 1.2.0+5
 
 environment:
   sdk: ^3.12.0
@@ -11,13 +11,8 @@ dependencies:
   flutter:
     sdk: flutter
 
-  # UI & Design
-  cupertino_icons: ^1.0.8
-  google_fonts: ^6.2.1
-  
   # State Management
   flutter_riverpod: ^2.6.1
-  riverpod_annotation: ^2.6.1
   
   # Navigation
   go_router: ^14.8.1
@@ -39,8 +34,10 @@ dependencies:
   
   # Utilities
   intl: ^0.19.0
-  uuid: ^4.5.1
   url_launcher: ^6.3.1
+  shimmer: ^3.0.0
+  shared_preferences: ^2.2.3
+  sqlite3: ^2.4.6
 
 dev_dependencies:
   flutter_test: