diff --git a/ionic/components/app/flex-order.scss b/ionic/components/app/flex-order.scss
index b11c08ae67..7965906ede 100644
--- a/ionic/components/app/flex-order.scss
+++ b/ionic/components/app/flex-order.scss
@@ -11,5 +11,5 @@ $flex-order-toolbar-top:         -10 !default;
 $flex-order-toolbar-bottom:      10 !default;
 
 
-$flex-order-tab-bar-top:         30 !default;
-$flex-order-tab-bar-bottom:      50 !default;
+$flex-order-tab-bar-top:         -30 !default;
+$flex-order-tab-bar-bottom:      30 !default;
diff --git a/ionic/components/app/structure.scss b/ionic/components/app/structure.scss
index 7fda5b1488..3de7b9c406 100644
--- a/ionic/components/app/structure.scss
+++ b/ionic/components/app/structure.scss
@@ -79,6 +79,7 @@ ion-pane {
 .content-container {
   position: relative;
   flex: 1;
+  order: $flex-order-view-content;
 }
 
 ion-toolbar {
@@ -91,7 +92,6 @@ ion-content {
   position: relative;
   display: block;
   flex: 1;
-  order: $flex-order-view-content;
 }
 
 .scroll-content {
diff --git a/ionic/components/tabs/test/tab-bar-top/main.html b/ionic/components/tabs/test/tab-bar-top/main.html
index 51294f22b0..4e9e174bcb 100644
--- a/ionic/components/tabs/test/tab-bar-top/main.html
+++ b/ionic/components/tabs/test/tab-bar-top/main.html
@@ -1,5 +1,5 @@
 
-<ion-tabs placement="top">
+<ion-tabs tab-bar-placement="top">
 
   <ion-tab tab-title="Tab 1">
     <ion-view nav-title="Tab 1">