diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..b814fc4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,41 @@
+---
+name: Bug report
+about: Create a report to help improve HA Client
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- 
+Please provide as much information as possible.
+ -->
+**HA Client version:** <!-- Main app menu => About HA Client -->
+
+**Home Assistant version:** <!-- 0.94.1 for example -->
+
+**Device name:** <!-- Pixel 2 for example -->
+
+**Android version:** <!-- 8.1 for example -->
+
+**Connection type:** <!-- For example "Local IP" or "Remote UI" or "Own domain"-->
+
+**Login type:** <!-- For example "HA Login" or "Manual token"-->
+
+**Description**
+<!-- 
+Describe your issue here
+-->
+
+**Screenshots**
+<!-- 
+Please provide screenshots if it is a UI issue. Also you can attach screenshot from Home Assistant web UI as an expected result
+-->
+
+**Logs**
+<!-- 
+Right after issue reproduced go to app menu and tap "Log". Copy log with a "Copy" button in the upper-right corner and post it below
+-->
+```
+[Replace this text with your logs] 
+```
diff --git a/.github/ISSUE_TEMPLATE/entity-support-request.md b/.github/ISSUE_TEMPLATE/entity-support-request.md
new file mode 100644
index 0000000..c529d38
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/entity-support-request.md
@@ -0,0 +1,12 @@
+---
+name: Entity support request
+about: Suggest to add support of any entity type
+title: ''
+labels: ENTITY, feature/improvement
+assignees: ''
+
+---
+
+**Entity type:**
+
+**Link to documentation:**
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..29b288f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for HA Client if it is not a card or entity support
+title: ''
+labels: feature/improvement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/lovelace-card-support-request.md b/.github/ISSUE_TEMPLATE/lovelace-card-support-request.md
new file mode 100644
index 0000000..998fabf
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/lovelace-card-support-request.md
@@ -0,0 +1,12 @@
+---
+name: Lovelace Card support request
+about: Suggest to add any Lovelace card support
+title: ''
+labels: CARD, feature/improvement
+assignees: ''
+
+---
+
+**Card name:**
+
+**Link to card repository or web page:**
diff --git a/.github/no-response.yml b/.github/no-response.yml
new file mode 100644
index 0000000..e0e8617
--- /dev/null
+++ b/.github/no-response.yml
@@ -0,0 +1,11 @@
+# Configuration for probot-no-response - https://github.com/probot/no-response
+
+# Number of days of inactivity before an Issue is closed for lack of response
+daysUntilClose: 14
+# Label requiring a response
+responseRequiredLabel: more info needed
+# Comment to post when closing an Issue for lack of response. Set to `false` to disable
+closeComment: >
+  This issue has been automatically closed because there has been no response
+  to our request for more information from the original author. If the issue still relevant
+  feel free to reopen this issue and add more information, or report a new one. 
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 43fa34a..6a160c4 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.keyboardcrumbs.hassclient">
 
+    <uses-feature android:name="android.hardware.touchscreen"
+        android:required="false" />
+
     <!-- The INTERNET permission is required for development. Specifically,
          flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/ios/Flutter/flutter_export_environment.sh b/ios/Flutter/flutter_export_environment.sh
new file mode 100755
index 0000000..b7ea8ef
--- /dev/null
+++ b/ios/Flutter/flutter_export_environment.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+# This is a generated file; do not edit or check into version control.
+export "FLUTTER_ROOT=/home/estevez/sdk/flutter"
+export "FLUTTER_APPLICATION_PATH=/home/estevez/src/ha_client"
+export "FLUTTER_TARGET=lib/main.dart"
+export "FLUTTER_BUILD_DIR=build"
+export "SYMROOT=${SOURCE_ROOT}/../build/ios"
+export "FLUTTER_FRAMEWORK_DIR=/home/estevez/sdk/flutter/bin/cache/artifacts/engine/ios"
+export "FLUTTER_BUILD_NAME=0.6.6"
+export "FLUTTER_BUILD_NUMBER=660"
diff --git a/lib/cards/card_widget.dart b/lib/cards/card_widget.dart
index dcfe9a1..8911301 100644
--- a/lib/cards/card_widget.dart
+++ b/lib/cards/card_widget.dart
@@ -192,7 +192,7 @@ class CardWidget extends StatelessWidget {
                     alignment: Alignment.centerRight,
                     icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
                         "mdi:dots-vertical")),
-                    onPressed: () => eventBus.fire(new ShowEntityPageEvent(card.linkedEntityWrapper.entity))
+                    onPressed: () => eventBus.fire(new ShowEntityPageEvent(entity: card.linkedEntityWrapper.entity))
                 )
             )
           ]
diff --git a/lib/const.dart b/lib/const.dart
index 6e7c99e..57012b9 100644
--- a/lib/const.dart
+++ b/lib/const.dart
@@ -113,4 +113,8 @@ class Sizes {
   static const inputWidth = 160.0;
   static const rowPadding = 10.0;
   static const doubleRowPadding = rowPadding*2;
+  static const minViewColumnWidth = 350;
+  static const entityPageMaxWidth = 400.0;
+  static const mainPageScreenSeparatorWidth = 5.0;
+  static const tabletMinWidth = minViewColumnWidth + entityPageMaxWidth + 5;
 }
\ No newline at end of file
diff --git a/lib/entity_widgets/common/badge.dart b/lib/entities/badge.widget.dart
similarity index 97%
rename from lib/entity_widgets/common/badge.dart
rename to lib/entities/badge.widget.dart
index 32080cf..0643f15 100644
--- a/lib/entity_widgets/common/badge.dart
+++ b/lib/entities/badge.widget.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../main.dart';
 
 class BadgeWidget extends StatelessWidget {
   @override
@@ -140,6 +140,6 @@ class BadgeWidget extends StatelessWidget {
           ],
         ),
         onTap: () =>
-            eventBus.fire(new ShowEntityPageEvent(entityModel.entityWrapper.entity)));
+            eventBus.fire(new ShowEntityPageEvent(entity: entityModel.entityWrapper.entity)));
   }
 }
