diff --git a/demos/action-sheet/main.html b/demos/action-sheet/main.html
index 0bd9c249f9..2edfbc70c4 100644
--- a/demos/action-sheet/main.html
+++ b/demos/action-sheet/main.html
@@ -2,6 +2,7 @@
   <ion-title>Action Sheet</ion-title>
 </ion-navbar>
 
-<ion-content padding>
-  <button full block (click)="present()">Open Action Sheet</button>    
+<ion-content>
+  <button block (click)="present()">Basic Action Sheet</button>
+  <button block secondary (click)="present()">Custom Animation Action Sheet</button>
 </ion-content>
diff --git a/demos/checkbox/main.html b/demos/checkbox/main.html
index 7e147a9f04..66b3e9e555 100644
--- a/demos/checkbox/main.html
+++ b/demos/checkbox/main.html
@@ -1,6 +1,6 @@
-<ion-navbar *navbar>
+<ion-toolbar>
   <ion-title>Checkbox</ion-title>
-</ion-navbar>
+</ion-toolbar>
 
 <ion-content>
   <ion-list>
diff --git a/demos/hide-when/main.html b/demos/hide-when/main.html
index b8e0cdf306..276139286a 100644
--- a/demos/hide-when/main.html
+++ b/demos/hide-when/main.html
@@ -1,6 +1,6 @@
-<ion-navbar *navbar>
+<ion-toolbar>
   <ion-title>HideWhen</ion-title>
-</ion-navbar>
+</ion-toolbar>
 
 <ion-content class="hide-when-demo">
   <h5 margin>Hide Icon Per Platform</h5>
diff --git a/demos/label/main.html b/demos/label/main.html
index 6bf2cc2b70..96bf6cbbd0 100644
--- a/demos/label/main.html
+++ b/demos/label/main.html
@@ -1,6 +1,6 @@
-<ion-navbar *navbar>
+<ion-toolbar>
   <ion-title>Label</ion-title>
-</ion-navbar>
+</ion-toolbar>
 
 <ion-content class="label-demo">
   <ion-list>
diff --git a/demos/list/main.html b/demos/list/main.html
index 995d4864f8..bc8002d8bf 100644
--- a/demos/list/main.html
+++ b/demos/list/main.html
@@ -1,4 +1,3 @@
-
 <ion-toolbar>
   <ion-title>List</ion-title>
 </ion-toolbar>
diff --git a/demos/local-storage/main.html b/demos/local-storage/main.html
index f1987a7ba4..594c573cd7 100644
--- a/demos/local-storage/main.html
+++ b/demos/local-storage/main.html
@@ -1,6 +1,7 @@
-<ion-navbar *navbar>
+<ion-toolbar>
   <ion-title>Local Storage</ion-title>
-</ion-navbar>
+</ion-toolbar>
+
 
 <ion-content class="local-storage-demo outer-content">
 
diff --git a/demos/platform/main.html b/demos/platform/main.html
index 8bb28195c0..436ec47ca1 100644
--- a/demos/platform/main.html
+++ b/demos/platform/main.html
@@ -1,6 +1,6 @@
-<ion-navbar *navbar>
+<ion-toolbar>
   <ion-title>Platform</ion-title>
-</ion-navbar>
+</ion-toolbar>
 
 <ion-content class="platform-demo">
   <p margin class="note">Change Devices to Update the Platform Values</p>
diff --git a/demos/radio/main.html b/demos/radio/main.html
index 4e57b86f4c..dcf9b4185b 100644
--- a/demos/radio/main.html
+++ b/demos/radio/main.html
@@ -1,10 +1,6 @@
-<ion-navbar *navbar>
-
-  <ion-title>
-    Radio
-  </ion-title>
-
-</ion-navbar>
+<ion-toolbar>
+  <ion-title>Radio</ion-title>
+</ion-toolbar>
 
 <ion-content>
   <ion-list radio-group>
diff --git a/demos/refresher/main.html b/demos/refresher/main.html
index 4f4f0f88dd..035ae5a976 100644
--- a/demos/refresher/main.html
+++ b/demos/refresher/main.html
@@ -1,6 +1,7 @@
-<ion-navbar *navbar>
+<ion-toolbar>
   <ion-title>Refresher</ion-title>
-</ion-navbar>
+</ion-toolbar>
+
 
 <ion-content>
   <ion-refresher (starting)="doStarting()" (refresh)="doRefresh($event, refresher)" (pulling)="doPulling($event, amt)">
diff --git a/demos/scroll/main.html b/demos/scroll/main.html
index f52f694aae..d9c8e1500c 100644
--- a/demos/scroll/main.html
+++ b/demos/scroll/main.html
@@ -1,10 +1,7 @@
-<ion-navbar *navbar>
+<ion-toolbar>
+  <ion-title>Scroll</ion-title>
+</ion-toolbar>
 
-  <ion-title>
-    Scroll
-  </ion-title>
-
-</ion-navbar>
 
 <ion-content>
 
diff --git a/demos/segment/main.html b/demos/segment/main.html
index bf60aa5556..651281a62c 100644
--- a/demos/segment/main.html
+++ b/demos/segment/main.html
@@ -1,10 +1,7 @@
-<ion-navbar *navbar hideBackButton class="android-attr">
+<ion-toolbar>
+  <ion-title>Segment</ion-title>
+</ion-toolbar>
 
-  <ion-title>
-    Segment
-  </ion-title>
-
-</ion-navbar>
 
 <ion-toolbar [attr.primary]="isAndroid ? '' : null">
   <ion-segment [(ngModel)]="pet" [attr.light]="isAndroid ? '' : null">
@@ -112,4 +109,3 @@
 
 
 </ion-content>
-
diff --git a/demos/show-when/app.html b/demos/show-when/app.html
deleted file mode 100644
index 776be9a94a..0000000000
--- a/demos/show-when/app.html
+++ /dev/null
@@ -1 +0,0 @@
-<ion-nav id="nav" [root]="rootPage" #content></ion-nav>
diff --git a/demos/show-when/main.html b/demos/show-when/main.html
index 9a9cb35887..34de682560 100644
--- a/demos/show-when/main.html
+++ b/demos/show-when/main.html
@@ -1,6 +1,6 @@
-<ion-navbar *navbar>
+<ion-toolbar>
   <ion-title>ShowWhen</ion-title>
-</ion-navbar>
+</ion-toolbar>
 
 <ion-content class="show-when-demo">
   <h5 margin>Show Icon Per Platform</h5>
diff --git a/demos/toggle/main.html b/demos/toggle/main.html
index 6585c289de..bff709b020 100644
--- a/demos/toggle/main.html
+++ b/demos/toggle/main.html
@@ -1,6 +1,6 @@
-<ion-navbar *navbar>
+<ion-toolbar>
   <ion-title>Toggle</ion-title>
-</ion-navbar>
+</ion-toolbar>
 
 <ion-content>
   <ion-list>
diff --git a/demos/toolbar/main.html b/demos/toolbar/main.html
index 4c659710d6..fca2eb6c25 100644
--- a/demos/toolbar/main.html
+++ b/demos/toolbar/main.html
@@ -1,9 +1,9 @@
-<ion-navbar *navbar>
+<ion-toolbar>
   <ion-title>Toolbar</ion-title>
-</ion-navbar>
+</ion-toolbar>
 
 <ion-content>
-  
+
   <ion-toolbar>
     <ion-title>This is the title that never ends. It just goes on and on my friend.</ion-title>
   </ion-toolbar>