diff --git a/lib/entity_widgets/default_entity_container.dart b/lib/entity_widgets/default_entity_container.dart
index 5e9a8ab..5b7b1d1 100644
--- a/lib/entity_widgets/default_entity_container.dart
+++ b/lib/entity_widgets/default_entity_container.dart
@@ -13,7 +13,7 @@ class DefaultEntityContainer extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return SizedBox(
-      height: height,
+      //height: height,
       child: Row(
         children: <Widget>[
           EntityIcon(),
diff --git a/lib/entity_widgets/state/button_state.dart b/lib/entity_widgets/state/button_state.dart
index 4f9acb5..9fea395 100644
--- a/lib/entity_widgets/state/button_state.dart
+++ b/lib/entity_widgets/state/button_state.dart
@@ -9,16 +9,19 @@ class ButtonStateWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final entityModel = EntityModel.of(context);
-    return FlatButton(
-      onPressed: (() {
-        _setNewState(entityModel.entity);
-      }),
-      child: Text(
-        "EXECUTE",
-        textAlign: TextAlign.right,
-        style:
-        new TextStyle(fontSize: Entity.stateFontSize, color: Colors.blue),
-      ),
+    return SizedBox(
+      height: 34.0,
+      child: FlatButton(
+        onPressed: (() {
+          _setNewState(entityModel.entity);
+        }),
+        child: Text(
+          "EXECUTE",
+          textAlign: TextAlign.right,
+          style:
+          new TextStyle(fontSize: Entity.stateFontSize, color: Colors.blue),
+        ),
+      )
     );
   }
 }
\ No newline at end of file
diff --git a/lib/entity_widgets/state/simple_state.dart b/lib/entity_widgets/state/simple_state.dart
index 6acbbae..13f4dc4 100644
--- a/lib/entity_widgets/state/simple_state.dart
+++ b/lib/entity_widgets/state/simple_state.dart
@@ -4,19 +4,21 @@ class SimpleEntityState extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final entityModel = EntityModel.of(context);
-    return Padding(
-        padding: EdgeInsets.fromLTRB(
-            0.0, 0.0, Entity.rightWidgetPadding, 0.0),
-        child: GestureDetector(
-          child: Text(
-              "${entityModel.entity.state}${entityModel.entity.unitOfMeasurement}",
-              textAlign: TextAlign.right,
-              style: new TextStyle(
-                fontSize: Entity.stateFontSize,
-              )),
-          onTap: () => entityModel.handleTap
-              ? eventBus.fire(new ShowEntityPageEvent(entityModel.entity))
-              : null,
-        ));
+    return Expanded(
+      child: Padding(
+          padding: EdgeInsets.fromLTRB(0.0, 0.0, Entity.rightWidgetPadding, 0.0),
+          child: GestureDetector(
+            child: Text(
+                "${entityModel.entity.state}${entityModel.entity.unitOfMeasurement}",
+                textAlign: TextAlign.right,
+                style: new TextStyle(
+                  fontSize: Entity.stateFontSize,
+                )),
+            onTap: () => entityModel.handleTap
+                ? eventBus.fire(new ShowEntityPageEvent(entityModel.entity))
+                : null,
+          )
+      ),
+    );
   }
-}
\ No newline at end of file
+}
diff --git a/lib/entity_widgets/state/switch_state.dart b/lib/entity_widgets/state/switch_state.dart
index 449ecde..641e44a 100644
--- a/lib/entity_widgets/state/switch_state.dart
+++ b/lib/entity_widgets/state/switch_state.dart
@@ -29,15 +29,16 @@ class _SwitchStateWidgetState extends State<SwitchStateWidget> {
   Widget build(BuildContext context) {
     final entityModel = EntityModel.of(context);
     final entity = entityModel.entity;
+    Widget result;
     if ((entity.attributes["assumed_state"] == null) || (entity.attributes["assumed_state"] == false)) {
-      return Switch(
+      result = Switch(
         value: entity.assumedState == 'on',
         onChanged: ((switchState) {
           _setNewState(switchState, entity);
         }),
       );
     } else {
-      return Row(
+      result = Row(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
           IconButton(
@@ -55,6 +56,9 @@ class _SwitchStateWidgetState extends State<SwitchStateWidget> {
         ],
       );
     }
-
+    return SizedBox(
+      height: 32.0,
+      child: result,
+    );
   }
 }
\ No newline at end of file