diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index a3d22fae..51220c17 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -483,7 +483,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 0.31.0;
+				MARKETING_VERSION = 0.31.2;
 				PRODUCT_BUNDLE_IDENTIFIER = im.fluffychat.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -623,7 +623,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 0.31.0;
+				MARKETING_VERSION = 0.31.2;
 				PRODUCT_BUNDLE_IDENTIFIER = im.fluffychat.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -657,7 +657,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 0.31.0;
+				MARKETING_VERSION = 0.31.2;
 				PRODUCT_BUNDLE_IDENTIFIER = im.fluffychat.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -687,7 +687,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 0.31.0;
+				MARKETING_VERSION = 0.31.2;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "im.fluffychat.app.FluffyChat-Share";
@@ -721,7 +721,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 0.31.0;
+				MARKETING_VERSION = 0.31.2;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "im.fluffychat.app.FluffyChat-Share";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -752,7 +752,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 0.31.0;
+				MARKETING_VERSION = 0.31.2;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "im.fluffychat.app.FluffyChat-Share";
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/lib/pages/views/homeserver_picker_view.dart b/lib/pages/views/homeserver_picker_view.dart
index f91ef683..9408b977 100644
--- a/lib/pages/views/homeserver_picker_view.dart
+++ b/lib/pages/views/homeserver_picker_view.dart
@@ -70,7 +70,7 @@ class HomeserverPickerView extends StatelessWidget {
                   child: controller.isLoading
                       ? LinearProgressIndicator()
                       : Text(
-                          L10n.of(context).connect.toUpperCase(),
+                          L10n.of(context).connect,
                           style: TextStyle(color: Colors.white, fontSize: 16),
                         ),
                 ),
diff --git a/lib/pages/views/login_view.dart b/lib/pages/views/login_view.dart
index a000ff8a..c5f222c6 100644
--- a/lib/pages/views/login_view.dart
+++ b/lib/pages/views/login_view.dart
@@ -82,7 +82,7 @@ class LoginView extends StatelessWidget {
                     child: controller.loading
                         ? LinearProgressIndicator()
                         : Text(
-                            L10n.of(context).login.toUpperCase(),
+                            L10n.of(context).login,
                             style: TextStyle(color: Colors.white, fontSize: 16),
                           ),
                   ),
diff --git a/lib/pages/views/sign_up_password_view.dart b/lib/pages/views/sign_up_password_view.dart
index 9500dae4..46e36845 100644
--- a/lib/pages/views/sign_up_password_view.dart
+++ b/lib/pages/views/sign_up_password_view.dart
@@ -73,7 +73,7 @@ class SignUpPasswordView extends StatelessWidget {
                   child: controller.loading
                       ? LinearProgressIndicator()
                       : Text(
-                          L10n.of(context).createAccountNow.toUpperCase(),
+                          L10n.of(context).createAccountNow,
                           style: TextStyle(color: Colors.white, fontSize: 16),
                         ),
                 ),
diff --git a/lib/pages/views/sign_up_view.dart b/lib/pages/views/sign_up_view.dart
index cedb0397..7500a99f 100644
--- a/lib/pages/views/sign_up_view.dart
+++ b/lib/pages/views/sign_up_view.dart
@@ -108,7 +108,7 @@ class SignUpView extends StatelessWidget {
                         child: controller.loading
                             ? LinearProgressIndicator()
                             : Text(
-                                L10n.of(context).signUp.toUpperCase(),
+                                L10n.of(context).signUp,
                                 style: TextStyle(
                                     color: Colors.white, fontSize: 16),
                               ),
@@ -147,7 +147,7 @@ class SignUpView extends StatelessWidget {
                             //elevation: 1,
                           ),
                           onPressed: () => context.vRouter.push('/login'),
-                          child: Text(L10n.of(context).login.toUpperCase()),
+                          child: Text(L10n.of(context).login),
                         ),
                       ),
                     if (controller.passwordLoginSupported &&
@@ -162,7 +162,7 @@ class SignUpView extends StatelessWidget {
                                 Theme.of(context).textTheme.bodyText1.color,
                           ),
                           onPressed: controller.ssoLoginAction,
-                          child: Text(L10n.of(context).useSSO.toUpperCase()),
+                          child: Text(L10n.of(context).useSSO),
                         ),
                       ),
                   ]),
diff --git a/lib/widgets/layouts/one_page_card.dart b/lib/widgets/layouts/one_page_card.dart
index 0370dee0..7b0c7a18 100644
--- a/lib/widgets/layouts/one_page_card.dart
+++ b/lib/widgets/layouts/one_page_card.dart
@@ -1,5 +1,6 @@
 import 'dart:math';
 
+import 'package:fluffychat/config/themes.dart';
 import 'package:flutter/material.dart';
 
 class OnePageCard extends StatelessWidget {
@@ -8,11 +9,10 @@ class OnePageCard extends StatelessWidget {
   const OnePageCard({Key key, this.child}) : super(key: key);
 
   static const int alpha = 12;
-  static const int breakpoint = 600;
+  static num breakpoint = FluffyThemes.columnWidth * 2;
   @override
   Widget build(BuildContext context) {
-    return MediaQuery.of(context).size.width <= breakpoint ||
-            MediaQuery.of(context).size.height <= breakpoint
+    return MediaQuery.of(context).size.width <= breakpoint
         ? child
         : Material(
             color: Theme.of(context).backgroundColor,
@@ -41,7 +41,7 @@ class OnePageCard extends StatelessWidget {
                 vertical:
                     max((MediaQuery.of(context).size.height - 800) / 2, 12),
               ),
-              child: SafeArea(child: Card(child: child)),
+              child: SafeArea(child: Card(elevation: 1, child: child)),
             ),
           );
   }