diff --git a/lib/main.dart b/lib/main.dart
index e91c43e..80be832 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -494,10 +494,6 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
                 });
               },
             ),
-            flexibleSpace: FlexibleSpaceBar(
-              centerTitle: false,
-              //title: _buildAppTitle(),
-            ),
             bottom: empty ? null : TabBar(
               tabs: buildUIViewTabs(),
               isScrollable: true,
@@ -530,7 +526,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
     if (_homeAssistant.ui == null || _homeAssistant.ui.views == null) {
       return Scaffold(
         key: _scaffoldKey,
-        primary: true,
+        primary: false,
         drawer: _buildAppDrawer(),
         body: _buildScaffoldBody(true)
       );
@@ -538,6 +534,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
       return Scaffold(
         key: _scaffoldKey,
         drawer: _buildAppDrawer(),
+        primary: false,
         body: DefaultTabController(
           length: _homeAssistant.ui?.views?.length ?? 0,
           child: _buildScaffoldBody(false),
diff --git a/lib/ui_class/ui.dart b/lib/ui_class/ui.dart
index f34acae..c5423c3 100644
--- a/lib/ui_class/ui.dart
+++ b/lib/ui_class/ui.dart
@@ -10,7 +10,7 @@ class HomeAssistantUI {
 
   Widget build(BuildContext context) {
     return TabBarView(
-        children: _buildViews(context)
+      children: _buildViews(context)
     );
   }
 
diff --git a/lib/ui_widgets/view.dart b/lib/ui_widgets/view.dart
index 8e9ddb1..4bd7831 100644
--- a/lib/ui_widgets/view.dart
+++ b/lib/ui_widgets/view.dart
@@ -35,6 +35,7 @@ class ViewWidgetState extends State<ViewWidget> {
     return RefreshIndicator(
       color: Colors.amber,
       child: ListView(
+        padding: EdgeInsets.all(0.0),
         physics: const AlwaysScrollableScrollPhysics(),
         children: _buildChildren(context),
       ),
diff --git a/pubspec.lock b/pubspec.lock
index a8caf7d..fd7c2b6 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1,13 +1,6 @@
 # Generated by pub
 # See https://www.dartlang.org/tools/pub/glossary#lockfile
 packages:
-  analyzer:
-    dependency: transitive
-    description:
-      name: analyzer
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.33.0"
   archive:
     dependency: transitive
     description:
@@ -21,7 +14,7 @@ packages:
       name: args
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.0"
+    version: "1.5.1"
   async:
     dependency: transitive
     description:
@@ -85,13 +78,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.6"
-  csslib:
-    dependency: transitive
-    description:
-      name: csslib
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.14.6"
   dart_config:
     dependency: transitive
     description:
@@ -146,27 +132,6 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  front_end:
-    dependency: transitive
-    description:
-      name: front_end
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.6"
-  glob:
-    dependency: transitive
-    description:
-      name: glob
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.1.7"
-  html:
-    dependency: transitive
-    description:
-      name: html
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.13.3+3"
   http:
     dependency: transitive
     description:
@@ -174,13 +139,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.12.0"
-  http_multi_server:
-    dependency: transitive
-    description:
-      name: http_multi_server
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.5"
   http_parser:
     dependency: transitive
     description:
@@ -202,34 +160,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.15.7"
-  io:
-    dependency: transitive
-    description:
-      name: io
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.3.3"
-  js:
-    dependency: transitive
-    description:
-      name: js
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.6.1+1"
-  json_rpc_2:
-    dependency: transitive
-    description:
-      name: json_rpc_2
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.9"
-  kernel:
-    dependency: transitive
-    description:
-      name: kernel
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.3.6"
   logging:
     dependency: transitive
     description:
@@ -251,41 +181,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.6"
-  mime:
-    dependency: transitive
-    description:
-      name: mime
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.9.6+2"
-  multi_server_socket:
-    dependency: transitive
-    description:
-      name: multi_server_socket
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.2"
-  node_preamble:
-    dependency: transitive
-    description:
-      name: node_preamble
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.4.4"
-  package_config:
-    dependency: transitive
-    description:
-      name: package_config
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.5"
-  package_resolver:
-    dependency: transitive
-    description:
-      name: package_resolver
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.6"
   path:
     dependency: transitive
     description:
@@ -307,20 +202,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.2"
-  plugin:
-    dependency: transitive
-    description:
-      name: plugin
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.2.0+3"
-  pool:
-    dependency: transitive
-    description:
-      name: pool
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.6"
   progress_indicators:
     dependency: "direct main"
     description:
@@ -328,20 +209,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.2"
-  pub_semver:
-    dependency: transitive
-    description:
-      name: pub_semver
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.4.2"
   quiver:
     dependency: transitive
     description:
       name: quiver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0+1"
+    version: "2.0.1"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -349,53 +223,11 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.4.3"
-  shelf:
-    dependency: transitive
-    description:
-      name: shelf
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.7.3+3"
-  shelf_packages_handler:
-    dependency: transitive
-    description:
-      name: shelf_packages_handler
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.4"
-  shelf_static:
-    dependency: transitive
-    description:
-      name: shelf_static
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.2.8"
-  shelf_web_socket:
-    dependency: transitive
-    description:
-      name: shelf_web_socket
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.2.2+4"
   sky_engine:
     dependency: transitive
     description: flutter
     source: sdk
     version: "0.0.99"
-  source_map_stack_trace:
-    dependency: transitive
-    description:
-      name: source_map_stack_trace
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.1.5"
-  source_maps:
-    dependency: transitive
-    description:
-      name: source_maps
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.10.8"
   source_span:
     dependency: transitive
     description:
@@ -438,13 +270,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.1"
-  test:
+  test_api:
     dependency: transitive
     description:
-      name: test
+      name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.4"
+    version: "0.2.1"
   typed_data:
     dependency: transitive
     description:
@@ -459,13 +291,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "4.0.1"
-  utf:
-    dependency: transitive
-    description:
-      name: utf
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.9.0+5"
   uuid:
     dependency: transitive
     description:
@@ -480,22 +305,8 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.8"
-  vm_service_client:
-    dependency: transitive
-    description:
-      name: vm_service_client
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.2.6"
-  watcher:
-    dependency: transitive
-    description:
-      name: watcher
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.9.7+10"
   web_socket_channel:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: web_socket_channel
       url: "https://pub.dartlang.org"
@@ -516,5 +327,5 @@ packages:
     source: hosted
     version: "2.1.15"
 sdks:
-  dart: ">=2.0.0 <=2.1.0-dev.8.0.flutter-bf26f760b1"
+  dart: ">=2.0.0 <=2.1.0-dev.9.3.flutter-9c07fb64c4"
   flutter: ">=0.5.6 <2.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 1566602..ff43679 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -9,6 +9,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
+  web_socket_channel: any
   shared_preferences: any
   progress_indicators: any
   event_bus: any