diff --git a/ionic/components/item/test/buttons/main.html b/ionic/components/item/test/buttons/main.html
index e11cb28a7a..459d935d1c 100644
--- a/ionic/components/item/test/buttons/main.html
+++ b/ionic/components/item/test/buttons/main.html
@@ -1,87 +1,91 @@
 <ion-toolbar><ion-title>Items as Links/Buttons</ion-title></ion-toolbar>
 
-<a ion-item href="#" (click)="testClick($event)">
-  a[ion-item]
-</a>
+<ion-content>
 
-<a ion-item class="activated" href="#" (click)="testClick($event)">
-  a[ion-item].activated
-</a>
+  <a ion-item href="#" (click)="testClick($event)">
+    a[ion-item]
+  </a>
 
-<button ion-item (click)="testClick($event)">
-  button[ion-item]
-</button>
+  <a ion-item class="activated" href="#" (click)="testClick($event)">
+    a[ion-item].activated
+  </a>
 
-<button ion-item class="activated" (click)="testClick($event)">
-  button[ion-item].activated
-</button>
-
-<ion-item>
-  <button item-left (click)="testClick($event)">Default</button>
-  Inner Buttons
-  <button outline item-right (click)="testClick($event)">Outline</button>
-</ion-item>
-
-<ion-item>
-  <button item-left (click)="testClick($event)">
-    <icon home></icon>
-    Left Icon
+  <button ion-item (click)="testClick($event)">
+    button[ion-item]
   </button>
-  left icon buttons
-  <button outline item-right (click)="testClick($event)">
-    <icon star></icon>
-    Left Icon
-  </button>
-</ion-item>
 
-<ion-item>
-  <button item-left (click)="testClick($event)">
-    Right Icon
-    <icon home></icon>
+  <button ion-item class="activated" (click)="testClick($event)">
+    button[ion-item].activated
   </button>
-  right icon buttons
-  <button outline item-right (click)="testClick($event)">
-    Right Icon
-    <icon star></icon>
-  </button>
-</ion-item>
 
-<ion-item>
-  <button clear item-left (click)="testClick($event)">
-    <icon navigate></icon>
-  </button>
-  icon only buttons
-  <button clear item-right (click)="testClick($event)">
-    <icon navigate></icon>
-  </button>
-</ion-item>
+  <ion-item>
+    <button item-left (click)="testClick($event)">Default</button>
+    Inner Buttons
+    <button outline item-right (click)="testClick($event)">Outline</button>
+  </ion-item>
 
-<ion-item>
-  ion-item right icon/text button
-  <button item-right (click)="testClick($event)">
-    <icon refresh></icon>
-    Refresh
-  </button>
-</ion-item>
+  <ion-item>
+    <button item-left (click)="testClick($event)">
+      <icon home></icon>
+      Left Icon
+    </button>
+    left icon buttons
+    <button outline item-right (click)="testClick($event)">
+      <icon star></icon>
+      Left Icon
+    </button>
+  </ion-item>
 
-<ion-item>
-  <button clear item-left (click)="testClick($event)">
-    <icon settings></icon>
-    Settings
-  </button>
-  ion-item left clear button
-</ion-item>
+  <ion-item>
+    <button item-left (click)="testClick($event)">
+      Right Icon
+      <icon home></icon>
+    </button>
+    right icon buttons
+    <button outline item-right (click)="testClick($event)">
+      Right Icon
+      <icon star></icon>
+    </button>
+  </ion-item>
 
-<ion-item>
-  ion-item right clear button
-  <button secondary clear item-right (click)="testClick($event)">
-    Edit
-  </button>
-</ion-item>
+  <ion-item>
+    <button clear item-left (click)="testClick($event)">
+      <icon navigate></icon>
+    </button>
+    icon only buttons
+    <button clear item-right (click)="testClick($event)">
+      <icon navigate></icon>
+    </button>
+  </ion-item>
 
-<ion-item text-wrap>
-  This is multiline text that has a
-  long description of about how the text is really long
-  and a <a href="#" (click)="testClick($event)">link</a>.
-  <button outline item-right (click)="testClick($event)">View</button>
-</ion-item>
+  <ion-item>
+    ion-item right icon/text button
+    <button item-right (click)="testClick($event)">
+      <icon refresh></icon>
+      Refresh
+    </button>
+  </ion-item>
+
+  <ion-item>
+    <button clear item-left (click)="testClick($event)">
+      <icon settings></icon>
+      Settings
+    </button>
+    ion-item left clear button
+  </ion-item>
+
+  <ion-item>
+    ion-item right clear button
+    <button secondary clear item-right (click)="testClick($event)">
+      Edit
+    </button>
+  </ion-item>
+
+  <ion-item text-wrap>
+    This is multiline text that has a
+    long description of about how the text is really long
+    and a <a href="#" (click)="testClick($event)">link</a>.
+    <button outline item-right (click)="testClick($event)">View</button>
+  </ion-item>
+  
+</ion-content>
diff --git a/ionic/components/item/test/icons/main.html b/ionic/components/item/test/icons/main.html
index e23e172f74..e98b67a447 100644
--- a/ionic/components/item/test/icons/main.html
+++ b/ionic/components/item/test/icons/main.html
@@ -1,6 +1,6 @@
 <ion-toolbar><ion-title>Item Icons</ion-title></ion-toolbar>
 