\ No newline at end of file
diff --git a/lib/entity_widgets/common/camera_stream_view.dart b/lib/entities/camera/widgets/camera_stream_view.dart
similarity index 97%
rename from lib/entity_widgets/common/camera_stream_view.dart
rename to lib/entities/camera/widgets/camera_stream_view.dart
index 4e62a6e..9300100 100644
--- a/lib/entity_widgets/common/camera_stream_view.dart
+++ b/lib/entities/camera/widgets/camera_stream_view.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class CameraStreamView extends StatefulWidget {
 
diff --git a/lib/entity_widgets/common/mode_selector.dart b/lib/entities/climate/widgets/mode_selector.dart
similarity index 98%
rename from lib/entity_widgets/common/mode_selector.dart
rename to lib/entities/climate/widgets/mode_selector.dart
index 365933f..d77f130 100644
--- a/lib/entity_widgets/common/mode_selector.dart
+++ b/lib/entities/climate/widgets/mode_selector.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class ModeSelectorWidget extends StatelessWidget {
 
diff --git a/lib/entity_widgets/common/mode_swicth.dart b/lib/entities/climate/widgets/mode_swicth.dart
similarity index 97%
rename from lib/entity_widgets/common/mode_swicth.dart
rename to lib/entities/climate/widgets/mode_swicth.dart
index d34ca3e..9051fd9 100644
--- a/lib/entity_widgets/common/mode_swicth.dart
+++ b/lib/entities/climate/widgets/mode_swicth.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class ModeSwitchWidget extends StatelessWidget {
 
diff --git a/lib/entity_widgets/default_entity_container.dart b/lib/entities/default_entity_container.widget.dart
similarity index 100%
rename from lib/entity_widgets/default_entity_container.dart
rename to lib/entities/default_entity_container.widget.dart
diff --git a/lib/entities/entity.class.dart b/lib/entities/entity.class.dart
index c7e0576..2f335d8 100644
--- a/lib/entities/entity.class.dart
+++ b/lib/entities/entity.class.dart
@@ -211,31 +211,6 @@ class Entity {
     );
   }
 
-  Widget buildEntityPageWidget(BuildContext context) {
-    return EntityModel(
-      entityWrapper: EntityWrapper(entity: this),
-      child: EntityPageContainer(children: <Widget>[
-        Padding(
-          padding: EdgeInsets.only(top: Sizes.rowPadding, left: Sizes.leftWidgetPadding),
-          child: DefaultEntityContainer(state: _buildStatePartForPage(context)),
-        ),
-        LastUpdatedWidget(),
-        Divider(),
-        _buildAdditionalControlsForPage(context),
-        Divider(),
-        buildHistoryWidget(),
-        EntityAttributesList()
-      ]),
-      handleTap: false,
-    );
-  }
-
-  Widget buildHistoryWidget() {
-    return EntityHistoryWidget(
-      config: historyConfig,
-    );
-  }
-
   Widget buildBadgeWidget(BuildContext context) {
     return EntityModel(
       entityWrapper: EntityWrapper(entity: this),
diff --git a/lib/entity_widgets/entity_colors.class.dart b/lib/entities/entity_colors.class.dart
similarity index 100%
rename from lib/entity_widgets/entity_colors.class.dart
rename to lib/entities/entity_colors.class.dart
diff --git a/lib/entity_widgets/entity_icon.dart b/lib/entities/entity_icon.widget.dart
similarity index 100%
rename from lib/entity_widgets/entity_icon.dart
rename to lib/entities/entity_icon.widget.dart
diff --git a/lib/entity_widgets/model_widgets.dart b/lib/entities/entity_model.widget.dart
similarity index 100%
rename from lib/entity_widgets/model_widgets.dart
rename to lib/entities/entity_model.widget.dart
diff --git a/lib/entity_widgets/entity_name.dart b/lib/entities/entity_name.widget.dart
similarity index 100%
rename from lib/entity_widgets/entity_name.dart
rename to lib/entities/entity_name.widget.dart
diff --git a/lib/entities/entity_page_layout.widget.dart b/lib/entities/entity_page_layout.widget.dart
new file mode 100644
index 0000000..7d7325b
--- /dev/null
+++ b/lib/entities/entity_page_layout.widget.dart
@@ -0,0 +1,70 @@
+part of '../main.dart';
+
+class EntityPageLayout extends StatelessWidget {
+
+  final bool showClose;
+  final Entity entity;
+
+  EntityPageLayout({Key key, this.showClose: false, this.entity}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return EntityModel(
+      entityWrapper: EntityWrapper(entity: entity),
+      child: ListView(
+          padding: EdgeInsets.all(0),
+          children: <Widget>[
+            showClose ?
+            Container(
+              color: Colors.blue[300],
+              height: 36,
+              child: Row(
+                children: <Widget>[
+                  Expanded(
+                    child: Padding(
+                      padding: EdgeInsets.only(left: 8),
+                      child: Text(
+                        entity.displayName,
+                        style: TextStyle(
+                            fontWeight: FontWeight.bold,
+                            color: Colors.white,
+                            fontSize: 22
+                        ),
+                      ),
+                    ),
+                  ),
+                  IconButton(
+                    padding: EdgeInsets.all(0),
+                    icon: Icon(Icons.close),
+                    color: Colors.white,
+                    iconSize: 30.0,
+                    onPressed: () {
+                      eventBus.fire(ShowEntityPageEvent());
+                    },
+                  )
+                ],
+              ),
+            ) :
+            Container(height: 0, width: 0,),
+            Padding(
+              padding: EdgeInsets.only(top: Sizes.rowPadding, left: Sizes.leftWidgetPadding),
+              child: DefaultEntityContainer(state: entity._buildStatePartForPage(context)),
+            ),
+            LastUpdatedWidget(),
+            Divider(),
+            entity._buildAdditionalControlsForPage(context),
+            Divider(),
+            SpoilerCard(
+              title: "State history",
+              body: EntityHistoryWidget(),
+            ),
+            SpoilerCard(
+              title: "Attributes",
+              body: EntityAttributesList(),
+            ),
+          ]
+      ),
+      handleTap: false,
+    );
+  }
+}
\ No newline at end of file
diff --git a/lib/entities/entity_wrapper.class.dart b/lib/entities/entity_wrapper.class.dart
index ec9bc21..d1fe9bc 100644
--- a/lib/entities/entity_wrapper.class.dart
+++ b/lib/entities/entity_wrapper.class.dart
@@ -53,7 +53,7 @@ class EntityWrapper {
 
       case EntityUIAction.moreInfo: {
         eventBus.fire(
-            new ShowEntityPageEvent(entity));
+            new ShowEntityPageEvent(entity: entity));
         break;
       }
 
@@ -93,7 +93,7 @@ class EntityWrapper {
 
         case EntityUIAction.moreInfo: {
           eventBus.fire(
-              new ShowEntityPageEvent(entity));
+              new ShowEntityPageEvent(entity: entity));
           break;
         }
 
diff --git a/lib/entity_widgets/common/flat_service_button.dart b/lib/entities/flat_service_button.widget.dart
similarity index 97%
rename from lib/entity_widgets/common/flat_service_button.dart
rename to lib/entities/flat_service_button.widget.dart
index 405d6a1..6dc4612 100644
--- a/lib/entity_widgets/common/flat_service_button.dart
+++ b/lib/entities/flat_service_button.widget.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../main.dart';
 
 class FlatServiceButton extends StatelessWidget {
 
diff --git a/lib/entity_widgets/common/light_color_picker.dart b/lib/entities/light/widgets/light_color_picker.dart
similarity index 96%
rename from lib/entity_widgets/common/light_color_picker.dart
rename to lib/entities/light/widgets/light_color_picker.dart
index f3052f3..4d53aef 100644
--- a/lib/entity_widgets/common/light_color_picker.dart
+++ b/lib/entities/light/widgets/light_color_picker.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class LightColorPicker extends StatefulWidget {
 
@@ -27,7 +27,6 @@ class LightColorPickerState extends State<LightColorPicker> {
     List<Widget> colorRows = [];
     Border border;
     bool isSomethingSelected = false;
-    Logger.d("Current colotfor picker: [${widget.color.hue}, ${widget.color.saturation}]");
     for (double saturation = 1.0; saturation >= (0.0 + widget.saturationStep); saturation = double.parse((saturation - widget.saturationStep).toStringAsFixed(2))) {
       List<Widget> rowChildren = [];
       //Logger.d("$saturation");
diff --git a/lib/entities/media_player/media_player_entity.class.dart b/lib/entities/media_player/media_player_entity.class.dart
index ee02445..6e26393 100644
--- a/lib/entities/media_player/media_player_entity.class.dart
+++ b/lib/entities/media_player/media_player_entity.class.dart
@@ -74,10 +74,37 @@ class MediaPlayerEntity extends Entity {
 
   List<String> get soundModeList => getStringListAttributeValue("sound_mode_list");
   List<String> get sourceList => getStringListAttributeValue("source_list");
+  DateTime get positionLastUpdated => DateTime.tryParse("${attributes["media_position_updated_at"]}")?.toLocal();
+  int get durationSeconds => _getIntAttributeValue("media_duration");
+  int get positionSeconds => _getIntAttributeValue("media_position");
 
   @override
   Widget _buildAdditionalControlsForPage(BuildContext context) {
     return MediaPlayerControls();
   }
 
+  bool canCalculateActualPosition() {
+    return positionLastUpdated != null && durationSeconds != null && positionSeconds != null;
+  }
+
+  double getActualPosition() {
+    double result = 0;
+    if (canCalculateActualPosition()) {
+      Duration durationD;
+      Duration positionD;
+      durationD = Duration(seconds: durationSeconds);
+      positionD = Duration(
+          seconds: positionSeconds);
+      result = positionD.inSeconds.toDouble();
+      int differenceInSeconds = DateTime
+          .now()
+          .difference(positionLastUpdated)
+          .inSeconds;
+      result = ((result + differenceInSeconds) <= durationD.inSeconds) ? (result + differenceInSeconds) : durationD.inSeconds.toDouble();
+    }
+
+    return result;
+
+  }
+
 }
\ No newline at end of file
diff --git a/lib/entities/media_player/widgets/media_player_progress_bar.widget.dart b/lib/entities/media_player/widgets/media_player_progress_bar.widget.dart
new file mode 100644
index 0000000..a59e002
--- /dev/null
+++ b/lib/entities/media_player/widgets/media_player_progress_bar.widget.dart
@@ -0,0 +1,46 @@
+part of '../../../main.dart';
+
+class MediaPlayerProgressBar extends StatefulWidget {
+  @override
+  _MediaPlayerProgressBarState createState() => _MediaPlayerProgressBarState();
+}
+
+class _MediaPlayerProgressBarState extends State<MediaPlayerProgressBar> {
+
+  Timer _timer;
+
+  @override
+  initState() {
+    super.initState();
+    _timer = Timer.periodic(Duration(seconds: 1), (_) {
+      setState(() {
+      });
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final EntityModel entityModel = EntityModel.of(context);
+    final MediaPlayerEntity entity = entityModel.entityWrapper.entity;
+    double progress;
+    int currentPosition;
+    if (entity.canCalculateActualPosition()) {
+      currentPosition = entity.getActualPosition().toInt();
+      progress = (currentPosition <= entity.durationSeconds) ? currentPosition / entity.durationSeconds : 100;
+    } else {
+      progress = 0;
+    }
+    return LinearProgressIndicator(
+      value: progress,
+      backgroundColor: Colors.black45,
+      valueColor: AlwaysStoppedAnimation<Color>(EntityColor.stateColor(EntityState.on)),
+    );
+  }
+
+  @override
+  void dispose() {
+    _timer?.cancel();
+    super.dispose();
+  }
+
+}
\ No newline at end of file
diff --git a/lib/entities/media_player/widgets/media_player_seek_bar.widget.dart b/lib/entities/media_player/widgets/media_player_seek_bar.widget.dart
new file mode 100644
index 0000000..768a57e
--- /dev/null
+++ b/lib/entities/media_player/widgets/media_player_seek_bar.widget.dart
@@ -0,0 +1,135 @@
+part of '../../../main.dart';
+
+class MediaPlayerSeekBar extends StatefulWidget {
+  @override
+  _MediaPlayerSeekBarState createState() => _MediaPlayerSeekBarState();
+}
+
+class _MediaPlayerSeekBarState extends State<MediaPlayerSeekBar> {
+
+  Timer _timer;
+  bool _seekStarted = false;
+  bool _changedHere = false;
+  double _currentPosition = 0;
+  int _savedPosition = 0;
+
+  final TextStyle _seekTextStyle = TextStyle(
+      fontSize: 20,
+      color: Colors.blue,
+      fontWeight: FontWeight.bold
+  );
+
+  @override
+  initState() {
+    super.initState();
+    _timer = Timer.periodic(Duration(seconds: 1), (_) {
+      if (!_seekStarted && !_changedHere) {
+        setState(() {});
+      }
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final EntityModel entityModel = EntityModel.of(context);
+    final MediaPlayerEntity entity = entityModel.entityWrapper.entity;
+
+    if (entity.canCalculateActualPosition()) {
+      if (HomeAssistant().sendToPlayerId == entity.entityId  && HomeAssistant().savedPlayerPosition != null) {
+        _savedPosition = HomeAssistant().savedPlayerPosition;
+        HomeAssistant().savedPlayerPosition = null;
+        HomeAssistant().sendToPlayerId = null;
+      }
+      if (entity.state == EntityState.playing && !_seekStarted &&
+          !_changedHere) {
+        _currentPosition = entity.getActualPosition();
+      } else if (_changedHere) {
+        _changedHere = false;
+      }
+      List<Widget> buttons = [];
+      if (_savedPosition > 0) {
+        buttons.add(
+            RaisedButton(
+              child: Text("Jump to ${Duration(seconds: _savedPosition).toString().split('.')[0]}"),
+              color: Colors.orange,
+              focusColor: Colors.white,
+              onPressed: () {
+                eventBus.fire(ServiceCallEvent(
+                    "media_player",
+                    "media_seek",
+                    "${entity.entityId}",
+                    {"seek_position": _savedPosition}
+                ));
+                setState(() {
+                  _savedPosition = 0;
+                });
+              },
+            )
+        );
+      }
+      return Padding(
+        padding: EdgeInsets.fromLTRB(Sizes.leftWidgetPadding, 20, Sizes.rightWidgetPadding, 0),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: <Widget>[
+            Row(
+              mainAxisSize: MainAxisSize.max,
+              children: <Widget>[
+                Text("00:00"),
+                Expanded(
+                  child: Text("${Duration(seconds: _currentPosition.toInt()).toString().split(".")[0]}",textAlign: TextAlign.center, style: _seekTextStyle),
+                ),
+                Text("${Duration(seconds: entity.durationSeconds).toString().split(".")[0]}")
+              ],
+            ),
+            Container(height: 10,),
+            Slider(
+              min: 0,
+              activeColor: Colors.amber,
+              inactiveColor: Colors.black26,
+              max: entity.durationSeconds.toDouble(),
+              value: _currentPosition,
+              onChangeStart: (val) {
+                _seekStarted = true;
+              },
+              onChanged: (val) {
+                setState(() {
+                  _currentPosition = val;
+                });
+              },
+              onChangeEnd: (val) {
+                _seekStarted = false;
+                Timer(Duration(milliseconds: 500), () {
+                  if (!_seekStarted) {
+                    eventBus.fire(ServiceCallEvent(
+                        "media_player",
+                        "media_seek",
+                        "${entity.entityId}",
+                        {"seek_position": val}
+                    ));
+                    setState(() {
+                      _changedHere = true;
+                      _currentPosition = val;
+                    });
+                  }
+                });
+              },
+            ),
+            ButtonBar(
+              children: buttons,
+            )
+          ],
+        ),
+      );
+    } else {
+      return Container(width: 0, height: 0,);
+    }
+  }
+
+  @override
+  void dispose() {
+    _timer?.cancel();
+    super.dispose();
+  }
+
+}
\ No newline at end of file
diff --git a/lib/entities/media_player/widgets/media_player_widgets.dart b/lib/entities/media_player/widgets/media_player_widgets.dart
index bd93b4e..bb20bde 100644
--- a/lib/entities/media_player/widgets/media_player_widgets.dart
+++ b/lib/entities/media_player/widgets/media_player_widgets.dart
@@ -26,7 +26,7 @@ class MediaPlayerWidget extends StatelessWidget {
                 bottom: 0.0,
                 left: 0.0,
                 right: 0.0,
-                child: MediaPlayerProgressWidget()
+                child: MediaPlayerProgressBar()
             )
           ],
         ),
@@ -229,7 +229,7 @@ class MediaPlayerPlaybackControls extends StatelessWidget {
           IconButton(
               icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
                   "mdi:dots-vertical")),
-              onPressed: () => eventBus.fire(new ShowEntityPageEvent(entity))
+              onPressed: () => eventBus.fire(new ShowEntityPageEvent(entity: entity))
           )
       );
     } else if (entity.supportStop && entity.state != EntityState.off && entity.state != EntityState.unavailable) {
@@ -305,6 +305,11 @@ class _MediaPlayerControlsState extends State<MediaPlayerControls> {
       )
     ];
     if (entity.state != EntityState.off && entity.state != EntityState.unknown && entity.state != EntityState.unavailable) {
+      if (entity.supportSeek) {
+        children.add(MediaPlayerSeekBar());
+      } else {
+        children.add(MediaPlayerProgressBar());
+      }
       Widget muteWidget;
       Widget volumeStepWidget;
       if (entity.supportVolumeMute  || entity.attributes["is_volume_muted"] != null) {
@@ -398,6 +403,24 @@ class _MediaPlayerControlsState extends State<MediaPlayerControls> {
             )
         );
       }
+      children.add(
+        ButtonBar(
+          children: <Widget>[
+            RaisedButton(
+              child: Text("Duplicate to"),
+              color: Colors.blue,
+              textColor: Colors.white,
+              onPressed: () => _duplicateTo(entity),
+            ),
+            RaisedButton(
+              child: Text("Switch to"),
+              color: Colors.blue,
+              textColor: Colors.white,
+              onPressed: () => _switchTo(entity),
+            )
+          ],
+        )
+      );
 
     }
     return Column(
@@ -405,62 +428,21 @@ class _MediaPlayerControlsState extends State<MediaPlayerControls> {
     );
   }
 
-}
-
-class MediaPlayerProgressWidget extends StatefulWidget {
-  @override
-  _MediaPlayerProgressWidgetState createState() => _MediaPlayerProgressWidgetState();
-}
-
-class _MediaPlayerProgressWidgetState extends State<MediaPlayerProgressWidget> {
-
-  Timer _timer;
-
-  @override
-  Widget build(BuildContext context) {
-    final EntityModel entityModel = EntityModel.of(context);
-    final MediaPlayerEntity entity = entityModel.entityWrapper.entity;
-    double progress;
-    try {
-      DateTime lastUpdated = DateTime.parse(
-          entity.attributes["media_position_updated_at"]).toLocal();
-      Duration duration = Duration(seconds: entity._getIntAttributeValue("media_duration") ?? 1);
-      Duration position = Duration(seconds: entity._getIntAttributeValue("media_position") ?? 0);
-      int currentPosition = position.inSeconds;
-      if (entity.state == EntityState.playing) {
-        _timer?.cancel();
-        _timer = Timer(Duration(seconds: 1), () {
-          setState(() {
-          });
-        });
-        int differenceInSeconds = DateTime
-            .now()
-            .difference(lastUpdated)
-            .inSeconds;
-        currentPosition = currentPosition + differenceInSeconds;
-      } else {
-        _timer?.cancel();
-      }
-      progress = currentPosition / duration.inSeconds;
-      return LinearProgressIndicator(
-        value: progress,
-        backgroundColor: Colors.black45,
-        valueColor: AlwaysStoppedAnimation<Color>(EntityColor.stateColor(EntityState.on)),
-      );
-    } catch (e) {
-      _timer?.cancel();
-      progress = 0.0;
+  void _duplicateTo(entity) {
+    HomeAssistant().savedPlayerPosition = entity.getActualPosition().toInt();
+    if (MediaQuery.of(context).size.width < Sizes.tabletMinWidth) {
+      Navigator.of(context).popAndPushNamed("/play-media", arguments: {"url": entity.attributes["media_content_id"], "type": entity.attributes["media_content_type"]});
+    } else {
+      Navigator.of(context).pushNamed("/play-media", arguments: {
+        "url": entity.attributes["media_content_id"],
+        "type": entity.attributes["media_content_type"]
+      });
     }
-    return LinearProgressIndicator(
-      value: progress,
-      backgroundColor: Colors.black45,
-    );
   }
 
-  @override
-  void dispose() {
-    _timer?.cancel();
-    super.dispose();
+  void _switchTo(entity) {
+    HomeAssistant().sendFromPlayerId = entity.enityId;
+    _duplicateTo(entity);
   }
 
 }
\ No newline at end of file
diff --git a/lib/entity_widgets/missed_entity.dart b/lib/entities/missed_entity.widget.dart
similarity index 100%
rename from lib/entity_widgets/missed_entity.dart
rename to lib/entities/missed_entity.widget.dart
diff --git a/lib/entity_widgets/common/simple_state.dart b/lib/entities/simple_state.widget.dart
similarity index 98%
rename from lib/entity_widgets/common/simple_state.dart
rename to lib/entities/simple_state.widget.dart
index eb68ec4..47ffe36 100644
--- a/lib/entity_widgets/common/simple_state.dart
+++ b/lib/entities/simple_state.widget.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../main.dart';
 
 class SimpleEntityState extends StatelessWidget {
 
diff --git a/lib/entity_widgets/common/universal_slider.dart b/lib/entities/universal_slider.widget.dart
similarity index 98%
rename from lib/entity_widgets/common/universal_slider.dart
rename to lib/entities/universal_slider.widget.dart
index 3ce9739..cc17104 100644
--- a/lib/entity_widgets/common/universal_slider.dart
+++ b/lib/entities/universal_slider.widget.dart
@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../main.dart';
 
 class UniversalSlider extends StatelessWidget {
 
diff --git a/lib/entity_collection.class.dart b/lib/entity_collection.class.dart
index 2ca6a56..034b991 100644
--- a/lib/entity_collection.class.dart
+++ b/lib/entity_collection.class.dart
@@ -149,15 +149,11 @@ class EntityCollection {
     return _allEntities[entityId] != null;
   }
 
-  List<Entity> getByDomains(List<String> domains) {
-    List<Entity> result = [];
-    _allEntities.forEach((id, entity) {
-      if (domains.contains(entity.domain)) {
-        Logger.d("getByDomain: ${entity.isHidden}");
-        result.add(entity);
-      }
-    });
-    return result;
+  List<Entity> getByDomains({List<String> domains, List<String> stateFiler}) {
+    return _allEntities.values.where((entity) {
+      return domains.contains(entity.domain) &&
+          ((stateFiler != null && stateFiler.contains(entity.state)) || stateFiler == null);
+    }).toList();
   }
 
   List<Entity> filterEntitiesForDefaultView() {
diff --git a/lib/entity_widgets/entity_page_container.dart b/lib/entity_widgets/entity_page_container.dart
deleted file mode 100644
index 2b09eff..0000000
--- a/lib/entity_widgets/entity_page_container.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-part of '../main.dart';
-
-class EntityPageContainer extends StatelessWidget {
-  EntityPageContainer({Key key, @required this.children}) : super(key: key);
-
-  final List<Widget> children;
-
-  @override
-  Widget build(BuildContext context) {
-    return ListView(
-      children: children,
-    );
-  }
-}
\ No newline at end of file
diff --git a/lib/home_assistant.class.dart b/lib/home_assistant.class.dart
index b0b80a9..e2efd6c 100644
--- a/lib/home_assistant.class.dart
+++ b/lib/home_assistant.class.dart
@@ -14,6 +14,9 @@ class HomeAssistant {
   Map services;
   String _userName;
   HSVColor savedColor;
+  int savedPlayerPosition;
+  String sendToPlayerId;
+  String sendFromPlayerId;
 
   String fcmToken;
 
diff --git a/lib/main.dart b/lib/main.dart
index 57b3e8a..b83bf12 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -25,6 +25,8 @@ import 'package:in_app_purchase/in_app_purchase.dart';
 import 'plugins/circular_slider/single_circular_slider.dart';
 import 'package:share/receive_share_state.dart';
 import 'package:share/share.dart';
+import 'plugins/dynamic_multi_column_layout.dart';
+import 'plugins/spoiler_card.dart';
 
 import 'utils/logger.dart';
 
@@ -51,35 +53,34 @@ part 'entities/fan/fan_entity.class.dart';
 part 'entities/automation/automation_entity.class.dart';
 part 'entities/camera/camera_entity.class.dart';
 part 'entities/alarm_control_panel/alarm_control_panel_entity.class.dart';
-part 'entity_widgets/common/badge.dart';
-part 'entity_widgets/model_widgets.dart';
-part 'entity_widgets/default_entity_container.dart';
-part 'entity_widgets/missed_entity.dart';
+part 'entities/badge.widget.dart';
+part 'entities/entity_model.widget.dart';
+part 'entities/default_entity_container.widget.dart';
+part 'entities/missed_entity.widget.dart';
 part 'cards/widgets/glance_card_entity_container.dart';
 part 'cards/widgets/entity_button_card_body.widget.dart';
-part 'entity_widgets/common/entity_attributes_list.dart';
-part 'entity_widgets/entity_icon.dart';
-part 'entity_widgets/entity_name.dart';
-part 'entity_widgets/common/last_updated.dart';
-part 'entity_widgets/common/mode_swicth.dart';
-part 'entity_widgets/common/mode_selector.dart';
-part 'entity_widgets/common/universal_slider.dart';
-part 'entity_widgets/common/flat_service_button.dart';
-part 'entity_widgets/common/light_color_picker.dart';
-part 'entity_widgets/common/camera_stream_view.dart';
-part 'entity_widgets/entity_colors.class.dart';
-part 'entity_widgets/entity_page_container.dart';
-part 'entity_widgets/history_chart/entity_history.dart';
-part 'entity_widgets/history_chart/simple_state_history_chart.dart';
-part 'entity_widgets/history_chart/numeric_state_history_chart.dart';
-part 'entity_widgets/history_chart/combined_history_chart.dart';
-part 'entity_widgets/history_chart/history_control_widget.dart';
-part 'entity_widgets/history_chart/entity_history_moment.dart';
+part 'pages/widgets/entity_attributes_list.dart';
+part 'entities/entity_icon.widget.dart';
+part 'entities/entity_name.widget.dart';
+part 'pages/widgets/last_updated.dart';
+part 'entities/climate/widgets/mode_swicth.dart';
+part 'entities/climate/widgets/mode_selector.dart';
+part 'entities/universal_slider.widget.dart';
+part 'entities/flat_service_button.widget.dart';
+part 'entities/light/widgets/light_color_picker.dart';
+part 'entities/camera/widgets/camera_stream_view.dart';
+part 'entities/entity_colors.class.dart';
+part 'plugins/history_chart/entity_history.dart';
+part 'plugins/history_chart/simple_state_history_chart.dart';
+part 'plugins/history_chart/numeric_state_history_chart.dart';
+part 'plugins/history_chart/combined_history_chart.dart';
+part 'plugins/history_chart/history_control_widget.dart';
+part 'plugins/history_chart/entity_history_moment.dart';
 part 'entities/switch/widget/switch_state.dart';
 part 'entities/slider/widgets/slider_controls.dart';
 part 'entities/text/widgets/text_input_state.dart';
 part 'entities/select/widgets/select_state.dart';
-part 'entity_widgets/common/simple_state.dart';
+part 'entities/simple_state.widget.dart';
 part 'entities/timer/widgets/timer_state.dart';
 part 'entities/climate/widgets/climate_state.widget.dart';
 part 'entities/cover/widgets/cover_state.dart';
@@ -102,7 +103,7 @@ part 'pages/main.page.dart';
 part 'home_assistant.class.dart';
 part 'pages/log.page.dart';
 part 'pages/entity.page.dart';
-part 'mdi.class.dart';
+part 'utils/mdi.class.dart';
 part 'entity_collection.class.dart';
 part 'managers/auth_manager.class.dart';
 part 'managers/location_manager.class.dart';
@@ -114,7 +115,7 @@ part 'ui.dart';
 part 'view.class.dart';
 part 'cards/card.class.dart';
 part 'panels/panel_class.dart';
-part 'view.dart';
+part 'viewWidget.widget.dart';
 part 'cards/card_widget.dart';
 part 'cards/widgets/card_header.widget.dart';
 part 'panels/config_panel_widget.dart';
@@ -124,13 +125,18 @@ part 'types/event_bus_events.dart';
 part 'cards/widgets/gauge_card_body.dart';
 part 'cards/widgets/light_card_body.dart';
 part 'pages/play_media.page.dart';
-
+part 'entities/entity_page_layout.widget.dart';
+part 'entities/media_player/widgets/media_player_seek_bar.widget.dart';
+part 'entities/media_player/widgets/media_player_progress_bar.widget.dart';
+part 'pages/whats_new.page.dart';
 
 EventBus eventBus = new EventBus();
 final FirebaseMessaging _firebaseMessaging = FirebaseMessaging();
 FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = new FlutterLocalNotificationsPlugin();
 const String appName = "HA Client";
-const appVersion = "0.6.7";
+const appVersionNumber = "0.6.8";
+const appVersionAdd = "alpha1";
+const appVersion = "$appVersionNumber-$appVersionAdd";
 
 void main() async {
   FlutterError.onError = (errorDetails) {
@@ -170,8 +176,12 @@ class HAClientApp extends StatelessWidget {
         "/": (context) => MainPage(title: 'HA Client'),
         "/connection-settings": (context) => ConnectionSettingsPage(title: "Settings"),
         "/putchase": (context) => PurchasePage(title: "Support app development"),
-        "/play-media": (context) => PlayMediaPage(mediaUrl: "${ModalRoute.of(context).settings.arguments != null ? (ModalRoute.of(context).settings.arguments as Map)['url'] : ''}",),
+        "/play-media": (context) => PlayMediaPage(
+          mediaUrl: "${ModalRoute.of(context).settings.arguments != null ? (ModalRoute.of(context).settings.arguments as Map)['url'] : ''}",
+          mediaType: "${ModalRoute.of(context).settings.arguments != null ? (ModalRoute.of(context).settings.arguments as Map)['type'] ?? '' : ''}",
+        ),
         "/log-view": (context) => LogViewPage(title: "Log"),
+        "/whats-new": (context) => WhatsNewPage(),
         "/login": (context) => WebviewScaffold(
           url: "${ConnectionManager().oauthUrl}",
           appBar: new AppBar(
diff --git a/lib/managers/connection_manager.class.dart b/lib/managers/connection_manager.class.dart
index 3013fc4..063fe86 100644
--- a/lib/managers/connection_manager.class.dart
+++ b/lib/managers/connection_manager.class.dart
@@ -186,16 +186,16 @@ class ConnectionManager {
   _handleMessage(data) {
     if (data["type"] == "result") {
       if (data["id"] != null && data["success"]) {
-        Logger.d("[Received] <== Request id ${data['id']} was successful");
+        //Logger.d("[Received] <== Request id ${data['id']} was successful");
         _messageResolver["${data["id"]}"]?.complete(data["result"]);
       } else if (data["id"] != null) {
-        Logger.e("[Received] <== Error received on request id ${data['id']}: ${data['error']}");
+        //Logger.e("[Received] <== Error received on request id ${data['id']}: ${data['error']}");
         _messageResolver["${data["id"]}"]?.completeError("${data['error']["message"]}");
       }
       _messageResolver.remove("${data["id"]}");
     } else if (data["type"] == "event") {
       if ((data["event"] != null) && (data["event"]["event_type"] == "state_changed")) {
-        Logger.d("[Received] <== ${data['type']}.${data["event"]["event_type"]}: ${data["event"]["data"]["entity_id"]}");
+        //Logger.d("[Received] <== ${data['type']}.${data["event"]["event_type"]}: ${data["event"]["data"]["entity_id"]}");
         onStateChangeCallback(data["event"]["data"]);
       } else if (data["event"] != null) {
         Logger.w("Unhandled event type: ${data["event"]["event_type"]}");
@@ -349,6 +349,7 @@ class ConnectionManager {
   }
 
   Future callService({String domain, String service, String entityId, Map additionalServiceData}) {
+    Completer completer = Completer();
     Map serviceData = {};
     if (entityId != null) {
       serviceData["entity_id"] = entityId;
@@ -357,9 +358,17 @@ class ConnectionManager {
       serviceData.addAll(additionalServiceData);
     }
     if (serviceData.isNotEmpty)
-      return sendSocketMessage(type: "call_service", additionalData: {"domain": domain, "service": service, "service_data": serviceData});
+      sendHTTPPost(
+        endPoint: "/api/services/$domain/$service",
+        data: json.encode(serviceData)
+      ).then((data) => completer.complete(data)).catchError((e) => completer.completeError(HAError("${e["message"]}")));
+      //return sendSocketMessage(type: "call_service", additionalData: {"domain": domain, "service": service, "service_data": serviceData});
     else
-      return sendSocketMessage(type: "call_service", additionalData: {"domain": domain, "service": service});
+      sendHTTPPost(
+          endPoint: "/api/services/$domain/$service"
+      ).then((data) => completer.complete(data)).catchError((e) => completer.completeError(HAError("${e["message"]}")));;
+      //return sendSocketMessage(type: "call_service", additionalData: {"domain": domain, "service": service});
+    return completer.future;
   }
 
   Future<List> getHistory(String entityId) async {
diff --git a/lib/managers/startup_user_messages_manager.class.dart b/lib/managers/startup_user_messages_manager.class.dart
index 8a642a1..cdcf766 100644
--- a/lib/managers/startup_user_messages_manager.class.dart
+++ b/lib/managers/startup_user_messages_manager.class.dart
@@ -14,7 +14,7 @@ class StartupUserMessagesManager {
   bool _supportAppDevelopmentMessageShown;
   bool _whatsNewMessageShown;
   static final _supportAppDevelopmentMessageKey = "user-message-shown-support-development_3";
-  static final _whatsNewMessageKey = "user-message-shown-whats-new-660";
+  static final _whatsNewMessageKey = "user-message-shown-whats-new-673";
 
   void checkMessagesToShow() async {
     SharedPreferences prefs = await SharedPreferences.getInstance();
@@ -49,23 +49,10 @@ class StartupUserMessagesManager {
   }
 
   void _showWhatsNewMessage() {
-    eventBus.fire(ShowPopupDialogEvent(
-        title: "What's new",
-        body: "You can now share any media url to HA Client via Android share menu. It will try to play that media on one of your media player. There is also 'tv' button available in app header if you want to send some url manually",
-        positiveText: "Full release notes",
-        negativeText: "Ok",
-        onPositive: () {
-          SharedPreferences.getInstance().then((prefs) {
-            prefs.setBool(_whatsNewMessageKey, true);
-            Launcher.launchURL("https://github.com/estevez-dev/ha_client/releases");
-          });
-        },
-        onNegative: () {
-          SharedPreferences.getInstance().then((prefs) {
-            prefs.setBool(_whatsNewMessageKey, true);
-          });
-        }
-    ));
+    SharedPreferences.getInstance().then((prefs) {
+      prefs.setBool(_whatsNewMessageKey, true);
+      eventBus.fire(ShowPageEvent(path: "/whats-new"));
+    });
   }
 
 }
\ No newline at end of file
diff --git a/lib/pages/entity.page.dart b/lib/pages/entity.page.dart
index 6b49bdc..ca20189 100644
--- a/lib/pages/entity.page.dart
+++ b/lib/pages/entity.page.dart
@@ -10,32 +10,40 @@ class EntityViewPage extends StatefulWidget {
 }
 
 class _EntityViewPageState extends State<EntityViewPage> {
-  String _title;
   StreamSubscription _refreshDataSubscription;
   StreamSubscription _stateSubscription;
+  Entity entity;
+  Entity forwardToMainPage;
+  bool _popScheduled = false;
 
   @override
   void initState() {
     super.initState();
     _stateSubscription = eventBus.on<StateChangedEvent>().listen((event) {
       if (event.entityId == widget.entityId) {
-        Logger.d("State change event handled by entity page: ${event.entityId}");
+        entity = HomeAssistant().entities.get(widget.entityId);
+        Logger.d("[Entity page] State change event handled: ${event.entityId}");
         setState(() {});
       }
     });
     _refreshDataSubscription = eventBus.on<RefreshDataFinishedEvent>().listen((event) {
       setState(() {});
     });
-    _prepareData();
+    entity = HomeAssistant().entities.get(widget.entityId);
   }
 
-  void _prepareData() async {
-    _title = HomeAssistant().entities.get(widget.entityId).displayName;
-  }
-
-
   @override
   Widget build(BuildContext context) {
+    Widget body;
+    if (MediaQuery.of(context).size.width >= Sizes.tabletMinWidth) {
+      if (!_popScheduled) {
+        _popScheduled = true;
+        _popAfterBuild();
+      }
+      body = PageLoadingIndicator();
+    } else {
+      body = EntityPageLayout(entity: entity);
+    }
     return new Scaffold(
       appBar: new AppBar(
         leading: IconButton(icon: Icon(Icons.arrow_back), onPressed: (){
@@ -43,16 +51,23 @@ class _EntityViewPageState extends State<EntityViewPage> {
         }),
         // 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(_title),
+        title: new Text("${entity.displayName}"),
       ),
-      body: HomeAssistant().entities.get(widget.entityId).buildEntityPageWidget(context),
+      body: body,
     );
   }
 
+  _popAfterBuild() async {
+    forwardToMainPage = entity;
+    await Future.delayed(Duration(milliseconds: 300));
+    Navigator.of(context).pop();
+  }
+
   @override
   void dispose(){
     if (_stateSubscription != null) _stateSubscription.cancel();
     if (_refreshDataSubscription != null) _refreshDataSubscription.cancel();
+    eventBus.fire(ShowEntityPageEvent(entity: forwardToMainPage));
     super.dispose();
   }
 }
\ No newline at end of file
diff --git a/lib/pages/main.page.dart b/lib/pages/main.page.dart
index 197ad16..b057162 100644
--- a/lib/pages/main.page.dart
+++ b/lib/pages/main.page.dart
@@ -26,6 +26,7 @@ class _MainPageState extends ReceiveShareState<MainPage> with WidgetsBindingObse
   bool _showLoginButton = false;
   bool _preventAppRefresh = false;
   String _savedSharedText;
+  String _entityToShow;
 
   @override
   void initState() {
@@ -227,7 +228,7 @@ class _MainPageState extends ReceiveShareState<MainPage> with WidgetsBindingObse
     if (_showEntityPageSubscription == null) {
       _showEntityPageSubscription =
           eventBus.on<ShowEntityPageEvent>().listen((event) {
-            _showEntityPage(event.entity.entityId);
+            _showEntityPage(event.entity?.entityId);
           });
     }
 
@@ -317,7 +318,7 @@ class _MainPageState extends ReceiveShareState<MainPage> with WidgetsBindingObse
     );
   }
 
-  //TODO remove this shit
+  //TODO remove this shit.... maybe
   void _callService(String domain, String service, String entityId, Map additionalParams) {
     _showInfoBottomBar(
         message: "Calling $domain.$service",
@@ -327,12 +328,17 @@ class _MainPageState extends ReceiveShareState<MainPage> with WidgetsBindingObse
   }
 
   void _showEntityPage(String entityId) {
-    Navigator.push(
-        context,
-        MaterialPageRoute(
-          builder: (context) => EntityViewPage(entityId: entityId),
-        )
-    );
+    setState(() {
+      _entityToShow = entityId;
+    });
+    if (_entityToShow!= null && MediaQuery.of(context).size.width < Sizes.tabletMinWidth) {
+      Navigator.push(
+          context,
+          MaterialPageRoute(
+            builder: (context) => EntityViewPage(entityId: entityId),
+          )
+      );
+    }
   }
 
   void _showPage(String path, bool goBackFirst) {
@@ -637,90 +643,182 @@ class _MainPageState extends ReceiveShareState<MainPage> with WidgetsBindingObse
   final GlobalKey<ScaffoldState> _scaffoldKey = new GlobalKey<ScaffoldState>();
 
   Widget _buildScaffoldBody(bool empty) {
-    List<PopupMenuItem<String>> popupMenuItems = [];
+    List<PopupMenuItem<String>> serviceMenuItems = [];
+    List<PopupMenuItem<String>> mediaMenuItems = [];
 
-    popupMenuItems.add(PopupMenuItem<String>(
+    serviceMenuItems.add(PopupMenuItem<String>(
       child: new Text("Reload"),
       value: "reload",
     ));
-    List<Widget> emptyBody = [
-      Text("."),
-    ];
     if (ConnectionManager().isAuthenticated) {
       _showLoginButton = false;
-      popupMenuItems.add(
+      serviceMenuItems.add(
           PopupMenuItem<String>(
             child: new Text("Logout"),
             value: "logout",
           ));
     }
-    if (_showLoginButton) {
-      emptyBody = [
-        FlatButton(
-          child: Text("Login with Home Assistant", style: TextStyle(fontSize: 16.0, color: Colors.white)),
-          color: Colors.blue,
-          onPressed: () => _fullLoad(),
-        )
-      ];
-    }
-    return NestedScrollView(
-      headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
-        return <Widget>[
-          SliverAppBar(
-            floating: true,
-            pinned: true,
-            primary: true,
-            title: Text(HomeAssistant().locationName ?? ""),
-            actions: <Widget>[
-              IconButton(
-                  icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
-                      "mdi:television"), color: Colors.white,),
-                  onPressed: () => Navigator.pushNamed(context, "/play-media", arguments: {"url": ""})
+    Widget mediaMenuIcon;
+    int playersCount = 0;
+    if (!empty && !HomeAssistant().entities.isEmpty) {
+      List<Entity> activePlayers = HomeAssistant().entities.getByDomains(domains: ["media_player"], stateFiler: [EntityState.paused, EntityState.playing, EntityState.idle]);
+      playersCount = activePlayers.length;
+      mediaMenuItems.addAll(
+          activePlayers.map((entity) => PopupMenuItem<String>(
+            child: Text(
+                "${entity.displayName}",
+              style: TextStyle(
+                color: EntityColor.stateColor(entity.state)
               ),
-              IconButton(
-                  icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
-                      "mdi:dots-vertical"), color: Colors.white,),
-                  onPressed: () {
-                    showMenu(
-                        position: RelativeRect.fromLTRB(MediaQuery.of(context).size.width, 70.0, 0.0, 0.0),
-                        context: context,
-                        items: popupMenuItems
-                    ).then((String val) {
-                      if (val == "reload") {
-                        _quickLoad();
-                      } else if (val == "logout") {
-                        HomeAssistant().logout().then((_) {
-                          _quickLoad();
-                        });
-                      }
-                    });
-                  }
-              )
-            ],
-            leading: IconButton(
-              icon: Icon(Icons.menu),
-              onPressed: () {
-                _scaffoldKey.currentState.openDrawer();
-              },
             ),
-            bottom: empty ? null : TabBar(
-              controller: _viewsTabController,
-              tabs: buildUIViewTabs(),
-              isScrollable: true,
-            ),
-          ),
-
-        ];
-      },
-      body: empty ?
-      Center(
-        child: Column(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: emptyBody
-        ),
+            value: "${entity.entityId}",
+          )).toList()
+      );
+    }
+    mediaMenuItems.addAll([
+      PopupMenuItem<String>(
+        child: new Text("Play media..."),
+        value: "play_media",
       )
-          :
-      HomeAssistant().buildViews(context, _viewsTabController),
+    ]);
+    if (playersCount > 0) {
+      mediaMenuIcon = Stack(
+        overflow: Overflow.visible,
+        children: <Widget>[
+          Icon(MaterialDesignIcons.getIconDataFromIconName(
+              "mdi:television"), color: Colors.white,),
+          Positioned(
+            bottom: -4,
+            right: -4,
+            child: Container(
+              height: 16,
+              width: 16,
+              decoration: new BoxDecoration(
+                color: Colors.orange,
+                shape: BoxShape.circle,
+              ),
+              child: Center(
+                child: Text("$playersCount", style: TextStyle(fontSize: 12)),
+              ),
+            ),
+          )
+        ],
+      );
+    } else {
+      mediaMenuIcon = Icon(MaterialDesignIcons.getIconDataFromIconName(
+          "mdi:television"), color: Colors.white,);
+    }
+    Widget mainScrollBody;
+    if (empty) {
+      if (_showLoginButton) {
+        mainScrollBody = Center(
+            child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: <Widget>[
+                  FlatButton(
+                    child: Text("Login with Home Assistant", style: TextStyle(fontSize: 16.0, color: Colors.white)),
+                    color: Colors.blue,
+                    onPressed: () => _fullLoad(),
+                  )
+                ]
+            )
+        );
+      } else {
+        mainScrollBody = Center(
+          child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: <Widget>[
+                Text("...")
+              ]
+          ),
+        );
+      }
+    } else {
+      if (_entityToShow != null && MediaQuery.of(context).size.width >= Sizes.tabletMinWidth) {
+        Entity entity = HomeAssistant().entities.get(_entityToShow);
+        mainScrollBody = Flex(
+          direction: Axis.horizontal,
+          children: <Widget>[
+            Expanded(
+              child: HomeAssistant().buildViews(context, _viewsTabController),
+            ),
+            Container(
+              width: Sizes.mainPageScreenSeparatorWidth,
+              color: Colors.blue,
+            ),
+            ConstrainedBox(
+              constraints: BoxConstraints.tightFor(width: Sizes.entityPageMaxWidth),
+              child: EntityPageLayout(entity: entity, showClose: true,),
+            )
+          ],
+        );
+      } else {
+        _entityToShow = null;
+        mainScrollBody = HomeAssistant().buildViews(context, _viewsTabController);
+      }
+    }
+
+    return NestedScrollView(
+        headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
+          return <Widget>[
+            SliverAppBar(
+              floating: true,
+              pinned: true,
+              primary: true,
+              title: Text(HomeAssistant().locationName ?? ""),
+              actions: <Widget>[
+                IconButton(
+                    icon: mediaMenuIcon,
+                    onPressed: () {
+                      showMenu(
+                          position: RelativeRect.fromLTRB(MediaQuery.of(context).size.width, 100.0, 50, 0.0),
+                          context: context,
+                          items: mediaMenuItems
+                      ).then((String val) {
+                        if (val == "play_media") {
+                          Navigator.pushNamed(context, "/play-media", arguments: {"url": ""});
+                        } else  {
+                          _showEntityPage(val);
+                        }
+                      });
+                    }
+                ),
+                IconButton(
+                    icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
+                        "mdi:dots-vertical"), color: Colors.white,),
+                    onPressed: () {
+                      showMenu(
+                          position: RelativeRect.fromLTRB(MediaQuery.of(context).size.width, 100, 0.0, 0.0),
+                          context: context,
+                          items: serviceMenuItems
+                      ).then((String val) {
+                        if (val == "reload") {
+                          _quickLoad();
+                        } else if (val == "logout") {
+                          HomeAssistant().logout().then((_) {
+                            _quickLoad();
+                          });
+                        }
+                      });
+                    }
+                )
+              ],
+              leading: IconButton(
+                icon: Icon(Icons.menu),
+                onPressed: () {
+                  _scaffoldKey.currentState.openDrawer();
+                },
+              ),
+              bottom: empty ? null : TabBar(
+                controller: _viewsTabController,
+                tabs: buildUIViewTabs(),
+                isScrollable: true,
+              ),
+            ),
+
+          ];
+        },
+        body: mainScrollBody
     );
   }
 
diff --git a/lib/pages/play_media.page.dart b/lib/pages/play_media.page.dart
index d3b1543..b1cbfac 100644
--- a/lib/pages/play_media.page.dart
+++ b/lib/pages/play_media.page.dart
@@ -3,8 +3,9 @@ part of '../main.dart';
 class PlayMediaPage extends StatefulWidget {
 
   final String mediaUrl;
+  final String mediaType;
 
-  PlayMediaPage({Key key, this.mediaUrl}) : super(key: key);
+  PlayMediaPage({Key key, this.mediaUrl, this.mediaType}) : super(key: key);
 
   @override
   _PlayMediaPageState createState() => new _PlayMediaPageState();
@@ -22,13 +23,22 @@ class _PlayMediaPageState extends State<PlayMediaPage> {
   bool _isMediaExtractorExist = false;
   StreamSubscription _stateSubscription;
   StreamSubscription _refreshDataSubscription;
-  final List<String> _contentTypes = ["movie", "video", "music", "image", "image/jpg", "playlist"];
+  List<String> _contentTypes = ["movie", "video", "music", "image", "image/jpg", "playlist"];
 
   @override
   void initState() {
     super.initState();
     _mediaUrl = widget.mediaUrl;
-    _contentType = _contentTypes[0];
+    if (widget.mediaType.isNotEmpty) {
+      if (!_contentTypes.contains(widget.mediaType)) {
+        _contentTypes.insert(0, widget.mediaType);
+        _contentType = _contentTypes[0];
+      } else {
+        _contentType = widget.mediaType;
+      }
+    } else {
+      _contentType = _contentTypes[0];
+    }
     _stateSubscription = eventBus.on<StateChangedEvent>().listen((event) {
       if (event.entityId.contains("media_player")) {
         Logger.d("State change event handled by play media page: ${event.entityId}");
@@ -49,7 +59,7 @@ class _PlayMediaPageState extends State<PlayMediaPage> {
     } else {
       _isMediaExtractorExist = HomeAssistant().services.containsKey("media_extractor");
       //_useMediaExtractor = _isMediaExtractorExist;
-      _players = HomeAssistant().entities.getByDomains(["media_player"]);
+      _players = HomeAssistant().entities.getByDomains(domains: ["media_player"]);
       setState(() {
         if (_players.isNotEmpty) {
           _loaded = true;
@@ -83,7 +93,12 @@ class _PlayMediaPageState extends State<PlayMediaPage> {
             "media_content_type": _contentType
           }
       );
-      eventBus.fire(ShowEntityPageEvent(entity));
+      HomeAssistant().sendToPlayerId = entity.entityId;
+      if (HomeAssistant().sendFromPlayerId != null) {
+        eventBus.fire(ServiceCallEvent(HomeAssistant().sendFromPlayerId.split(".")[0], "turn_off", HomeAssistant().sendFromPlayerId, null));
+        HomeAssistant().sendFromPlayerId = null;
+      }
+      eventBus.fire(ShowEntityPageEvent(entity: entity));
     }
   }
 
diff --git a/lib/pages/whats_new.page.dart b/lib/pages/whats_new.page.dart
new file mode 100644
index 0000000..ed63f9a
--- /dev/null
+++ b/lib/pages/whats_new.page.dart
@@ -0,0 +1,69 @@
+part of '../main.dart';
+
+class WhatsNewPage extends StatefulWidget {
+  WhatsNewPage({Key key}) : super(key: key);
+
+  @override
+  _WhatsNewPageState createState() => new _WhatsNewPageState();
+}
+
+class _WhatsNewPageState extends State<WhatsNewPage> {
+
+  String data = "";
+  String error = "";
+
+  @override
+  void initState() {
+    super.initState();
+    _loadData();
+  }
+
+  _loadData() async {
+    setState(() {
+      data = "";
+      error = "";
+    });
+    http.Response response;
+    response = await http.get("http://ha-client.homemade.systems/service/whats_new_$appVersionNumber.md");
+    if (response.statusCode == 200) {
+      setState(() {
+        data = response.body;
+      });
+    } else {
+      setState(() {
+        error = "Can't load changelog";
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    Widget body;
+    if (error.isNotEmpty) {
+      body = PageLoadingError(errorText: error,);
+    } else if (data.isEmpty) {
+      body = PageLoadingIndicator();
+    } else {
+      body = Markdown(
+        data: data,
+      );
+    }
+    return new Scaffold(
+      appBar: new AppBar(
+        leading: IconButton(icon: Icon(Icons.arrow_back), onPressed: (){
+          Navigator.pop(context);
+        }),
+        actions: <Widget>[
+          IconButton(
+            icon: Icon(Icons.refresh),
+            onPressed: () => _loadData(),
+          )
+        ],
+        // 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("What's new"),
+      ),
+      body: body
+    );
+  }
+}
\ No newline at end of file
diff --git a/lib/entity_widgets/common/entity_attributes_list.dart b/lib/pages/widgets/entity_attributes_list.dart
similarity index 100%
rename from lib/entity_widgets/common/entity_attributes_list.dart
rename to lib/pages/widgets/entity_attributes_list.dart
diff --git a/lib/entity_widgets/common/last_updated.dart b/lib/pages/widgets/last_updated.dart
similarity index 100%
rename from lib/entity_widgets/common/last_updated.dart
rename to lib/pages/widgets/last_updated.dart
diff --git a/lib/plugins/dynamic_multi_column_layout.dart b/lib/plugins/dynamic_multi_column_layout.dart
new file mode 100644
index 0000000..8c00003
--- /dev/null
+++ b/lib/plugins/dynamic_multi_column_layout.dart
@@ -0,0 +1,145 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
+import 'dart:math' as math;
+
+class DynamicMultiColumnLayout extends MultiChildRenderObjectWidget {
+
+  final int minColumnWidth;
+
+  DynamicMultiColumnLayout({
+    Key key,
+    this.minColumnWidth: 350,
+    List<Widget> children = const <Widget>[],
+  }) : super(key: key, children: children);
+
+  @override
+  RenderCustomLayoutBox createRenderObject(BuildContext context) {
+    return RenderCustomLayoutBox(minColumnWidth: this.minColumnWidth);
+  }
+
+}
+
+class RenderCustomLayoutBox extends RenderBox
+    with ContainerRenderObjectMixin<RenderBox, CustomLayoutParentData>,
+        RenderBoxContainerDefaultsMixin<RenderBox, CustomLayoutParentData> {
+
+  final int minColumnWidth;
+
+  RenderCustomLayoutBox({
+    this.minColumnWidth,
+    List<RenderBox> children,
+  }) {
+    addAll(children);
+  }
+
+  @override
+  void setupParentData(RenderBox child) {
+    if (child.parentData is! CustomLayoutParentData) {
+      child.parentData = CustomLayoutParentData();
+    }
+  }
+
+  double _getIntrinsicHeight(double childSize(RenderBox child)) {
+    double inflexibleSpace = 0.0;
+    RenderBox child = firstChild;
+    while (child != null) {
+      inflexibleSpace += childSize(child);
+      final FlexParentData childParentData = child.parentData;
+      child = childParentData.nextSibling;
+    }
+    return inflexibleSpace;
+  }
+
+  double _getIntrinsicWidth(double childSize(RenderBox child)) {
+    double maxSpace = 0.0;
+    RenderBox child = firstChild;
+    while (child != null) {
+      maxSpace = math.max(maxSpace, childSize(child));
+      final FlexParentData childParentData = child.parentData;
+      child = childParentData.nextSibling;
+    }
+    return maxSpace;
+  }
+
+  @override
+  double computeMinIntrinsicWidth(double height) {
+    return _getIntrinsicWidth((RenderBox child) => child.getMinIntrinsicWidth(height));
+  }
+
+  @override
+  double computeMaxIntrinsicWidth(double height) {
+    return _getIntrinsicWidth((RenderBox child) => child.getMaxIntrinsicWidth(height));
+  }
+
+  @override
+  double computeMinIntrinsicHeight(double width) {
+    return _getIntrinsicHeight((RenderBox child) => child.getMinIntrinsicHeight(width));
+  }
+
+  @override
+  double computeMaxIntrinsicHeight(double width) {
+    return _getIntrinsicHeight((RenderBox child) => child.getMaxIntrinsicHeight(width));
+  }
+
+  @override
+  void performLayout() {
+    int columnsCount;
+    List<double> columnXPositions = [];
+    List<double> columnYPositions = [];
+    columnsCount = (constraints.maxWidth ~/ this.minColumnWidth);
+    if (childCount == 0 || columnsCount == 0) {
+      size = constraints.biggest;
+      assert(size.isFinite);
+      return;
+    }
+    double columnWidth = constraints.maxWidth / columnsCount;
+    double startY = 0;
+    for (int i =0; i < columnsCount; i++) {
+      columnXPositions.add(i*columnWidth);
+      columnYPositions.add(startY);
+    }
+    RenderBox child = firstChild;
+    while (child != null) {
+      final CustomLayoutParentData childParentData = child.parentData;
+
+      int columnToAdd = 0;
+      double minYPosition = columnYPositions[0];
+      for (int i=0; i<columnsCount; i++) {
+        if (columnYPositions[i] < minYPosition) {
+          minYPosition = columnYPositions[i];
+          columnToAdd = i;
+        }
+      }
+      child.layout(BoxConstraints.tightFor(width: columnWidth), parentUsesSize: true);
+      childParentData.offset = Offset(columnXPositions[columnToAdd], columnYPositions[columnToAdd]);
+      final Size newSize = child.size;
+      columnYPositions[columnToAdd] = minYPosition + newSize.height;
+
+      child = childParentData.nextSibling;
+    }
+
+    double width = constraints.maxWidth;
+    double height = 0;
+    for (int i=0; i<columnsCount; i++) {
+      if (columnYPositions[i] > height) {
+        height = columnYPositions[i];
+      }
+    }
+
+    size = Size(width, height);
+  }
+
+  @override
+  void paint(PaintingContext context, Offset offset) {
+    defaultPaint(context, offset);
+  }
+
+  @override
+  bool hitTestChildren(HitTestResult result, { Offset position }) {
+    return defaultHitTestChildren(result, position: position);
+  }
+}
+
+class CustomLayoutParentData extends ContainerBoxParentData<RenderBox> {
+
+}
\ No newline at end of file
diff --git a/lib/entity_widgets/history_chart/combined_history_chart.dart b/lib/plugins/history_chart/combined_history_chart.dart
similarity index 100%
rename from lib/entity_widgets/history_chart/combined_history_chart.dart
rename to lib/plugins/history_chart/combined_history_chart.dart
diff --git a/lib/entity_widgets/history_chart/entity_history.dart b/lib/plugins/history_chart/entity_history.dart
similarity index 89%
rename from lib/entity_widgets/history_chart/entity_history.dart
rename to lib/plugins/history_chart/entity_history.dart
index d902df7..14dec4c 100644
--- a/lib/entity_widgets/history_chart/entity_history.dart
+++ b/lib/plugins/history_chart/entity_history.dart
@@ -17,9 +17,7 @@ class EntityHistoryConfig {
 
 class EntityHistoryWidget extends StatefulWidget {
 
-  final EntityHistoryConfig config;
-
-  const EntityHistoryWidget({Key key, @required this.config}) : super(key: key);
+  const EntityHistoryWidget({Key key}) : super(key: key);
 
   @override
   _EntityHistoryWidgetState createState() {
@@ -33,6 +31,7 @@ class _EntityHistoryWidgetState extends State<EntityHistoryWidget> {
   bool _needToUpdateHistory;
   DateTime _historyLastUpdated;
   bool _disposed = false;
+  Entity entity;
 
   @override
   void initState() {
@@ -75,10 +74,10 @@ class _EntityHistoryWidgetState extends State<EntityHistoryWidget> {
     } else {
       _loadHistory(entity.entityId);
     }
-    return _buildChart();
+    return _buildChart(entity.historyConfig);
   }
 
-  Widget _buildChart() {
+  Widget _buildChart(EntityHistoryConfig config) {
     List<Widget> children = [];
     if (_history == null) {
       children.add(
@@ -90,7 +89,7 @@ class _EntityHistoryWidgetState extends State<EntityHistoryWidget> {
       );
     } else {
       children.add(
-          _selectChartWidget()
+          _selectChartWidget(config)
       );
     }
     children.add(Divider());
@@ -102,8 +101,8 @@ class _EntityHistoryWidgetState extends State<EntityHistoryWidget> {
     );
   }
 
-  Widget _selectChartWidget() {
-    switch (widget.config.chartType) {
+  Widget _selectChartWidget(EntityHistoryConfig config) {
+    switch (config.chartType) {
 
       case EntityHistoryWidgetType.simple: {
           return SimpleStateHistoryChartWidget(
@@ -114,14 +113,14 @@ class _EntityHistoryWidgetState extends State<EntityHistoryWidget> {
       case EntityHistoryWidgetType.numericState: {
         return NumericStateHistoryChartWidget(
           rawHistory: _history,
-          config: widget.config,
+          config: config,
         );
       }
 
       case EntityHistoryWidgetType.numericAttributes: {
         return CombinedHistoryChartWidget(
           rawHistory: _history,
-          config: widget.config,
+          config: config,
         );
       }
 
diff --git a/lib/entity_widgets/history_chart/entity_history_moment.dart b/lib/plugins/history_chart/entity_history_moment.dart
similarity index 100%
rename from lib/entity_widgets/history_chart/entity_history_moment.dart
rename to lib/plugins/history_chart/entity_history_moment.dart
diff --git a/lib/entity_widgets/history_chart/history_control_widget.dart b/lib/plugins/history_chart/history_control_widget.dart
similarity index 100%
rename from lib/entity_widgets/history_chart/history_control_widget.dart
rename to lib/plugins/history_chart/history_control_widget.dart
diff --git a/lib/entity_widgets/history_chart/numeric_state_history_chart.dart b/lib/plugins/history_chart/numeric_state_history_chart.dart
similarity index 100%
rename from lib/entity_widgets/history_chart/numeric_state_history_chart.dart
rename to lib/plugins/history_chart/numeric_state_history_chart.dart
diff --git a/lib/entity_widgets/history_chart/simple_state_history_chart.dart b/lib/plugins/history_chart/simple_state_history_chart.dart
similarity index 100%
rename from lib/entity_widgets/history_chart/simple_state_history_chart.dart
rename to lib/plugins/history_chart/simple_state_history_chart.dart
diff --git a/lib/plugins/spoiler_card.dart b/lib/plugins/spoiler_card.dart
new file mode 100644
index 0000000..340de62
--- /dev/null
+++ b/lib/plugins/spoiler_card.dart
@@ -0,0 +1,44 @@
+import 'package:flutter/material.dart';
+
+class SpoilerCard extends StatefulWidget {
+
+  final String title;
+  final Widget body;
+  final bool isExpanded;
+
+  SpoilerCard({Key key, @required this.title, @required this.body, this.isExpanded: false}) : super(key: key);
+
+  @override
+  _SpoilerCardState createState() => _SpoilerCardState();
+}
+
+class _SpoilerCardState extends State<SpoilerCard> {
+
+  bool _expanded;
+
+  @override
+  void initState() {
+    super.initState();
+    _expanded = widget.isExpanded;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: <Widget>[
+          ListTile(
+            title: Text("${widget.title}"),
+            trailing: Icon(
+              _expanded ? Icons.arrow_drop_up : Icons.arrow_drop_down,
+              size: 20,
+            ),
+            onTap: () => setState((){_expanded = !_expanded;}),
+          ),
+          _expanded ? widget.body : Container(height: 0,)
+        ],
+      ),
+    );
+  }
+}
\ No newline at end of file
diff --git a/lib/types/event_bus_events.dart b/lib/types/event_bus_events.dart
index 50068fb..85f3044 100644
--- a/lib/types/event_bus_events.dart
+++ b/lib/types/event_bus_events.dart
@@ -63,9 +63,9 @@ class ShowPopupMessageEvent {
 }
 
 class ShowEntityPageEvent {
-  Entity entity;
+  final Entity entity;
 
-  ShowEntityPageEvent(this.entity);
+  ShowEntityPageEvent({this.entity});
 }
 
 class ShowPageEvent {
diff --git a/lib/mdi.class.dart b/lib/utils/mdi.class.dart
similarity index 99%
rename from lib/mdi.class.dart
rename to lib/utils/mdi.class.dart
index 069fc93..63af439 100644
--- a/lib/mdi.class.dart
+++ b/lib/utils/mdi.class.dart
@@ -1,4 +1,4 @@
-part of 'main.dart';
+part of '../main.dart';
 
 class MaterialDesignIcons {
   static final Map defaultIconsByDomains = {
diff --git a/lib/view.dart b/lib/view.dart
deleted file mode 100644
index e6e2d06..0000000
--- a/lib/view.dart
+++ /dev/null
@@ -1,99 +0,0 @@
-part of 'main.dart';
-
-class ViewWidget extends StatefulWidget {
-  final HAView view;
-
-  const ViewWidget({
-    Key key,
-    this.view
-  }) : super(key: key);
-
-  @override
-  State<StatefulWidget> createState() {
-    return ViewWidgetState();
-  }
-
-}
-
-class ViewWidgetState extends State<ViewWidget> {
-
-  @override
-  void initState() {
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    if (widget.view.panel) {
-      return FractionallySizedBox(
-        widthFactor: 1,
-        heightFactor: 1,
-        child: _buildPanelChild(context),
-      );
-    } else {
-      return ListView(
-        padding: EdgeInsets.all(0.0),
-        //physics: const AlwaysScrollableScrollPhysics(),
-        children: _buildChildren(context),
-      );
-    }
-  }
-
-  Widget _buildPanelChild(BuildContext context) {
-    if (widget.view.cards != null && widget.view.cards.isNotEmpty) {
-      return widget.view.cards[0].build(context);
-    } else {
-      return Container(width: 0, height: 0);
-    }
-  }
-
-  List<Widget> _buildChildren(BuildContext context) {
-    List<Widget> result = [];
-
-    if (widget.view.badges.isNotEmpty) {
-      result.insert(0,
-          Wrap(
-            alignment: WrapAlignment.center,
-            spacing: 10.0,
-            runSpacing: 1.0,
-            children: _buildBadges(context),
-          )
-      );
-    }
-
-    List<Widget> cards = [];
-    widget.view.cards.forEach((HACard card){
-      cards.add(
-          ConstrainedBox(
-            constraints: BoxConstraints(maxWidth: 500),
-            child: card.build(context),
-          )
-      );
-    });
-
-    result.add(
-      Column (
-        children: cards,
-      )
-    );
-
-    return result;
-  }
-
-  List<Widget> _buildBadges(BuildContext context) {
-    List<Widget> result = [];
-    widget.view.badges.forEach((Entity entity) {
-      if (!entity.isHidden) {
-        result.add(entity.buildBadgeWidget(context));
-      }
-    });
-    return result;
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-  }
-
-
-}
\ No newline at end of file
diff --git a/lib/viewWidget.widget.dart b/lib/viewWidget.widget.dart
new file mode 100644
index 0000000..ab620d7
--- /dev/null
+++ b/lib/viewWidget.widget.dart
@@ -0,0 +1,56 @@
+part of 'main.dart';
+
+class ViewWidget extends StatelessWidget {
+  final HAView view;
+
+  const ViewWidget({
+    Key key,
+    this.view
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    if (this.view.panel) {
+      return FractionallySizedBox(
+        widthFactor: 1,
+        heightFactor: 1,
+        child: _buildPanelChild(context),
+      );
+    } else {
+      return ListView(
+          shrinkWrap: true,
+          padding: EdgeInsets.all(0),
+          children: <Widget>[
+            _buildBadges(context),
+            DynamicMultiColumnLayout(
+              minColumnWidth: Sizes.minViewColumnWidth,
+              children: this.view.cards.map((card) => card.build(context)).toList(),
+            )
+          ]
+      );
+    }
+  }
+
+  Widget _buildPanelChild(BuildContext context) {
+    if (this.view.cards != null && this.view.cards.isNotEmpty) {
+      return this.view.cards[0].build(context);
+    } else {
+      return Container(width: 0, height: 0);
+    }
+  }
+
+  Widget _buildBadges(BuildContext context) {
+    if (this.view.badges.isNotEmpty) {
+      return Wrap(
+        alignment: WrapAlignment.center,
+        spacing: 10.0,
+        runSpacing: 1.0,
+        children: this.view.badges.map((badge) =>
+            badge.buildBadgeWidget(context)).toList(),
+      );
+    } else {
+      return Container(width: 0, height: 0,);
+    }
+  }
+
+}
\ No newline at end of file
diff --git a/pubspec.lock b/pubspec.lock
index f92cde2..9d96ec2 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -138,7 +138,7 @@ packages:
       name: flutter_local_notifications
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.8.3"
+    version: "0.8.2+1"
   flutter_markdown:
     dependency: "direct main"
     description:
@@ -152,7 +152,7 @@ packages:
       name: flutter_secure_storage
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.3.1+1"
+    version: "3.3.1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
diff --git a/pubspec.yaml b/pubspec.yaml
index 679c609..ab629c8 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: hass_client
 description: Home Assistant Android Client
 
-version: 0.6.7+675
+version: 0.6.8+680
 
 environment:
   sdk: ">=2.0.0-dev.68.0 <3.0.0"
@@ -21,11 +21,11 @@ dependencies:
   in_app_purchase: ^0.2.1+3
 #  flutter_svg: ^0.10.3
   flutter_custom_tabs: ^0.6.0
-  firebase_messaging: ^5.1.4
-  flutter_webview_plugin: ^0.3.7
-  flutter_secure_storage: ^3.2.1+1
+  firebase_messaging: ^5.1.5
+  flutter_webview_plugin: ^0.3.8
+  flutter_secure_storage: ^3.3.1
   device_info: ^0.4.0+2
-  flutter_local_notifications: ^0.8.2
+  flutter_local_notifications: ^0.8.2+1
   share:
     git:
       url: https://github.com/d-silveira/flutter-share.git