diff --git a/lib/main.dart b/lib/main.dart
index fc9174d..e59543a 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -75,7 +75,7 @@ part 'ui_widgets/card_header_widget.dart';
 
 EventBus eventBus = new EventBus();
 const String appName = "HA Client";
-const appVersion = "0.3.8 internal build 61";
+const appVersion = "0.3.8 internal build 62";
 
 String homeAssistantWebHost;
 
diff --git a/lib/ui_widgets/media_control_card.dart b/lib/ui_widgets/media_control_card.dart
index edd340c..5f9867c 100644
--- a/lib/ui_widgets/media_control_card.dart
+++ b/lib/ui_widgets/media_control_card.dart
@@ -86,9 +86,14 @@ class MediaControlCardWidget extends StatelessWidget {
     String state = card.linkedEntity.state;
     if (state == null || state == "off" || state == "unavailable" || state == "idle") {
       states.add(Text("${card.linkedEntity.state}", style: style.apply(fontSizeDelta: 4.0),));
-    } else {
-      states.add(Text("${card.linkedEntity.attributes['media_title'] ?? '-'}", style: style.apply(fontSizeDelta: 6.0, fontWeightDelta: 50),));
+    }
+    if (card.linkedEntity.attributes['media_title'] != null) {
+      states.add(Text("${card.linkedEntity.attributes['media_title']}", style: style.apply(fontSizeDelta: 6.0, fontWeightDelta: 50),));
+    }
+    if (card.linkedEntity.attributes['media_content_type'] == "music") {
       states.add(Text("${card.linkedEntity.attributes['media_artist'] ?? card.linkedEntity.attributes['app_name']}", style: style.apply(fontSizeDelta: 4.0),));
+    } else if (card.linkedEntity.attributes['app_name'] != null) {
+      states.add(Text("${card.linkedEntity.attributes['app_name']}", style: style.apply(fontSizeDelta: 4.0),));
     }
     return Padding(
       padding: EdgeInsets.fromLTRB(Entity.leftWidgetPadding, Entity.rowPadding, Entity.rightWidgetPadding, Entity.rowPadding),
@@ -107,7 +112,9 @@ class MediaControlCardWidget extends StatelessWidget {
         children: <Widget>[
           Image(
             image: CachedNetworkImageProvider("$homeAssistantWebHost${card.linkedEntity.entityPicture}"),
-            height: 300.0,
+            height: 240.0,
+            width: 320.0,
+            fit: BoxFit.fitHeight,
           )
         ],
       );
diff --git a/pubspec.yaml b/pubspec.yaml
index bf44760..da5e844 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: hass_client
 description: Home Assistant Android Client
 
-version: 0.3.8+61
+version: 0.3.8+62
 
 environment:
   sdk: ">=2.0.0-dev.68.0 <3.0.0"