diff --git a/demos/segment/main.html b/demos/segment/main.html
index d4efbabfff..bf60aa5556 100644
--- a/demos/segment/main.html
+++ b/demos/segment/main.html
@@ -7,7 +7,7 @@
 </ion-navbar>
 
 <ion-toolbar [attr.primary]="isAndroid ? '' : null">
-  <ion-segment [(ngModel)]="pet">
+  <ion-segment [(ngModel)]="pet" [attr.light]="isAndroid ? '' : null">
     <ion-segment-button value="puppies">
       Puppies
     </ion-segment-button>
@@ -17,7 +17,7 @@
     <ion-segment-button value="ducklings">
       Ducklings
     </ion-segment-button>
-  </ion-segment> 
+  </ion-segment>
 </ion-toolbar>
 
 
@@ -110,6 +110,6 @@
     </ion-list>
   </div>
 
-  
-</ion-content> 
+
+</ion-content>
 
diff --git a/demos/toggle/app.html b/demos/toggle/app.html
index 5f6bb33d68..776be9a94a 100644
--- a/demos/toggle/app.html
+++ b/demos/toggle/app.html
@@ -1,2 +1 @@
 <ion-nav id="nav" [root]="rootPage" #content></ion-nav>
-<ion-overlay></ion-overlay>
\ No newline at end of file
diff --git a/demos/toggle/main.html b/demos/toggle/main.html
index 58c2b472d4..6585c289de 100644
--- a/demos/toggle/main.html
+++ b/demos/toggle/main.html
@@ -4,53 +4,67 @@
 
 <ion-content>
   <ion-list>
-    <ion-toggle value="foo" checked="true">
-      Frodo Baggins
-    </ion-toggle>
 
-    <ion-toggle energized>
-      Sam
-    </ion-toggle>
+    <ion-item>
+      <ion-label>Frodo Baggins</ion-label>
+      <ion-toggle value="foo" checked="true"></ion-toggle>
+    </ion-item>
 
-    <ion-toggle danger checked="true">
-      Éowyn
-    </ion-toggle>
+    <ion-item>
+      <ion-label>Sam</ion-label>
+      <ion-toggle energized></ion-toggle>
+    </ion-item>
 
-    <ion-toggle royal checked="true">
-      Legolas
-    </ion-toggle>
+    <ion-item>
+      <ion-label> Éowyn</ion-label>
+      <ion-toggle danger checked="true"></ion-toggle>
+    </ion-item>
 
-    <ion-toggle danger>
-      Gimli
-    </ion-toggle>
+    <ion-item>
+      <ion-label>Legolas
+      </ion-label>
+      <ion-toggle royal checked="true"></ion-toggle>
+    </ion-item>
 
-    <ion-toggle dark checked="true">
-      Saruman
-    </ion-toggle>
+    <ion-item>
+      <ion-label>Gimli</ion-label>
+      <ion-toggle danger></ion-toggle>
+    </ion-item>
 
-    <ion-toggle energized checked="true">
-      Gandalf
-    </ion-toggle>
+    <ion-item>
+      <ion-label>Saruman</ion-label>
+      <ion-toggle dark checked="true"></ion-toggle>
+    </ion-item>
 
-    <ion-toggle royal>
-      Arwen
-    </ion-toggle>
+    <ion-item>
+      <ion-label>Gandalf</ion-label>
+      <ion-toggle energized checked="true"></ion-toggle>
+    </ion-item>
 
-    <ion-toggle secondary checked="true">
-      Treebeard
-    </ion-toggle>
+    <ion-item>
+      <ion-label>Arwen</ion-label>
+      <ion-toggle royal></ion-toggle>
+    </ion-item>
 
-    <ion-toggle royal>
-      Boromir
-    </ion-toggle>
+    <ion-item>
+      <ion-label>Treebeard</ion-label>
+      <ion-toggle secondary checked="true"></ion-toggle>
+    </ion-item>
 
-    <ion-toggle dark checked="true">
-      Gollum
-    </ion-toggle>
+    <ion-item>
+      <ion-label>Boromir</ion-label>
+      <ion-toggle royal></ion-toggle>
+    </ion-item>
 
-    <ion-toggle energized>
-      Galadriel
-    </ion-toggle>
+    <ion-item>
+      <ion-label>Gollum</ion-label>
+      <ion-toggle dark checked="true"></ion-toggle>
+    </ion-item>
+
+    <ion-item>
+      <ion-label>Galadriel</ion-label>
+      <ion-toggle energized></ion-toggle>
+    </ion-item>
 
 
   </ion-list>
diff --git a/demos/toolbar/app.html b/demos/toolbar/app.html
index 5f6bb33d68..776be9a94a 100644
--- a/demos/toolbar/app.html
+++ b/demos/toolbar/app.html
@@ -1,2 +1 @@
 <ion-nav id="nav" [root]="rootPage" #content></ion-nav>
-<ion-overlay></ion-overlay>
\ No newline at end of file