diff --git a/js/ext/angular/test/viewState.html b/js/ext/angular/test/viewState.html
index e6a3d5931d..d5a85994dc 100644
--- a/js/ext/angular/test/viewState.html
+++ b/js/ext/angular/test/viewState.html
@@ -1,10 +1,10 @@
 <html ng-app="navState">
   <head>
     <meta charset="utf-8">
-    <title>Nav State</title>
-
-    <!-- Sets initial viewport load and disables zooming  -->
     <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
+    
+    <title>navViews and tabs w/ nested navViews</title>
+
     <link rel="stylesheet" href="../../../../dist/css/ionic.css">
     <script src="../../../../dist/js/ionic.js"></script>
     <script src="../../../../dist/js/angular/angular.js"></script>
@@ -14,9 +14,6 @@
     <script src="../../../../dist/js/angular/angular-sanitize.js"></script>
     <script src="../../../../dist/js/angular-ui/angular-ui-router.js"></script>
     <script src="../../../../dist/js/ionic-angular.js"></script>
-    <style>
-      
-    </style>
   </head>
   <body>
 
@@ -162,11 +159,6 @@
           <h2>{{ auto.year }} {{ auto.make }} {{ auto.model }}</h2>
           <p ng-bind="auto.desc"></p>
           <p><a class="button" ng-href="{{ auto.url }}">Read More</a></p>
-          <!--<ul>
-            <li ng-repeat="auto in autos">
-              <a ng-href="#/tabs/autos/{{ $index }}">{{ auto.year }} {{ auto.make }} {{ auto.model }}</a>
-            </li>
-          </ul>-->
           <ul>
             <li>
               <a ng-href="#/tabs/autos/0" class="ng-binding" href="#/tabs/autos/0">1936 Cord 810</a>
