diff --git a/lib/providers/ui_experiment_provider.dart b/lib/providers/ui_experiment_provider.dart
index dcdd849..d3ede56 100644
--- a/lib/providers/ui_experiment_provider.dart
+++ b/lib/providers/ui_experiment_provider.dart
@@ -21,13 +21,14 @@ class UiExperimentSettings {
   }
 }
 
-// Provider
-final uiExperimentProvider = StateNotifierProvider<UiExperimentNotifier, UiExperimentSettings>(
-  (ref) => UiExperimentNotifier(),
-);
+// Provider (Riverpod 2.0 Notifier)
+final uiExperimentProvider = NotifierProvider<UiExperimentNotifier, UiExperimentSettings>(UiExperimentNotifier.new);
 
-class UiExperimentNotifier extends StateNotifier<UiExperimentSettings> {
-  UiExperimentNotifier() : super(const UiExperimentSettings());
+class UiExperimentNotifier extends Notifier<UiExperimentSettings> {
+  @override
+  UiExperimentSettings build() {
+    return const UiExperimentSettings();
+  }
   
   void setGridColumns(int columns) {
     state = state.copyWith(gridColumns: columns);
diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart
index d639abc..f0d0b28 100644
--- a/lib/screens/home_screen.dart
+++ b/lib/screens/home_screen.dart
@@ -26,7 +26,9 @@ import '../widgets/home/home_empty_state.dart';
 import '../widgets/home/sake_no_match_state.dart';
 import '../models/user_profile.dart'; // UserProfile
 import '../widgets/analyzing_dialog.dart';
-import '../widgets/empty_state.dart'; // Generic empty state
+import '../widgets/home/sake_list_view.dart';
+import '../widgets/home/sake_grid_view.dart';
+import '../widgets/add_set_item_dialog.dart';
 import '../providers/ui_experiment_provider.dart'; // A/B Test
 import 'package:flutter_speed_dial/flutter_speed_dial.dart';
 import 'package:lucide_icons/lucide_icons.dart';