diff --git a/src/components/DataPage.vue b/src/components/DataPage.vue
index 7ff2b9eb..3d2050ab 100644
--- a/src/components/DataPage.vue
+++ b/src/components/DataPage.vue
@@ -16,7 +16,7 @@
         item-navigator(v-if='!isTable' :next='next' :prev='prev' :total='total' :regKey='dataKey()(dataType)')
 
         .tabs
-          .tabs-titles
+          .tabs-titles(v-if='page.data')
             template(v-for='tab in mainContentTabs')
               button.btn.tab-title.link(v-if='tab.name' @click='setActiveContentTab(tab.name,$event)'
                :class='tabTitleCss(isActiveContentTab(tab))')
@@ -29,7 +29,8 @@
         data-section(v-if='!tabs && !activeContentTab' :module='module' :dataType='dataType'
           :reqKey='reqKey' :component='component' :action='action')
         .tabs(v-if='tabs && data && !hideTabs')
-          .tabs-titles
+          //- Tabs titles
+          .tabs-titles(v-if='page.data')
             template(v-for='tab in tabs')
               template(v-if='renderTab(tab)')
                 template(v-if='isRequesting()(tab.name)')
@@ -296,6 +297,8 @@ export default {
 }
 </script>
 <style lang="stylus">
+  .data-page
+    align-self flex-start
   .page-header
     width 100%
 
diff --git a/src/components/Home.vue b/src/components/Home.vue
index 6cb6bbc3..118bda50 100644
--- a/src/components/Home.vue
+++ b/src/components/Home.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  .home
+  .home(v-if='lastBlocks.length')
     .hero
       .col-a(ref='last-blocks-box')
         .box.row.last-blocks
diff --git a/src/components/LastBlocks.vue b/src/components/LastBlocks.vue
index f9794277..97beb712 100644
--- a/src/components/LastBlocks.vue
+++ b/src/components/LastBlocks.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  .blocks-wrapper
+  .blocks-wrapper(v-show='blocks.length')
     h2.title
       router-link(:to='entity.listLink')
         icon(:name='entity.icon')
diff --git a/src/lib/styl/layout.styl b/src/lib/styl/layout.styl
index 6b942b4a..54c8c87f 100644
--- a/src/lib/styl/layout.styl
+++ b/src/lib/styl/layout.styl
@@ -32,7 +32,8 @@ body, .wrapper
 
 .main
   margin 0 1rem
-
+  align-items flex-start
+  flex-flow column nowrap
 .hero
   display flex
   flex 1 1 100%