diff --git a/test/buttons.html b/test/buttons.html
index 23e6d89f4b..37485aafdf 100644
--- a/test/buttons.html
+++ b/test/buttons.html
@@ -1,4 +1,4 @@
-<html>
+<html ng-app="ionicApp">
   <head>
     <meta charset="utf-8">
     <title>Buttons</title>
@@ -17,6 +17,16 @@
       filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#00000000', endColorstr='#a6000000',GradientType=1 ); /* IE6-9 */
     }
     </style>
+    <script src="../dist/js/ionic.js"></script>
+    <script src="../dist/js/angular/angular.js"></script>
+    <script src="../dist/js/angular/angular-sanitize.js"></script>
+    <script src="../dist/js/angular/angular-animate.js"></script>
+    <script src="../dist/js/angular/angular-touch.js"></script>
+    <script src="../dist/js/angular-ui/angular-ui-router.js"></script>
+    <script src="../dist/js/ionic-angular.js"></script>
+    <script>
+      angular.module('ionicApp', ['ionic'])
+    </script>
   </head>
   <body>
 
@@ -24,7 +34,7 @@
       <h1 class="title">Buttons</h1>
     </header>
 
-    <main class="content has-header overflow-scroll">
+    <content class="has-header">
 
       <div class="padding">
 
@@ -137,8 +147,8 @@
         <h3>button.button.button-small</h3>
         <p>
           <button class="button button-small"><i class="icon ion-home"></i> Default</button>
-          <button class="button button-small button-light"><i class="icon ion-home"></i> .button-light</button>
-          <button class="button button-small button-stable"><i class="icon ion-home"></i> .button-stable</button>
+          <button class="button button-small button-light"><i class="icon ion-home"></i></button>
+          <button class="button button-small button-stable">.button-stable</button>
           <button class="button button-small button-balanced"><i class="icon ion-home"></i> .button-balanced</button>
           <button class="button button-small button-positive"><i class="icon ion-home"></i></button>
           <button class="button button-small button-calm">.button-calm</button>
@@ -439,7 +449,7 @@
 
       <hr>
 
-    </main>
+    </content>
 
   </body>
 </html>
diff --git a/test/headers.html b/test/headers.html
index 02b7b9f158..946ee3ed33 100644
--- a/test/headers.html
+++ b/test/headers.html
@@ -1,4 +1,4 @@
-<html>
+<html ng-app="ionicApp">
   <head>
     <meta charset="utf-8">
     <title>Header</title>
@@ -12,11 +12,20 @@
         top: 0;
       }
     </style>
-
+    <script src="../dist/js/ionic.js"></script>
+    <script src="../dist/js/angular/angular.js"></script>
+    <script src="../dist/js/angular/angular-sanitize.js"></script>
+    <script src="../dist/js/angular/angular-animate.js"></script>
+    <script src="../dist/js/angular/angular-touch.js"></script>
+    <script src="../dist/js/angular-ui/angular-ui-router.js"></script>
+    <script src="../dist/js/ionic-angular.js"></script>
+    <script>
+      angular.module('ionicApp', ['ionic'])
+    </script>
   </head>
   <body>
 
-    <section class="content overflow-scroll">
+    <content>
 
       <header class="bar bar-header">
         <a class="button" href="index.html">Back</a>
@@ -48,8 +57,20 @@
         </a>
       </header>
 
+      <header class="bar bar-header bar-royal">
+        <a class="button button-clear icon ion-ios7-alarm"> Back</a>
+        <div class="button-bar">
+          <a class="button button-calm">First</a>
+          <a class="button">Second</a>
+          <a class="button">Third</a>
+        </div>
+        <a class="button">
+          <i class="icon ion-star"></i> Favorites
+        </a>
+      </header>
+
       <header class="bar bar-header bar-positive">
-        <a class="button button-clear icon ion-ios7-arrow-left"> Back</a>
+        <a class="button button-clear icon ion-ios7-arrow-back"> Back</a>
         <div class="button-bar">
           <a class="button button-calm">First</a>
           <a class="button">Second</a>
@@ -204,7 +225,7 @@
         </a>
       </header>
 
-    </section>
+    </content>
 
   </body>
 </html>
diff --git a/test/lists.html b/test/lists.html
index 12419227e3..2eefb27636 100644
--- a/test/lists.html
+++ b/test/lists.html
@@ -1,4 +1,4 @@
-<html>
+<html ng-app="ionicApp">
   <head>
     <meta charset="utf-8">
     <title>Lists</title>
@@ -13,6 +13,16 @@
         overflow: hidden;
       }
     </style>
+    <script src="../dist/js/ionic.js"></script>
+    <script src="../dist/js/angular/angular.js"></script>
+    <script src="../dist/js/angular/angular-sanitize.js"></script>
+    <script src="../dist/js/angular/angular-animate.js"></script>
+    <script src="../dist/js/angular/angular-touch.js"></script>
+    <script src="../dist/js/angular-ui/angular-ui-router.js"></script>
+    <script src="../dist/js/ionic-angular.js"></script>
+    <script>
+      angular.module('ionicApp', ['ionic'])
+    </script>
   </head>
   <body class="ionic-pseudo">
 