diff --git a/js/ext/angular/test/viewState2.html b/js/ext/angular/test/viewState2.html
new file mode 100644
index 0000000000..fe80b91bf1
--- /dev/null
+++ b/js/ext/angular/test/viewState2.html
@@ -0,0 +1,232 @@
+<html ng-app="navState">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
+
+    <title>Tabs at the root w/ navView in each tab</title>
+
+    <link rel="stylesheet" href="../../../../dist/css/ionic.css">
+    <script src="../../../../dist/js/ionic.js"></script>
+    <script src="../../../../dist/js/angular/angular.js"></script>
+    <script src="../../../../dist/js/angular/angular-animate.js"></script>
+    <script src="../../../../dist/js/angular/angular-route.js"></script>
+    <script src="../../../../dist/js/angular/angular-touch.js"></script>
+    <script src="../../../../dist/js/angular/angular-sanitize.js"></script>
+    <script src="../../../../dist/js/angular-ui/angular-ui-router.js"></script>
+    <script src="../../../../dist/js/ionic-angular.js"></script>
+  </head>
+  <body>
+
+    <nav-bar animation="nav-title-slide-ios7" 
+             type="bar-positive" 
+             back-button-type="button-icon" 
+             back-button-icon="ion-arrow-left-c"></nav-bar>
+
+    <tabs tabs-style="tabs-icon-top" tabs-type="tabs-positive">
+
+      <tab title="Automobiles" icon="ion-model-s" href="#/autos">
+        <nav-view name="auto-ui-view"></nav-view>
+      </tab>
+
+      <tab title="Add" icon="ion-plus-circled" href="#/add-auto">
+        <nav-view name="add-autos-ui-view"></nav-view>
+      </tab>
+
+      <tab title="About" icon="ion-ios7-world" ui-sref="about">
+        <nav-view name="about-ui-view"></nav-view>
+      </tab>
+
+    </tabs>
+
+
+    <script id="auto-list.html" type="text/ng-template">
+      <view title="'Auto List'">
+        <content has-header="true" has-tabs="true">
+          <list>
+            <item ng-repeat="auto in autos" ng-href="#/autos/{{ $index }}">
+              {{ auto.year }} {{ auto.make }} {{ auto.model }}
+            </item>
+          </list>
+          <p>
+            <button ng-click="testStateGo()">Test State Go</button>
+          </p>
+          <p>
+            Current View: {{ $viewHistory.currentView }}<br>
+            Back View: {{ $viewHistory.backView }}<br>
+            Forward View: {{ $viewHistory.forwardView }}
+          </p>
+        </content>
+      </view>
+    </script>
+
+    <script id="auto-detail.html" type="text/ng-template">
+      <view title="'Auto Details'">
+        <content has-header="true" has-tabs="true" padding="true">
+          <h2>{{ auto.year }} {{ auto.make }} {{ auto.model }}</h2>
+          <p ng-bind="auto.desc"></p>
+          <p><a class="button" ng-href="{{ auto.url }}">Read More</a></p>
+          <ul>
+            <li>
+              <a ng-href="#/autos/0" class="ng-binding" href="#/autos/0">1936 Cord 810</a>
+            </li><li>
+              <a ng-href="#/autos/1" class="ng-binding" href="#/autos/1">1981 DeLorean DMC-12</a>
+            </li><li>
+              <a ng-href="#/autos/2" class="ng-binding" href="#/autos/2">1933 Duesenberg Model SJ</a>
+            </li><li>
+              <a ng-href="#/autos/3" class="ng-binding" href="#/autos/3">1951 Hudson Hornet</a>
+            </li><li>
+              <a ng-href="#/autos/4" class="ng-binding" href="#/autos/4">1965 Shelby Cobra</a>
+            </li><li>
+              <a ng-href="#/autos/5" class="ng-binding" href="#/autos/5">2008 Tesla Roadster</a>
+            </li><li>
+              <a ng-href="#/autos/6" class="ng-binding" href="#/autos/6">1948 Tucker 48</a>
+            </li>
+          </ul>
+          <p>
+            Current View: {{ $viewHistory.currentView }}<br>
+            Back View: {{ $viewHistory.backView }}<br>
+            Forward View: {{ $viewHistory.forwardView }}
+          </p>
+        </content>
+      </view>
+    </script>
+
+    <script id="add-auto.html" type="text/ng-template">
+      <view title="'Add Auto'">
+        <content has-header="true" has-tabs="true">
+          
+          <div class="list">
+            <label class="item item-input">
+              <input type="text" placeholder="Make">
+            </label>
+            <label class="item item-input">
+              <input type="text" placeholder="Model">
+            </label>
+            <label class="item item-input">
+              <input type="text" placeholder="Year">
+            </label>
+            <label class="item item-input">
+              <textarea placeholder="Description"></textarea>
+            </label>
+          </div>
+
+          <div class="padding">
+            <p>
+              Current View: {{ $viewHistory.currentView }}<br>
+              Back View: {{ $viewHistory.backView }}<br>
+              Forward View: {{ $viewHistory.forwardView }}
+            </p>
+          </div>
+        </content>
+      </view>
+    </script>
+
+    <script id="about.html" type="text/ng-template">
+      <view title="'About'">
+        <content has-header="true" has-tabs="true" padding="true">
+          <h3>About this app!</h3>
+          <p>
+            Current View: {{ $viewHistory.currentView }}<br>
+            Back View: {{ $viewHistory.backView }}<br>
+            Forward View: {{ $viewHistory.forwardView }}
+          </p>
+        </content>
+      </view>
+    </script>
+
+    <script>
+      angular.module('navState', ['ionic'])
+
+
+      .config(function($stateProvider, $urlRouterProvider) {
+      
+        $stateProvider
+          .state('autolist', {
+            url: "/autos",
+            views: {
+              'auto-ui-view': {
+                templateUrl: "auto-list.html",
+                controller: 'AutoListCtrl'
+              }
+            }
+          })
+          .state('addauto', {
+            url: "/add-auto",
+            views: {
+              'add-autos-ui-view': {
+                templateUrl: "add-auto.html",
+                controller: 'AutoAddCtrl'
+              }
+            }
+          })
+          .state('autodetail', {
+            url: "/autos/:id",
+            views: {
+              'auto-ui-view': {
+                templateUrl: "auto-detail.html",
+                controller: 'AutoDetailCtrl'
+              }
+            }
+          })
+          .state('about', {
+            url: "/about",
+            views: {
+              'about-ui-view': {
+                templateUrl: "about.html"
+              }
+            }
+          });
+
+         $urlRouterProvider.otherwise("/autos");
+
+      })
+
+      .controller('SignInCtrl', function($scope, $state) {
+        //console.log('SignInCtrl');
+
+        $scope.signIn = function(user) {
+          $state.go('autolist');
+        };
+      })
+
+      .controller('ForgotPasswordCtrl', function($scope, $state) {
+        //console.log('ForgotPasswordCtrl');
+        $scope.password = Math.round(Math.random() * 10000);
+      })
+
+      .controller('AutoListCtrl', function($scope, $state) {
+        $scope.autoListData = "AutoListCtrl Data";
+
+        $scope.testStateGo = function() {
+          var toParams = { id: 4 };
+          $state.go('autodetail', toParams);
+        };
+      })
+
+      .controller('AutoDetailCtrl', function($scope, $state, $stateParams) {
+        $scope.autoDetailData = "AutoDetailCtrl Data";
+
+        $scope.auto = $scope.autos[$stateParams.id];
+      })
+
+      .controller('AutoAddCtrl', function($scope) {
+        $scope.newAutoData = "AutoAddCtrl Data";
+      })
+
+
+      .run(function($rootScope) {
+      
+        $rootScope.autos = [
+          { make: 'Cord', model: '810', year: '1936', desc: 'Styled by Gordon M. Buehrig, it featured front-wheel drive and independent front suspension;[ the front drive enabled the 810 to be so low, runningboards were unnecessary. Powered by a 4,739 cc (289 cu in) Lycoming V8 of the same 125 hp (93 kW) as the L-29, The 810 had a four-speed electrically-selected semi-automatic transmission, among other innovative features.', url: 'http://en.wikipedia.org/wiki/Cord_810/812' },
+          { make: 'DeLorean', model: 'DMC-12', year: '1981', desc: 'The DeLorean DMC-12 is a sports car manufactured by John DeLorean\'s DeLorean Motor Company for the American market in 1981–82. Featuring gull-wing doors with a fiberglass "underbody", to which non-structural brushed stainless steel panels are affixed, the car became iconic for its appearance as a modified time machine in the Back to the Future film trilogy.', url: 'http://en.wikipedia.org/wiki/DeLorean_DMC-12' },
+          { make: 'Duesenberg', model: 'Model SJ', year: '1933', desc: 'The rare supercharged Model J version, with 320 hp (239 kW) was also created by Fred Duesenberg and introduced in May 1932, only 36 units were built. Special-bodied models, such as the later "Mormon Meteor" chassis, achieved an average speed of over 135 mph (217 km/h)[17] and a one-hour average of over 152 mph (245 km/h) at Bonneville Salt Flats, Utah.', url: 'http://en.wikipedia.org/wiki/Duesenberg_Model_J' },
+          { make: 'Hudson', model: 'Hornet', year: '1951', desc: 'The Hornet, introduced for the 1951 model year, was based on Hudson\'s "step-down" design that was first seen in the 1948 model year on the Commodore. The design merged body and chassis frame into a single structure, with the floor pan recessed between the car\'s chassis rails instead of sitting on top of them. Thus one "stepped down" into a Hudson. The step-down chassis\'s "lower center of gravity...was both functional and stylish. The car not only handled well, but treated its six passengers to a sumptuous ride. The low-slung look also had a sleekness about it that was accentuated by the nearly enclosed rear wheels.', url: 'http://en.wikipedia.org/wiki/Hudson_Hornet' },
+          { make: 'Shelby', model: 'Cobra', year: '1965', desc: 'Shelby wanted the AC Cobras to be "Corvette-Beaters" and at nearly 500 lb (227 kg) less than the Chevrolet Corvette, the lightweight roadster accomplished that goal at Riverside International Raceway on 2 February 1963. Driver Dave MacDonald piloted CSX2026 past a field of Corvettes, Jaguars, Porsches, and Maseratis and recorded the Cobra\'s historic first-ever victory.', url: 'http://en.wikipedia.org/wiki/Shelby_Cobra' },
+          { make: 'Tesla', model: 'Roadster', year: '2008', desc: 'Tesla Motors\' first production vehicle, the Tesla Roadster, was an all-electric sports car. The Roadster was the first highway-capable all-electric vehicle in serial production for sale in the United States in the modern era. The Roadster was also the first production automobile to use lithium-ion battery cells and the first production BEV (all-electric) to travel more than 200 miles (320 km) per charge.', url: 'http://en.wikipedia.org/wiki/Tesla_Roadster' },
+          { make: 'Tucker', model: '48', year: '1948', desc: 'The Tucker 48 (named after its model year) was an advanced automobile conceived by Preston Tucker and briefly produced in Chicago in 1948. Only 51 cars were made before the company folded on March 3, 1949, due to negative publicity initiated by the news media, a Securities and Exchange Commission investigation and a heavily publicized stock fraud trial (in which allegations were proven baseless in court with a full acquittal). Speculation exists that the Big Three automakers and Michigan senator Homer S. Ferguson also had a role in the Tucker Corporation\'s demise.', url: 'http://en.wikipedia.org/wiki/Tucker_Torpedo' },
+        ];
+      })
+
+    </script>
+  </body>
+</html>