-<ion-list>
+<ion-content>
 
   <ion-item detail-push>
     ion-item [detail-push] attr
@@ -67,4 +67,4 @@
     <item-badge item-right>99</item-badge>
   </ion-item>
 
-</ion-list>
+</ion-content>
diff --git a/ionic/components/item/test/images/main.html b/ionic/components/item/test/images/main.html
index 615d71962a..53fa230b4b 100644
--- a/ionic/components/item/test/images/main.html
+++ b/ionic/components/item/test/images/main.html
@@ -1,6 +1,6 @@
 <ion-toolbar><ion-title>Item Images</ion-title></ion-toolbar>
 
-<ion-list>
+<ion-content>
 
   <ion-item>
     Plain Ol' div w/ some text, no images
@@ -58,7 +58,7 @@
     <p>Paragraph text.</p>
   </ion-item>
 
-</ion-list>
+</ion-content>
 
 <style>
   img {
diff --git a/ionic/components/item/test/media/main.html b/ionic/components/item/test/media/main.html
index b3e4dc3923..9ff54689b5 100644
--- a/ionic/components/item/test/media/main.html
+++ b/ionic/components/item/test/media/main.html
@@ -1,12 +1,6 @@
 <ion-toolbar><ion-title>Item Media</ion-title></ion-toolbar>
 
-<!--
-  class="line-media"
-  class="line-none"
-  class="line-full"
--->
-
-<ion-list>
+<ion-content>
 
   <button ion-item>
     <ion-avatar item-left>
@@ -65,7 +59,7 @@
     <icon close-circle item-right></icon>
   </button>
 
-</ion-list>
+</ion-content>
 
 <style>
   img {
diff --git a/ionic/components/item/test/text/main.html b/ionic/components/item/test/text/main.html
index 202a8ee16a..743497bd21 100644
--- a/ionic/components/item/test/text/main.html
+++ b/ionic/components/item/test/text/main.html
@@ -2,60 +2,56 @@
 
 <ion-content class="outer-content">
 
-  <ion-list>
+  <ion-item>
+    Plain Ol' div with some text
+  </ion-item>
 
-    <ion-item>
-      Plain Ol' div with some text
-    </ion-item>
+  <ion-item>
+    Single line text that should have ellipses when it doesn't all fit in the item
+  </ion-item>
 
-    <ion-item>
-      Single line text that should have ellipses when it doesn't all fit in the item
-    </ion-item>
+  <ion-item no-lines>
+    Single line item with no lines
+  </ion-item>
 
-    <ion-item no-lines>
-      Single line item with no lines
-    </ion-item>
+  <ion-item text-wrap>
+    Multiline text that should wrap when it is too long
+    to fit on one line in the item. Attribute on .item
+  </ion-item>
 
-    <ion-item text-wrap>
-      Multiline text that should wrap when it is too long
-      to fit on one line in the item. Attribute on .item
-    </ion-item>
+  <ion-item text-wrap>
+    <h1>H1 Title Text</h1>
+    <p>Paragraph line 1</p>
+  </ion-item>
 
-    <ion-item text-wrap>
-      <h1>H1 Title Text</h1>
-      <p>Paragraph line 1</p>
-    </ion-item>
+  <ion-item text-wrap>
+    <h2>H2 Title Text</h2>
+    <p>Paragraph line 1</p>
+  </ion-item>
 
-    <ion-item text-wrap>
-      <h2>H2 Title Text</h2>
-      <p>Paragraph line 1</p>
-    </ion-item>
+  <ion-item text-wrap>
+    <h3>H3 Title Text</h3>
+    <p>Paragraph line 1</p>
+    <p>Paragraph line 2</p>
+  </ion-item>
 
-    <ion-item text-wrap>
-      <h3>H3 Title Text</h3>
-      <p>Paragraph line 1</p>
-      <p>Paragraph line 2</p>
-    </ion-item>
+  <ion-item text-wrap>
+    <h4>H4 Title Text</h4>
+    <p>Paragraph line 1</p>
+    <p>Paragraph line 2</p>
+    <p>Paragraph line 3</p>
+  </ion-item>
 
-    <ion-item text-wrap>
-      <h4>H4 Title Text</h4>
-      <p>Paragraph line 1</p>
-      <p>Paragraph line 2</p>
-      <p>Paragraph line 3</p>
-    </ion-item>
-
-    <ion-item>
-      <ion-item-content>
-        Column 1
-      </ion-item-content>
-      <ion-item-content>
-        Column 2
-      </ion-item-content>
-      <ion-item-content>
-        Column 3
-      </ion-item-content>
-    </ion-item>
-
-  </ion-list>
+  <ion-item>
+    <ion-item-content>
+      Column 1
+    </ion-item-content>
+    <ion-item-content>
+      Column 2
+    </ion-item-content>
+    <ion-item-content>
+      Column 3
+    </ion-item-content>
+  </ion-item>
 
 </ion-content>