diff --git a/Ionic-Chatroom/www/index.html b/Ionic-Chatroom/www/index.html
index 3f24289..b645676 100644
--- a/Ionic-Chatroom/www/index.html
+++ b/Ionic-Chatroom/www/index.html
@@ -35,23 +35,22 @@
     <script src="js/controllers.js"></script>
   </head>
 
-  <body ng-app="chatRoom" ng-controller="AppCtrl">
-    <pane nav-router animation="slide-left-right-ios7">
-      <!-- 
-        The nav bar that will be updated as we navigate between views
-        Additional attributes set its look, nav-bar animation and icons
-        Icons provided by Ionicons: http://ionicons.com/ 
-      -->
-      <nav-bar type="bar-energized" 
-               animation="nav-title-slide-ios7" 
-               back-button-type="button-icon"></nav-bar>
-
-      <!-- 
-        The views will be rendered in the <nav-view> directive below
-        Templates are in the /templates folder (but you could also
-        have templates inline in this html file if you'd like).
-      -->
-      <nav-view></nav-view>
-    </pane>
+  <body ng-app="chatRoom" ng-controller="AppCtrl" animation="slide-left-right-ios7">
+    <!-- 
+      The nav bar that will be updated as we navigate between views
+      Additional attributes set its look, nav-bar animation and icons
+      Icons provided by Ionicons: http://ionicons.com/ 
+    -->
+    <nav-bar type="bar-energized" 
+             animation="nav-title-slide-ios7" 
+             back-button-type="button-icon"></nav-bar>
+
+    <!-- 
+      The views will be rendered in the <nav-view> directive below
+      Templates are in the /templates folder (but you could also
+      have templates inline in this html file if you'd like).
+    -->
+    <nav-view></nav-view>
+    
   </body>
 </html>
diff --git a/Ionic-Chatroom/www/templates/about.html b/Ionic-Chatroom/www/templates/about.html
index 1463e6b..109f17b 100644
--- a/Ionic-Chatroom/www/templates/about.html
+++ b/Ionic-Chatroom/www/templates/about.html
@@ -1,16 +1,14 @@
-<header-bar
+
+<view id="app-page" 
   title="'About'"
   left-buttons="leftButtons"
-  right-buttons="rightButtons"
-  type="bar-energized"
-  align-title="center">
-</header-bar>
+  right-buttons="rightButtons">
 
-<nav-page id="app-page">
   <content has-header="true" padding="true">
     <h3>About this app</h3>
     <p>
       This is a chat app originally created by <a href="http://3dd13.me">3dd13</a> then modified by <a href="https://github.com/mlynch">Max Lynch</a> and <a href="https://github.com/abeisgreat">Abe Haskins</a>.
     </p>
   </content>
-</nav-page>
\ No newline at end of file
+
+</view>
\ No newline at end of file
diff --git a/Ionic-Chatroom/www/templates/home.html b/Ionic-Chatroom/www/templates/home.html
index 69645c8..4b4f661 100644
--- a/Ionic-Chatroom/www/templates/home.html
+++ b/Ionic-Chatroom/www/templates/home.html
@@ -1,12 +1,9 @@
-<header-bar
-  title="'Home'"
+
+<view title="'Home'"
   left-buttons="leftButtons"
-  right-buttons="rightButtons"
-  type="bar-energized"
-  align-title="center">
-</header-bar>
-<view>
-  <content>
+  right-buttons="rightButtons">
+
+  <content has-header="true">
     <list>
       <item ng-repeat="room in rooms" type="item-text-wrap" href="#/rooms/{{room.id}}" ng-if="room.title">
         <h3>{{room.title}}</h3>
@@ -14,4 +11,5 @@ <h3>{{room.title}}</h3>
       </item>
     </list>
   </content>
-</nav-view>
+
+</view>
diff --git a/Ionic-Chatroom/www/templates/new_room.html b/Ionic-Chatroom/www/templates/new_room.html
index e14c692..aca9869 100644
--- a/Ionic-Chatroom/www/templates/new_room.html
+++ b/Ionic-Chatroom/www/templates/new_room.html
@@ -1,11 +1,9 @@
-<view>
-    <header-bar
-                title="'Create a Room'"
-                left-buttons="leftButtons"
-                right-buttons="rightButtons"
-                type="bar-energized"
-                align-title="center">
-    </header-bar>
+
+<view 
+    title="'Create a Room'"
+    left-buttons="leftButtons"
+    right-buttons="rightButtons">
+
     <content has-header="true">        
         <form ui-keypress="{13:'createRoom()'}">
             <div class="list list-inset">
@@ -23,4 +21,5 @@
             </div>
         </form>
     </content>
+
 </view>
diff --git a/Ionic-Chatroom/www/templates/room.html b/Ionic-Chatroom/www/templates/room.html
index f49ba3a..fa30312 100644
--- a/Ionic-Chatroom/www/templates/room.html
+++ b/Ionic-Chatroom/www/templates/room.html
@@ -1,18 +1,15 @@
-<header-bar
-  title="room.title"
+
+<view title="room.title" 
   left-buttons="leftButtons"
-  right-buttons="rightButtons"
-  type="bar-energized"
-  align-title="center">
-</header-bar>
+  right-buttons="rightButtons">
 
-<view title="room.title">
   <content
     scroll="true"
     on-refresh="onRefresh()"
     on-refresh-opening="onRefreshOpening(amount)"
     refresh-complete="refreshComplete"
     animate-nav="true"
+    has-header="true"
     >
 
     <div ng-repeat="message in messages | orderBy:'created_at'" type="item-text-wrap" ng-show="message.content">
@@ -36,4 +33,5 @@
       </form>
     </div>
   </div>
+
 </view>
\ No newline at end of file
