diff --git a/lib/main_app.dart b/lib/main_app.dart
index 7f021f150..d7d9f59b2 100644
--- a/lib/main_app.dart
+++ b/lib/main_app.dart
@@ -224,13 +224,18 @@ class InvoiceNinjaAppState extends State<InvoiceNinjaApp> {
                     color: hasAccentColor ? null : accentColor,
                   ),
                   appBarTheme: AppBarTheme(
+                    brightness: Brightness.light,
                     color: hasAccentColor ? accentColor : Colors.white,
                     iconTheme: IconThemeData(
                       color: hasAccentColor ? Colors.white : accentColor,
                     ),
                     textTheme: TextTheme(
-                      headline6: Theme.of(context).textTheme.headline6.copyWith(
-                            color: hasAccentColor ? Colors.white : Colors.black,
+                      headline6: Theme.of(context)
+                          .textTheme
+                          .headline6
+                          .copyWith(
+                            color:
+                                hasAccentColor ? Colors.white : Colors.black,
                           ),
                     ),
                   ),
@@ -241,7 +246,8 @@ class InvoiceNinjaAppState extends State<InvoiceNinjaApp> {
               ? {
                   LoginScreen.route: (context) => LoginScreen(),
                   MainScreen.route: (context) => MainScreen(),
-                  DashboardScreenBuilder.route: (context) => ChangeLayoutBanner(
+                  DashboardScreenBuilder.route: (context) =>
+                      ChangeLayoutBanner(
                         suggestedLayout: AppLayout.mobile,
                         appLayout: state.prefState.appLayout,
                         child: DashboardScreenBuilder(),
@@ -274,7 +280,8 @@ class InvoiceNinjaAppState extends State<InvoiceNinjaApp> {
                   PaymentScreen.route: (context) => PaymentScreenBuilder(),
                   PaymentViewScreen.route: (context) => PaymentViewScreen(),
                   PaymentEditScreen.route: (context) => PaymentEditScreen(),
-                  PaymentRefundScreen.route: (context) => PaymentRefundScreen(),
+                  PaymentRefundScreen.route: (context) =>
+                      PaymentRefundScreen(),
                   QuoteScreen.route: (context) => QuoteScreenBuilder(),
                   QuoteViewScreen.route: (context) => QuoteViewScreen(),
                   QuoteEditScreen.route: (context) => QuoteEditScreen(),
@@ -301,7 +308,8 @@ class InvoiceNinjaAppState extends State<InvoiceNinjaApp> {
                   UserScreen.route: (context) => UserScreenBuilder(),
                   UserViewScreen.route: (context) => UserViewScreen(),
                   UserEditScreen.route: (context) => UserEditScreen(),
-                  GroupSettingsScreen.route: (context) => GroupScreenBuilder(),
+                  GroupSettingsScreen.route: (context) =>
+                      GroupScreenBuilder(),
                   GroupViewScreen.route: (context) => GroupViewScreen(),
                   GroupEditScreen.route: (context) => GroupEditScreen(),
                   SettingsScreen.route: (context) => SettingsScreenBuilder(),
@@ -335,10 +343,13 @@ class InvoiceNinjaAppState extends State<InvoiceNinjaApp> {
                       GeneratedNumbersScreen(),
                   WorkflowSettingsScreen.route: (context) =>
                       WorkflowSettingsScreen(),
-                  InvoiceDesignScreen.route: (context) => InvoiceDesignScreen(),
+                  InvoiceDesignScreen.route: (context) =>
+                      InvoiceDesignScreen(),
                   ClientPortalScreen.route: (context) => ClientPortalScreen(),
-                  BuyNowButtonsScreen.route: (context) => BuyNowButtonsScreen(),
-                  EmailSettingsScreen.route: (context) => EmailSettingsScreen(),
+                  BuyNowButtonsScreen.route: (context) =>
+                      BuyNowButtonsScreen(),
+                  EmailSettingsScreen.route: (context) =>
+                      EmailSettingsScreen(),
                   TemplatesAndRemindersScreen.route: (context) =>
                       TemplatesAndRemindersScreen(),
                   CreditCardsAndBanksScreen.route: (context) =>
diff --git a/lib/ui/app/change_layout_banner.dart b/lib/ui/app/change_layout_banner.dart
index 3cec9186d..2ee4ec9f4 100644
--- a/lib/ui/app/change_layout_banner.dart
+++ b/lib/ui/app/change_layout_banner.dart
@@ -50,6 +50,8 @@ class _ChangeLayoutBannerState extends State<ChangeLayoutBanner> {
     }
 
     return SafeArea(
+      top: message != null,
+      bottom: message != null,
       child: Column(
         children: [
           AnimatedContainer(
diff --git a/pubspec.lock b/pubspec.lock
index bddddc39e..770ce7c3b 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -112,7 +112,7 @@ packages:
       name: cached_network_image
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.0"
+    version: "2.0.0"
   characters:
     dependency: transitive
     description:
@@ -266,7 +266,7 @@ packages:
       name: file
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.2.1"
+    version: "6.0.0-nullsafety.1"
   firebase:
     dependency: transitive
     description:
@@ -328,20 +328,13 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  flutter_blurhash:
-    dependency: transitive
-    description:
-      name: flutter_blurhash
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.5.0"
   flutter_cache_manager:
     dependency: transitive
     description:
       name: flutter_cache_manager
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.4.1"
+    version: "1.1.3"
   flutter_colorpicker:
     dependency: "direct main"
     description:
@@ -642,13 +635,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.4.12"
-  octo_image:
-    dependency: transitive
-    description:
-      name: octo_image
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.2.1"
   package_config:
     dependency: transitive
     description:
@@ -718,7 +704,7 @@ packages:
       name: platform
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.1"
+    version: "3.0.0-nullsafety.1"
   platform_detect:
     dependency: transitive
     description:
@@ -746,7 +732,7 @@ packages:
       name: process
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.13"
+    version: "4.0.0-nullsafety.1"
   pub_semver:
     dependency: transitive
     description:
@@ -1145,5 +1131,5 @@ packages:
     source: hosted
     version: "2.2.1"
 sdks:
-  dart: ">=2.10.0-0.0.dev <2.10.0"
-  flutter: ">=1.20.0 <2.0.0"
+  dart: ">=2.10.0-4.0.dev <2.10.0"
+  flutter: ">=1.17.0 <2.0.0"