diff --git a/lib/ui/app/entity_header.dart b/lib/ui/app/entity_header.dart
index dc4f2940c..1ee6f1ed0 100644
--- a/lib/ui/app/entity_header.dart
+++ b/lib/ui/app/entity_header.dart
@@ -17,24 +17,26 @@ class EntityHeader extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final textColor = Theme.of(context).primaryTextTheme.bodyText1.color;
+
     Widget _value1() {
       return Column(
-        crossAxisAlignment: CrossAxisAlignment.center,
+        crossAxisAlignment: CrossAxisAlignment.start,
         mainAxisSize: MainAxisSize.min,
         children: <Widget>[
           Text(label,
               style: TextStyle(
                 fontSize: 16.0,
-                fontWeight: FontWeight.w300,
+                color: textColor.withOpacity(.65),
               )),
           SizedBox(
-            height: 6.0,
+            height: 8,
           ),
           Text(
             value ?? '',
             style: TextStyle(
-              fontSize: 22.0,
-              fontWeight: FontWeight.bold,
+              fontSize: 30.0,
+              //fontWeight: FontWeight.bold,
             ),
           )
         ],
@@ -43,22 +45,21 @@ class EntityHeader extends StatelessWidget {
 
     Widget _value2() {
       return Column(
-        crossAxisAlignment: CrossAxisAlignment.center,
+        crossAxisAlignment: CrossAxisAlignment.start,
         mainAxisSize: MainAxisSize.min,
         children: <Widget>[
           Text(secondLabel,
               style: TextStyle(
                 fontSize: 16.0,
-                fontWeight: FontWeight.w300,
+                color: textColor.withOpacity(.65),
               )),
           SizedBox(
-            height: 6.0,
+            height: 8,
           ),
           Text(
             secondValue ?? '',
             style: TextStyle(
-              fontSize: 22.0,
-              fontWeight: FontWeight.bold,
+              fontSize: 30.0,
             ),
           )
         ],
@@ -76,10 +77,10 @@ class EntityHeader extends StatelessWidget {
                 direction: value.length > 12 || (secondValue ?? '').length > 12
                     ? Axis.vertical
                     : Axis.horizontal,
-                mainAxisAlignment: MainAxisAlignment.spaceAround,
+                mainAxisAlignment: MainAxisAlignment.start,
                 children: <Widget>[
-                  _value1(),
-                  if (secondValue != null) _value2(),
+                  Expanded(child: _value1()),
+                  if (secondValue != null) Expanded(child: _value2()),
                 ],
               )
               //child: _headerRow(),
diff --git a/lib/ui/app/lists/app_list_tile.dart b/lib/ui/app/lists/app_list_tile.dart
index e4c6f5fa0..487c6ea05 100644
--- a/lib/ui/app/lists/app_list_tile.dart
+++ b/lib/ui/app/lists/app_list_tile.dart
@@ -22,7 +22,7 @@ class AppListTile extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Material(
-      color: Theme.of(context).canvasColor,
+      color: Theme.of(context).cardColor,
       child: ListTile(
         contentPadding: EdgeInsets.only(left: 12.0, top: 8.0, bottom: 8.0),
         leading: Icon(icon),
diff --git a/lib/ui/app/view_scaffold.dart b/lib/ui/app/view_scaffold.dart
index 612765b2f..990a65a78 100644
--- a/lib/ui/app/view_scaffold.dart
+++ b/lib/ui/app/view_scaffold.dart
@@ -42,6 +42,7 @@ class ViewScaffold extends StatelessWidget {
         return true;
       },
       child: Scaffold(
+        backgroundColor: Theme.of(context).cardColor,
         appBar: AppBar(
           leading: !isMobile(context) && isSettings
               ? IconButton(
diff --git a/lib/ui/client/view/client_view.dart b/lib/ui/client/view/client_view.dart
index 4a5856cc5..ec1c0ac47 100644
--- a/lib/ui/client/view/client_view.dart
+++ b/lib/ui/client/view/client_view.dart
@@ -65,28 +65,25 @@ class _ClientViewState extends State<ClientView>
           ),
         ],
       ),
-      body: Container(
-        color: Theme.of(context).cardColor,
-        child: TabBarView(
-          controller: _controller,
-          children: <Widget>[
-            RefreshIndicator(
-              onRefresh: () => viewModel.onRefreshed(context),
-              child: ClientOverview(viewModel: viewModel),
+      body: TabBarView(
+        controller: _controller,
+        children: <Widget>[
+          RefreshIndicator(
+            onRefresh: () => viewModel.onRefreshed(context),
+            child: ClientOverview(viewModel: viewModel),
+          ),
+          RefreshIndicator(
+            onRefresh: () => viewModel.onRefreshed(context),
+            child: ClientViewDetails(client: viewModel.client),
+          ),
+          RefreshIndicator(
+            onRefresh: () => viewModel.onRefreshed(context),
+            child: ClientViewActivity(
+              viewModel: viewModel,
+              key: ValueKey(viewModel.client.id),
             ),
-            RefreshIndicator(
-              onRefresh: () => viewModel.onRefreshed(context),
-              child: ClientViewDetails(client: viewModel.client),
-            ),
-            RefreshIndicator(
-              onRefresh: () => viewModel.onRefreshed(context),
-              child: ClientViewActivity(
-                viewModel: viewModel,
-                key: ValueKey(viewModel.client.id),
-              ),
-            ),
-          ],
-        ),
+          ),
+        ],
       ),
       floatingActionButton: FloatingActionButton(
         heroTag: 'client_view_fab',