diff --git a/demos/hn/main.html b/demos/hn/main.html
index ddd6495220..e3b49b7846 100644
--- a/demos/hn/main.html
+++ b/demos/hn/main.html
@@ -2,10 +2,10 @@
 </ion-nav>
 
 <style>
-.navbar-container {
+ion-navbar-section {
   background-color: #ff6600 !important;
 }
-.md .nav ion-title {
+.md ion-title {
   color: #fff !important;
 }
 </style>
diff --git a/demos/yerk/main.html b/demos/yerk/main.html
index 47ea1ee8af..1c54803ac4 100644
--- a/demos/yerk/main.html
+++ b/demos/yerk/main.html
@@ -1,7 +1,7 @@
 <ion-nav [root]="root"></ion-nav>
 
 <style>
-  .md .navbar-container {
+  .md ion-navbar-section {
     background-color: #2FD9BB !important;
   }
   .md .navbar-title {
diff --git a/ionic/components/app/structure.scss b/ionic/components/app/structure.scss
index ed04f4f4f2..59c3337175 100644
--- a/ionic/components/app/structure.scss
+++ b/ionic/components/app/structure.scss
@@ -8,8 +8,8 @@ $z-index-menu-backdrop:          79;
 $z-index-overlay:                1000;
 $z-index-click-block:            9999;
 
-$z-index-content-container:      5;
-$z-index-navbar-container:       10;
+$z-index-content-section:        5;
+$z-index-navbar-section:         10;
 
 $z-index-content:                5;
 $z-index-toolbar:                10;
@@ -131,19 +131,19 @@ ion-view {
   }
 }
 
-[no-navbar] > .navbar-container {
+[no-navbar] > ion-navbar-section {
   display: none;
 }
 
-.navbar-container {
+ion-navbar-section {
   position: relative;
   min-height: 4.4rem;
-  z-index: $z-index-navbar-container;
+  z-index: $z-index-navbar-section;
 }
 
-.content-container {
+ion-content-section {
   position: relative;
-  z-index: $z-index-content-container;
+  z-index: $z-index-content-section;
   flex: 1;
   order: $flex-order-view-content;
 }
diff --git a/ionic/components/nav-bar/modes/ios.scss b/ionic/components/nav-bar/modes/ios.scss
index 8bc6070550..d0d91f654b 100644
--- a/ionic/components/nav-bar/modes/ios.scss
+++ b/ionic/components/nav-bar/modes/ios.scss
@@ -5,6 +5,6 @@
 $navbar-ios-height:                        4.4rem !default;
 
 
-.navbar-container {
+ion-navbar-section {
   min-height: $navbar-ios-height;
 }
diff --git a/ionic/components/nav-bar/modes/md.scss b/ionic/components/nav-bar/modes/md.scss
index 28f0d1156a..7d0b997ba5 100644
--- a/ionic/components/nav-bar/modes/md.scss
+++ b/ionic/components/nav-bar/modes/md.scss
@@ -5,7 +5,7 @@
 $navbar-md-height:                  5.6rem !default;
 
 
-.navbar-container {
+ion-navbar-section {
   min-height: $navbar-md-height;
 }
 
diff --git a/ionic/components/nav/nav.ts b/ionic/components/nav/nav.ts
index 063eeb9ff6..26ed50f380 100644
--- a/ionic/components/nav/nav.ts
+++ b/ionic/components/nav/nav.ts
@@ -399,12 +399,12 @@ class ContentAnchor {
 @Component({
   selector: 'ion-pane',
   template:
-    '<section class="navbar-container">' +
+    '<ion-navbar-section>' +
       '<template navbar-anchor></template>' +
-    '</section>' +
-    '<section class="content-container">' +
+    '</ion-navbar-section>' +
+    '<ion-content-section>' +
       '<template content-anchor></template>' +
-    '</section>',
+    '</ion-content-section>',
   directives: [NavBarAnchor, ContentAnchor]
 })
 class Pane {
diff --git a/ionic/components/tabs/tabs.scss b/ionic/components/tabs/tabs.scss
index 1460808a0b..0c8c263f5d 100644
--- a/ionic/components/tabs/tabs.scss
+++ b/ionic/components/tabs/tabs.scss
@@ -42,16 +42,16 @@ ion-tab {
   }
 }
 
-ion-tabs > .navbar-container {
+ion-tabs > ion-navbar-section {
   order: $flex-order-tab-bar-navbar;
 }
 
-.tab-bar-container {
+ion-tab-bar-section {
   position: relative;
   order: $flex-order-tab-bar-bottom;
 }
 
-[tab-bar-placement=top] .tab-bar-container {
+[tab-bar-placement=top] ion-tab-bar-section {
   order: $flex-order-tab-bar-top;
 }
 
diff --git a/ionic/components/tabs/tabs.ts b/ionic/components/tabs/tabs.ts
index 8795338ce0..8fd1734f43 100644
--- a/ionic/components/tabs/tabs.ts
+++ b/ionic/components/tabs/tabs.ts
@@ -67,10 +67,10 @@ import * as dom from 'ionic/util/dom';
     'tabBarIcons': 'top'
   },
   template:
-    '<section class="navbar-container">' +
+    '<ion-navbar-section>' +
       '<template navbar-anchor></template>' +
-    '</section>' +
-    '<nav class="tab-bar-container">' +
+    '</ion-navbar-section>' +
+    '<ion-tab-bar-section>' +
       '<tab-bar role="tablist">' +
         '<a *ng-for="#t of tabs" [tab]="t" class="tab-button" role="tab">' +
           '<icon [name]="t.tabIcon" [is-active]="t.isSelected" class="tab-button-icon"></icon>' +
@@ -78,10 +78,10 @@ import * as dom from 'ionic/util/dom';
         '</a>' +
         '<tab-highlight></tab-highlight>' +
       '</tab-bar>' +
-    '</nav>' +
-    '<section class="content-container">' +
+    '</ion-tab-bar-section>' +
+    '<ion-content-section>' +
       '<ng-content></ng-content>' +
-    '</section>',
+    '</ion-content-section>',
   directives: [
     Icon,
     NgFor,
diff --git a/ionic/components/text-input/text-input.scss b/ionic/components/text-input/text-input.scss
index cb1eac4d56..3f0341ecf1 100644
--- a/ionic/components/text-input/text-input.scss
+++ b/ionic/components/text-input/text-input.scss
@@ -46,6 +46,8 @@ ion-input.has-focus [text-input] {
 
 ion-input input[scroll-assist] {
   display: inline-block;
+  padding: 0;
+  margin: 0;
   width: 1px;
   height: 1px;
   pointer-events: none;
diff --git a/ionic/components/text-input/text-input.ts b/ionic/components/text-input/text-input.ts
index 63cc6cf6c3..0f9c4d90cd 100644
--- a/ionic/components/text-input/text-input.ts
+++ b/ionic/components/text-input/text-input.ts
@@ -378,7 +378,7 @@ export class TextInputElement {
   }
 
   labelledBy(val) {
-    val && this.renderer.setElementAttribute(this.elementRef, 'aria-labelledby', val);
+    this.renderer.setElementAttribute(this.elementRef, 'aria-labelledby', val);
   }
 
   setFocus() {
diff --git a/ionic/platform/cordova.scss b/ionic/platform/cordova.scss
index 0f31e2b874..8da2fc7566 100644
--- a/ionic/platform/cordova.scss
+++ b/ionic/platform/cordova.scss
@@ -7,7 +7,7 @@
 
   // iOS Cordova
   // ------------
-  &.platform-ios .navbar-container,
+  &.platform-ios ion-navbar-section,
   &.platform-ios ion-navbar,
   &.platform-ios ion-menu > ion-toolbar {
     min-height: 64px;
diff --git a/ionic/transitions/md-transition.ts b/ionic/transitions/md-transition.ts
index d7789970d5..0c57769797 100644
--- a/ionic/transitions/md-transition.ts
+++ b/ionic/transitions/md-transition.ts
@@ -64,7 +64,7 @@ class MaterialTransition extends Transition {
 
     let viewLength = nav.length();
     if (nav.tabs && (viewLength === 1 || viewLength === 2)) {
-      let tabBarEle = nav.tabs.elementRef.nativeElement.querySelector('.tab-bar-container');
+      let tabBarEle = nav.tabs.elementRef.nativeElement.querySelector('ion-tab-bar-section');
       let tabBar = new Animation(tabBarEle);
 
       if (viewLength === 1 && opts.direction == 'back') {
diff --git a/scripts/snapshot/snapshot.config.js b/scripts/snapshot/snapshot.config.js
index c194fa2d30..0579fa27f9 100644
--- a/scripts/snapshot/snapshot.config.js
+++ b/scripts/snapshot/snapshot.config.js
@@ -11,7 +11,7 @@ exports.config = {
   specs: 'dist/e2e/**/*e2e.js',
   //specs: 'dist/e2e/tabs/**/*e2e.js',
 
-  sleepBetweenSpecs: 900,
+  sleepBetweenSpecs: 600,
 
   platformDefauls: {
     browser: 'chrome',