diff --git a/ionic/components/content/content.js b/ionic/components/content/content.js
index dff97dcd6c..dbb1a3db12 100644
--- a/ionic/components/content/content.js
+++ b/ionic/components/content/content.js
@@ -6,9 +6,9 @@ import {
 
 @Component({
   selector: 'ion-content',
-  hostProperties: {
-    contentClass: 'class.content'
-  }
+  // hostProperties: {
+  //   contentClass: 'class.content'
+  // }
 })
 @View({
   template: `
@@ -18,7 +18,7 @@ import {
 })
 export class Content {
   constructor() {
-    this.contentClass = true;
+    //this.contentClass = true;
     console.log('Content!');
   }
 }
diff --git a/ionic/components/nav/nav-base.js b/ionic/components/nav/nav-base.js
index 8147bb5439..2e183a0313 100644
--- a/ionic/components/nav/nav-base.js
+++ b/ionic/components/nav/nav-base.js
@@ -258,6 +258,14 @@ export class NavBase {
     return last && last.navItem && last.navItem._toolbars[pos] || [];
   }
 
+  get hideHeader() {
+    return !this.getToolbars('top').length;
+  }
+
+  get hideFooter() {
+    return !this.getToolbars('bottom').length;
+  }
+
   canSwipeBack() {
     return !!this.getPrevious(this.getActive());
   }
@@ -269,6 +277,7 @@ class NavStackItem {
   constructor(ComponentClass, params = {}) {
     this.Class = ComponentClass;
     this.params = params;
+    this.id = util.nextUid();
     this._setupPromise = new Promise((resolve) => {
       this._resolveSetup = resolve;
     });
diff --git a/ionic/components/nav/nav.js b/ionic/components/nav/nav.js
index cfe0378684..51894f8980 100644
--- a/ionic/components/nav/nav.js
+++ b/ionic/components/nav/nav.js
@@ -34,15 +34,13 @@ export class NavInjectable {}
 })
 @View({
   template: `
-  <header class="toolbar-container" [class.hide]="getToolbars('top').length == 0">
+  <header class="toolbar-container" [class.hide]="hideHeader">
     <div *for="#toolbar of getToolbars('top')" [toolbar-create]="toolbar"></div>
   </header>
   <section class="nav-item-container">
-    <div class="nav-item"
-         *for="#item of navItems"
-         [item]="item"></div>
+    <div class="nav-item" *for="#item of navItems" [item]="item"></div>
   </section>
-  <footer class="toolbar-container" [class.hide]="getToolbars('bottom').length == 0">
+  <footer class="toolbar-container" [class.hide]="hideFooter">
     <div *for="#toolbar of getToolbars('bottom')" [toolbar-create]="toolbar"></div>
   </footer>
   `,
diff --git a/ionic/components/nav/test/basic/pages/first-page.js b/ionic/components/nav/test/basic/pages/first-page.js
index 4809b4f890..459d8fde98 100644
--- a/ionic/components/nav/test/basic/pages/first-page.js
+++ b/ionic/components/nav/test/basic/pages/first-page.js
@@ -6,7 +6,7 @@ import {SecondPage} from 'pages/second-page'
 @Component()
 @View({
   templateUrl: 'pages/first-page.html',
-  directives: [Toolbar, Content]
+  directives: [Toolbar]
 })
 export class FirstPage {
   constructor(
diff --git a/ionic/components/nav/test/basic/pages/second-page.js b/ionic/components/nav/test/basic/pages/second-page.js
index 6a415405cf..4dab8e3cc6 100644
--- a/ionic/components/nav/test/basic/pages/second-page.js
+++ b/ionic/components/nav/test/basic/pages/second-page.js
@@ -6,7 +6,7 @@ import {ThirdPage} from 'pages/third-page'
 @Component()
 @View({
   templateUrl: 'pages/second-page.html',
-  directives: [Toolbar, Content]
+  directives: [Toolbar]
 })
 export class SecondPage {
   constructor(