@@ -21,7 +31,7 @@
     </header>
 
     <div id="list">
-    <main id="content" class="content has-header overflow-scroll">
+    <content id="content" class="has-header">
 
       <div class="list">
 
@@ -518,7 +528,7 @@
           <a class="item item-dark" href="#">item-dark</a>
         </div>
 
-    </main>
+    </content>
   </div>
 
 
diff --git a/test/tab-bars-icons-bottom.html b/test/tab-bars-icons-bottom.html
index 37e4911a51..a378668b3c 100644
--- a/test/tab-bars-icons-bottom.html
+++ b/test/tab-bars-icons-bottom.html
@@ -23,7 +23,7 @@
         <li><a href="tab-bars-icons-right.html">Icons Right</a></li>
         <li><a href="tab-bars-no-icons.html">No Icons</a></li>
         <li><a href="tab-bars-only-icons.html">Only Icons</a></li>
-        <li><a href="index.html">Homepage</a></li>
+        <li><a href="./">Homepage</a></li>
       </ul>
 
     </main>
diff --git a/test/tab-bars-icons-left.html b/test/tab-bars-icons-left.html
index 51733af3cd..82d36e74e0 100644
--- a/test/tab-bars-icons-left.html
+++ b/test/tab-bars-icons-left.html
@@ -23,7 +23,7 @@
         <li><a href="tab-bars-icons-right.html">Icons Right</a></li>
         <li><a href="tab-bars-no-icons.html">No Icons</a></li>
         <li><a href="tab-bars-only-icons.html">Only Icons</a></li>
-        <li><a href="index.html">Homepage</a></li>
+        <li><a href="./">Homepage</a></li>
       </ul>
 
     </main>
diff --git a/test/tab-bars-icons-right.html b/test/tab-bars-icons-right.html
index f2d0c6e24f..598616f1bf 100644
--- a/test/tab-bars-icons-right.html
+++ b/test/tab-bars-icons-right.html
@@ -23,7 +23,7 @@
         <li><a href="tab-bars-icons-right.html">Icons Right</a></li>
         <li><a href="tab-bars-no-icons.html">No Icons</a></li>
         <li><a href="tab-bars-only-icons.html">Only Icons</a></li>
-        <li><a href="index.html">Homepage</a></li>
+        <li><a href="./">Homepage</a></li>
       </ul>
 
     </main>
diff --git a/test/tab-bars-no-icons.html b/test/tab-bars-no-icons.html
index fb9350c1aa..116043cf01 100644
--- a/test/tab-bars-no-icons.html
+++ b/test/tab-bars-no-icons.html
@@ -23,7 +23,7 @@
         <li><a href="tab-bars-icons-right.html">Icons Right</a></li>
         <li><a href="tab-bars-no-icons.html">No Icons</a></li>
         <li><a href="tab-bars-only-icons.html">Only Icons</a></li>
-        <li><a href="index.html">Homepage</a></li>
+        <li><a href="./">Homepage</a></li>
       </ul>
 
     </main>
diff --git a/test/tab-bars-only-icons.html b/test/tab-bars-only-icons.html
index 757cb92459..d4ea1c34f5 100644
--- a/test/tab-bars-only-icons.html
+++ b/test/tab-bars-only-icons.html
@@ -23,7 +23,7 @@
         <li><a href="tab-bars-icons-right.html">Icons Right</a></li>
         <li><a href="tab-bars-no-icons.html">No Icons</a></li>
         <li><a href="tab-bars-only-icons.html">Only Icons</a></li>
-        <li><a href="index.html">Homepage</a></li>
+        <li><a href="./">Homepage</a></li>
       </ul>
 
     </main>
diff --git a/test/tab-bars.html b/test/tab-bars.html
index 1b296ad754..b7c5aa763e 100644
--- a/test/tab-bars.html
+++ b/test/tab-bars.html
@@ -23,7 +23,7 @@
         <li><a href="tab-bars-icons-right.html">Icons Right</a></li>
         <li><a href="tab-bars-no-icons.html">No Icons</a></li>
         <li><a href="tab-bars-only-icons.html">Only Icons</a></li>
-        <li><a href="index.html">Homepage</a></li>
+        <li><a href="./">Homepage</a></li>
       </ul>
 
     </main>
diff --git a/test/type.html b/test/type.html
index 8dc853ad13..5d4ad295de 100644
--- a/test/type.html
+++ b/test/type.html
@@ -13,7 +13,7 @@
       <h1 class="title">Type</h1>
     </header>
 
-    <main class="content padding has-header">
+    <main class="content padding has-header" style="margin-top: 80px">
       <h1>I'm an H1 Element</h1>
       <h2>I'm an H2 Element</h2>
       <h3>I'm an H3 Element</h3>
