diff --git a/lib/pages/entity.page.dart b/lib/pages/entity.page.dart
index f9a5c24..253fac7 100644
--- a/lib/pages/entity.page.dart
+++ b/lib/pages/entity.page.dart
@@ -50,8 +50,6 @@ class _EntityViewPageState extends State<EntityViewPage> {
         leading: IconButton(icon: Icon(Icons.arrow_back), onPressed: (){
           Navigator.pop(context);
         }),
-        // Here we take the value from the MyHomePage object that was created by
-        // the App.build method, and use it to set our appbar title.
         title: new Text("${entity.displayName}"),
       ),
       body: body,
diff --git a/lib/plugins/dynamic_multi_column_layout.dart b/lib/plugins/dynamic_multi_column_layout.dart
index 8c00003..b2862a3 100644
--- a/lib/plugins/dynamic_multi_column_layout.dart
+++ b/lib/plugins/dynamic_multi_column_layout.dart
@@ -86,7 +86,11 @@ class RenderCustomLayoutBox extends RenderBox
     int columnsCount;
     List<double> columnXPositions = [];
     List<double> columnYPositions = [];
-    columnsCount = (constraints.maxWidth ~/ this.minColumnWidth);
+    if (constraints.maxWidth < this.minColumnWidth) {
+        columnsCount = 1;
+    } else {
+        columnsCount = (constraints.maxWidth ~/ this.minColumnWidth);
+    }
     if (childCount == 0 || columnsCount == 0) {
       size = constraints.biggest;
       assert(size.isFinite);
diff --git a/pubspec.yaml b/pubspec.yaml
index ecdf20b..94d8c7b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,8 @@
 name: hass_client
 description: Home Assistant Android Client
 
-version: 0.7.1+711
+version: 0.7.1+712
+
 
 environment:
   sdk: ">=2.0.0-dev.68.0 <3.0.0"