diff --git a/lib/entity_widgets/controls/media_player_widgets.dart b/lib/entity_widgets/controls/media_player_widgets.dart
index ec51130..569e7ad 100644
--- a/lib/entity_widgets/controls/media_player_widgets.dart
+++ b/lib/entity_widgets/controls/media_player_widgets.dart
@@ -79,11 +79,13 @@ class MediaPlayerWidget extends StatelessWidget {
         child: Row(
           mainAxisAlignment: MainAxisAlignment.center,
           children: <Widget>[
-            Image(
-              image: CachedNetworkImageProvider("$homeAssistantWebHost${entity.entityPicture}"),
-              height: 240.0,
-              width: 320.0,
-              fit: BoxFit.contain,
+            Flexible(
+              child: Image(
+                image: CachedNetworkImageProvider("$homeAssistantWebHost${entity.entityPicture}"),
+                height: 240.0,
+                //width: 320.0,
+                fit: BoxFit.contain,
+              ),
             )
           ],
         ),
diff --git a/lib/settings.page.dart b/lib/settings.page.dart
index a1d63d5..4747fa3 100644
--- a/lib/settings.page.dart
+++ b/lib/settings.page.dart
@@ -97,6 +97,7 @@ class _ConnectionSettingsPageState extends State<ConnectionSettingsPage> {
         ],
       ),
       body: ListView(
+        scrollDirection: Axis.vertical,
         padding: const EdgeInsets.all(20.0),
         children: <Widget>[
           Text(
@@ -150,8 +151,15 @@ class _ConnectionSettingsPageState extends State<ConnectionSettingsPage> {
             }
           ),
           new Row(
+            mainAxisSize: MainAxisSize.min,
             children: [
-              Text("Login with access token (HA >= 0.78.0)"),
+              Flexible(
+                child: Text(
+                  "Login with access token (HA >= 0.78.0)",
+                  softWrap: true,
+                  maxLines: 2,
+                ),
+              ),
               Switch(
                 value: (_newAuthType == "access_token"),
                 onChanged: (value) {