diff --git a/example/.vscode/launch.json b/example/.vscode/launch.json
new file mode 100644
index 0000000..c8a15c4
--- /dev/null
+++ b/example/.vscode/launch.json
@@ -0,0 +1,11 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Example",
+            "request": "launch",
+            "type": "dart",
+            "program": "lib/main.dart",
+        },
+    ]
+}
\ No newline at end of file
diff --git a/lib/src/presentation/di/injector.dart b/lib/src/presentation/di/injector.dart
index 137f2b9..1ac4000 100644
--- a/lib/src/presentation/di/injector.dart
+++ b/lib/src/presentation/di/injector.dart
@@ -38,18 +38,25 @@ class _Injector {
     _theme = theme;
     _imageHeaders = imageHeaders;
     _userId = userId;
-    _cacheDataSource = CacheDataSourceImpl();
-    _suggestionsDataSource = suggestionsDataSource;
-    _suggestionRepository = SuggestionRepositoryImpl(
-      _suggestionsDataSource,
-      _cacheDataSource,
-    );
+
+    if (!_isInitialized) {
+      _cacheDataSource = CacheDataSourceImpl();
+      _suggestionsDataSource = suggestionsDataSource;
+      _suggestionRepository = SuggestionRepositoryImpl(
+        _suggestionsDataSource,
+        _cacheDataSource,
+      );
+      _isInitialized = true;
+    }
+
     _adminSettings = adminSettings;
     _isAdmin = isAdmin;
     _localization = locale.localizationOptions;
     _navigatorKey = navigatorKey;
   }
 
+  bool _isInitialized = false;
+
   AdminSettings? _adminSettings;
 
   AdminSettings? get adminSettings => _adminSettings;
diff --git a/lib/src/presentation/pages/suggestion/suggestion_page.dart b/lib/src/presentation/pages/suggestion/suggestion_page.dart
index 93dc93c..c92f0d7 100644
--- a/lib/src/presentation/pages/suggestion/suggestion_page.dart
+++ b/lib/src/presentation/pages/suggestion/suggestion_page.dart
@@ -26,7 +26,6 @@ import 'package:suggest_a_feature/src/presentation/utils/assets_strings.dart';
 import 'package:suggest_a_feature/src/presentation/utils/date_utils.dart';
 import 'package:suggest_a_feature/src/presentation/utils/dimensions.dart';
 import 'package:suggest_a_feature/src/presentation/utils/image_utils.dart';
-import 'package:suggest_a_feature/src/presentation/utils/platform_check.dart';
 import 'package:suggest_a_feature/src/presentation/utils/typedefs.dart';
 import 'package:wtf_sliding_sheet/wtf_sliding_sheet.dart';
 
@@ -107,11 +106,9 @@ class _SuggestionPageState extends State<SuggestionPage> {
                 ),
                 SafeArea(
                   top: false,
-                  bottom: SuggestionsPlatform.isIOS,
                   child: Container(
-                    padding: EdgeInsets.only(
-                      bottom: MediaQuery.of(context).padding.bottom +
-                          Dimensions.marginSmall,
+                    padding: const EdgeInsets.only(
+                      bottom: Dimensions.marginSmall,
                     ),
                     child: Row(
                       crossAxisAlignment: CrossAxisAlignment.end,