diff --git a/android/build/reports/problems/problems-report.html b/android/build/reports/problems/problems-report.html
index 620ac10..214b73f 100644
--- a/android/build/reports/problems/problems-report.html
+++ b/android/build/reports/problems/problems-report.html
@@ -650,7 +650,7 @@ code + .copy-button {
 <script type="text/javascript">
 function configurationCacheProblems() { return (
 // begin-report-data
-{"diagnostics":[{"locations":[{},{"pluginId":"dev.flutter.flutter-gradle-plugin"}],"problem":[{"text":"The CopyProcessingSpec.setFileMode(Integer) method has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 9.0."}],"contextualLabel":"The CopyProcessingSpec.setFileMode(Integer) method has been deprecated.","documentationLink":"https://docs.gradle.org/8.14.3/userguide/upgrading_version_8.html#unix_file_permissions_deprecated","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"the-copyprocessingspec-setfilemode-integer-method-has-been-deprecated","displayName":"The CopyProcessingSpec.setFileMode(Integer) method has been deprecated."}],"solutions":[[{"text":"Please use the filePermissions(Action) method instead."}]]}],"problemsReport":{"totalProblemCount":1,"buildName":"android","requestedTasks":"assembleDebug","documentationLink":"https://docs.gradle.org/8.14.3/userguide/reporting_problems.html","documentationLinkCaption":"Problem report","summaries":[]}}
+{"diagnostics":[{"locations":[{}],"problem":[{"text":"Configuring project ':' without an existing directory is deprecated. The configured projectDirectory '/usr/lib/flutter/packages/flutter_tools/gradle' does not exist, can't be written to or is not a directory. This behavior has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This will fail with an error in Gradle 9.0."}],"contextualLabel":"Configuring project ':' without an existing directory is deprecated. The configured projectDirectory '/usr/lib/flutter/packages/flutter_tools/gradle' does not exist, can't be written to or is not a directory. This behavior has been deprecated.","documentationLink":"https://docs.gradle.org/8.14.3/userguide/upgrading_version_8.html#deprecated_missing_project_directory","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"configuring-project-without-an-existing-directory-is-deprecated-the-configured-projectdirectory-usr-lib-flutter-packages-flutter-tools-gradle-does-not-exist-can-t-be-written-to-or-is-not-a-directory-this-behavior-has-been-deprecated","displayName":"Configuring project ':' without an existing directory is deprecated. The configured projectDirectory '/usr/lib/flutter/packages/flutter_tools/gradle' does not exist, can't be written to or is not a directory. This behavior has been deprecated."}],"solutions":[[{"text":"Make sure the project directory exists and can be written."}]]}],"problemsReport":{"totalProblemCount":1,"requestedTasks":"assembleDebug","documentationLink":"https://docs.gradle.org/8.14.3/userguide/reporting_problems.html","documentationLinkCaption":"Problem report","summaries":[]}}
 // end-report-data
 );}
 </script>
diff --git a/lib/ui/add_page/view_model/add_view_model.dart b/lib/ui/add_page/view_model/add_view_model.dart
index 9f63196..61c5b3d 100644
--- a/lib/ui/add_page/view_model/add_view_model.dart
+++ b/lib/ui/add_page/view_model/add_view_model.dart
@@ -139,13 +139,7 @@ class AddViewModel extends ChangeNotifier {
         break;
     }
     final result2 = await _loadBal();
-    switch (result2) {
-      case Ok():
-        isLoaded = true;
-        break;
-      default:
-        break;
-    }
+    isLoaded = true;
     notifyListeners();
     return result2;
   }
diff --git a/lib/ui/add_page/widgets/add_page.dart b/lib/ui/add_page/widgets/add_page.dart
index 9c7cf0c..f5ececa 100644
--- a/lib/ui/add_page/widgets/add_page.dart
+++ b/lib/ui/add_page/widgets/add_page.dart
@@ -9,7 +9,6 @@ import 'package:seshat/ui/add_page/widgets/form_popup.dart';
 import 'package:seshat/ui/add_page/widgets/owner_popup.dart';
 import 'package:seshat/ui/add_page/widgets/confirmation_popup.dart';
 import 'package:seshat/ui/core/ui/navigation_bar.dart';
-import 'package:seshat/ui/core/ui/await_loading.dart';
 import 'package:seshat/utils/result.dart';
 
 class AddPage extends StatefulWidget {
@@ -38,7 +37,7 @@ class _AddPageState extends State<AddPage> {
       body: ListenableBuilder(
         listenable: widget.viewModel,
         builder: (context, child) => switch (widget.viewModel.isLoaded) {
-          false => AwaitLoading(),
+          false => Center(child: CircularProgressIndicator()),
           true => switch (widget.viewModel.currentBal) {
             null => Center(
               child: SizedBox(
diff --git a/lib/ui/bal_page/view_model/bal_view_model.dart b/lib/ui/bal_page/view_model/bal_view_model.dart
index 9339a4b..e52fc02 100644
--- a/lib/ui/bal_page/view_model/bal_view_model.dart
+++ b/lib/ui/bal_page/view_model/bal_view_model.dart
@@ -28,12 +28,12 @@ class BalViewModel extends ChangeNotifier {
   Future<Result<void>> _load() async {
     final result1 = await _loadBal();
     switch (result1) {
-      case Ok():
-        isLoaded = true;
-        break;
+      case Error():
+        return result1;
       default:
         break;
     }
+    isLoaded = true;
     notifyListeners();
     return result1;
   }
diff --git a/lib/ui/bal_page/widget/bal_page.dart b/lib/ui/bal_page/widget/bal_page.dart
index 8c7fd9d..10a1138 100644
--- a/lib/ui/bal_page/widget/bal_page.dart
+++ b/lib/ui/bal_page/widget/bal_page.dart
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:seshat/domain/models/bal.dart';
 import 'package:seshat/ui/bal_page/view_model/bal_view_model.dart';
 import 'package:seshat/ui/core/ui/navigation_bar.dart';
-import 'package:seshat/ui/core/ui/await_loading.dart';
 
 class BalPage extends StatefulWidget {
   const BalPage({super.key, required this.viewModel});
@@ -22,7 +21,7 @@ class _BalPageState extends State<BalPage> {
         listenable: widget.viewModel,
         builder: (context, child) {
           return switch (widget.viewModel.isLoaded) {
-            false => AwaitLoading(),
+            false => Center(child: CircularProgressIndicator()),
             true => switch (widget.viewModel.bal == null) {
               true => Center(
                 child: Text("La BAL référencée n'est pas accessible"),
diff --git a/lib/ui/bal_page/widget/pending/bal_pending_screen.dart b/lib/ui/bal_page/widget/pending/bal_pending_screen.dart
deleted file mode 100644
index b65257a..0000000
--- a/lib/ui/bal_page/widget/pending/bal_pending_screen.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-import 'package:flutter/material.dart';
-
-class BalPendingScreen extends StatelessWidget {
-  const BalPendingScreen({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    // TODO: implement build
-    throw UnimplementedError();
-  }
-}
diff --git a/lib/ui/core/ui/await_loading.dart b/lib/ui/core/ui/await_loading.dart
deleted file mode 100644
index 7342527..0000000
--- a/lib/ui/core/ui/await_loading.dart
+++ /dev/null
@@ -1,47 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/material.dart';
-
-class AwaitLoading extends StatefulWidget {
-  const AwaitLoading({super.key});
-
-  @override
-  State<AwaitLoading> createState() => _AwaitLoadingState();
-}
-
-class _AwaitLoadingState extends State<AwaitLoading> {
-  String text = "";
-
-  Timer? t;
-
-  @override
-  void dispose() {
-    t?.cancel();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    t = Timer(Duration(seconds: 8), () {
-      setState(() {
-        text =
-            "Il semblerait qu'il y ait un problème. Vérifiez que vous êtes connecté·e à internet.";
-      });
-    });
-
-    return Column(
-      children: [
-        Expanded(child: SizedBox()),
-        Center(child: CircularProgressIndicator()),
-        Expanded(
-          child: Center(
-            child: SizedBox(
-              width: 300,
-              child: Text(text, textAlign: TextAlign.center),
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-}
diff --git a/lib/ui/home_page/view_model/home_view_model.dart b/lib/ui/home_page/view_model/home_view_model.dart
index a35c33c..22eae91 100644
--- a/lib/ui/home_page/view_model/home_view_model.dart
+++ b/lib/ui/home_page/view_model/home_view_model.dart
@@ -56,13 +56,7 @@ class HomeViewModel extends ChangeNotifier {
 
   Future<Result<void>> _load() async {
     final result2 = await _loadBal();
-    switch (result2) {
-      case Ok():
-        isLoaded = true;
-        break;
-      default:
-        break;
-    }
+    isLoaded = true;
     notifyListeners();
     return result2;
   }
diff --git a/lib/ui/home_page/widgets/home_page.dart b/lib/ui/home_page/widgets/home_page.dart
index 588347b..586db9d 100644
--- a/lib/ui/home_page/widgets/home_page.dart
+++ b/lib/ui/home_page/widgets/home_page.dart
@@ -4,7 +4,6 @@ import 'package:seshat/domain/models/bal.dart';
 import 'package:seshat/ui/core/ui/navigation_bar.dart';
 import 'package:seshat/ui/home_page/view_model/home_view_model.dart';
 import 'package:seshat/ui/home_page/widgets/create_confirmation_popup.dart';
-import 'package:seshat/ui/core/ui/await_loading.dart';
 
 class HomePage extends StatefulWidget {
   const HomePage({super.key, required this.viewModel});
@@ -24,7 +23,7 @@ class _HomePageState extends State<HomePage> {
         listenable: widget.viewModel,
         builder: (context, child) {
           return switch (widget.viewModel.isLoaded) {
-            false => AwaitLoading(),
+            false => Center(child: CircularProgressIndicator()),
             true => switch (widget.viewModel.currentBal == null) {
               true => HomePageOnNoCurrent(widget: widget),
               false => HomePageOnCurrent(widget: widget),
diff --git a/lib/ui/sell_page/view_model/sell_view_model.dart b/lib/ui/sell_page/view_model/sell_view_model.dart
index 0532b8b..85b1670 100644
--- a/lib/ui/sell_page/view_model/sell_view_model.dart
+++ b/lib/ui/sell_page/view_model/sell_view_model.dart
@@ -71,16 +71,10 @@ class SellViewModel extends ChangeNotifier {
   bool isLoaded = false;
 
   Future<Result<void>> _load() async {
-    final result1 = await _loadBal();
-    switch (result1) {
-      case Ok():
-        isLoaded = true;
-        break;
-      default:
-        break;
-    }
+    final result2 = await _loadBal();
+    isLoaded = true;
     notifyListeners();
-    return result1;
+    return result2;
   }
 
   Future<Result<void>> _loadBal() async {
diff --git a/lib/ui/sell_page/widgets/sell_page.dart b/lib/ui/sell_page/widgets/sell_page.dart
index 1c463f6..47da1e6 100644
--- a/lib/ui/sell_page/widgets/sell_page.dart
+++ b/lib/ui/sell_page/widgets/sell_page.dart
@@ -5,7 +5,6 @@ import 'package:seshat/routing/routes.dart';
 import 'package:seshat/ui/core/ui/navigation_bar.dart';
 import 'package:seshat/ui/sell_page/view_model/sell_view_model.dart';
 import 'package:seshat/ui/sell_page/widgets/scan_screen.dart';
-import 'package:seshat/ui/core/ui/await_loading.dart';
 
 class SellPage extends StatefulWidget {
   const SellPage({super.key, required this.viewModel});
@@ -25,7 +24,7 @@ class _SellPageState extends State<SellPage> {
         listenable: widget.viewModel,
         builder: (context, child) {
           return switch (widget.viewModel.isLoaded) {
-            false => AwaitLoading(),
+            false => Center(child: CircularProgressIndicator()),
             true => switch (widget.viewModel.currentBal) {
               null => Center(
                 child: SizedBox(
diff --git a/lib/ui/core/ui/overlay_boundary.dart b/lib/utils/overlay_boundary.dart
similarity index 100%
rename from lib/ui/core/ui/overlay_boundary.dart
rename to lib/utils/overlay_boundary.dart