diff --git a/dist/index.html b/dist/index.html
index 439a809ed6c3253cd8481b0d164dfc151bf7c526..48fefae568d2fcd4709b55b803f815c652a2fd49 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -71,6 +71,7 @@
 
         <script src="js/app.js"></script>
         <script src="js/services/user.js"></script>
+        <script src="js/services/analyzerNav.js"></script>
         <script src="js/controllers/header.js"></script>
         <script src="js/controllers/home.js"></script>
         <script src="js/controllers/uppercase.js"></script>
diff --git a/dist/js/controllers/analyzer.configure.js b/dist/js/controllers/analyzer.configure.js
index 009fb014511a38a2b3fa45e82a78c9e9f6c570aa..5d5b990f16e283b2a65a86378e28dadf83aa927f 100644
--- a/dist/js/controllers/analyzer.configure.js
+++ b/dist/js/controllers/analyzer.configure.js
@@ -1,2 +1,3 @@
-app.controller('analyzer.configure', ['$scope', function ($scope) {
+app.controller('analyzer.configure', ['$scope', 'analyzerNav', function ($scope, analyzerNav) {
+    analyzerNav.navSelected = "configure";
 }]);
diff --git a/dist/js/controllers/analyzer.dataModel.js b/dist/js/controllers/analyzer.dataModel.js
index fc999c054a2fc4e1136cde33fab6587a5bd9737d..c30540db0b41982f287c628a016f6351c3982e4f 100644
--- a/dist/js/controllers/analyzer.dataModel.js
+++ b/dist/js/controllers/analyzer.dataModel.js
@@ -1,4 +1,6 @@
-app.controller('analyzer.dataModel', ['$scope', function ($scope) {
+app.controller('analyzer.dataModel', ['$scope', 'analyzerNav', function ($scope, analyzerNav) {
+    analyzerNav.navSelected = "dataModel";
+
     $scope.datapoints = [
         {
             "key": "educationMax",
diff --git a/dist/js/controllers/analyzer.datastore.js b/dist/js/controllers/analyzer.datastore.js
index df91e970a21bb3706fba98b93286b752d8f2895d..47415bb61505f3da6717a3936aa50d4301a3d1bc 100644
--- a/dist/js/controllers/analyzer.datastore.js
+++ b/dist/js/controllers/analyzer.datastore.js
@@ -1,2 +1,3 @@
-app.controller('analyzer.datastore', ['$scope', function ($scope) {
+app.controller('analyzer.datastore', ['$scope', 'analyzerNav', function ($scope, analyzerNav) {
+    analyzerNav.navSelected = "datastore";
 }]);
diff --git a/dist/js/controllers/analyzer.endpoints.js b/dist/js/controllers/analyzer.endpoints.js
index 76e161427a9e467909a19291053270a1320f375f..48b8479154b540e98496ba2281bd39921f208aca 100644
--- a/dist/js/controllers/analyzer.endpoints.js
+++ b/dist/js/controllers/analyzer.endpoints.js
@@ -1,2 +1,3 @@
-app.controller('analyzer.endpoints', ['$scope', function ($scope) {
+app.controller('analyzer.endpoints', ['$scope', 'analyzerNav', function ($scope, analyzerNav) {
+    analyzerNav.navSelected = "endpoints";
 }]);
diff --git a/dist/js/controllers/analyzer.fitness.js b/dist/js/controllers/analyzer.fitness.js
index 00751cb390c09662786bff0d695d786c329c0d3f..cc20be20c77245c6f3e26dab0435df621c12cc10 100644
--- a/dist/js/controllers/analyzer.fitness.js
+++ b/dist/js/controllers/analyzer.fitness.js
@@ -1,2 +1,3 @@
-app.controller('analyzer.fitness', ['$scope', function ($scope) {
+app.controller('analyzer.fitness', ['$scope', 'analyzerNav', function ($scope, analyzerNav) {
+    analyzerNav.navSelected = "fitness";
 }]);
diff --git a/dist/js/controllers/analyzer.insights.js b/dist/js/controllers/analyzer.insights.js
index 23b2221dffade3f070631faab5ba0dc0df7735a7..8f15b7a0b92aacdfad2eb9cea145035c4942111b 100644
--- a/dist/js/controllers/analyzer.insights.js
+++ b/dist/js/controllers/analyzer.insights.js
@@ -1,2 +1,3 @@
-app.controller('analyzer.insights', ['$scope', function ($scope) {
+app.controller('analyzer.insights', ['$scope', 'analyzerNav', function ($scope, analyzerNav) {
+    analyzerNav.navSelected = "insights";
 }]);
diff --git a/dist/js/controllers/analyzer.js b/dist/js/controllers/analyzer.js
index bd80234e3bd58eaff67459ea7cd5d5d2c4458ffb..dddc2c5d0edb1c25a1913589f7db6836c4ee7d4f 100644
--- a/dist/js/controllers/analyzer.js
+++ b/dist/js/controllers/analyzer.js
@@ -1,7 +1,3 @@
-app.controller('analyzer', ['$scope', function ($scope) {
-    $scope.navSelected = "dataModel";
-
-    $scope.selectNav = function(newNav) {
-        $scope.navSelected = newNav;
-    };
+app.controller('analyzer', ['$scope', 'analyzerNav', function ($scope, analyzerNav) {
+    $scope.analyzerNav = analyzerNav;
 }]);
diff --git a/dist/js/controllers/analyzer.statistics.js b/dist/js/controllers/analyzer.statistics.js
index f2cda370897bbee3cb98ba0d9a8cbe7fc46b14eb..37d5c28189090a4b6b3b8914a56a2f31a72b55c8 100644
--- a/dist/js/controllers/analyzer.statistics.js
+++ b/dist/js/controllers/analyzer.statistics.js
@@ -1,2 +1,3 @@
-app.controller('analyzer.statistics', ['$scope', function ($scope) {
+app.controller('analyzer.statistics', ['$scope', 'analyzerNav', function ($scope, analyzerNav) {
+    analyzerNav.navSelected = "statistics";
 }]);
diff --git a/dist/js/controllers/analyzer.traffic.js b/dist/js/controllers/analyzer.traffic.js
index 491e3a54aa9be5a7fca2e33ade69dc997fee922d..2125082ba8efbbf71b9cc20e2030af5174dada35 100644
--- a/dist/js/controllers/analyzer.traffic.js
+++ b/dist/js/controllers/analyzer.traffic.js
@@ -1,2 +1,3 @@
-app.controller('analyzer.traffic', ['$scope', function ($scope) {
+app.controller('analyzer.traffic', ['$scope', 'analyzerNav', function ($scope, analyzerNav) {
+    analyzerNav.navSelected = "traffic";
 }]);
diff --git a/dist/js/services/analyzerNav.js b/dist/js/services/analyzerNav.js
new file mode 100644
index 0000000000000000000000000000000000000000..22a572ad49317f21475a6c4309bc091dd2708ec5
--- /dev/null
+++ b/dist/js/services/analyzerNav.js
@@ -0,0 +1,5 @@
+app.factory('analyzerNav', function() {
+    return {
+        "navSelected": "dataModel"
+    };
+});
diff --git a/dist/views/analyzer.html b/dist/views/analyzer.html
index 1e40e0e4caf31804651d5c1470834dad1d239a78..7386371cd4d333d43385247a0fe600a858cf0371 100644
--- a/dist/views/analyzer.html
+++ b/dist/views/analyzer.html
@@ -27,27 +27,27 @@
     <div class="analyzer-nav">
         <nav role="navigation">
             <ul class="analyzer-nav-group">
-                <li class="analyzer-nav-item" ng-class="{selected: navSelected == 'dataModel'}">
-                    <a ng-click="selectNav('dataModel')" ui-sref="analyzer.dataModel">
+                <li class="analyzer-nav-item" ng-class="{selected: analyzerNav.navSelected == 'dataModel'}">
+                    <a ui-sref="analyzer.dataModel">
                         <span class="analyzer-data-model-icon"></span> Data model
                     </a>
                 </li>
 
-                <li class="analyzer-nav-item" ng-class="{selected: navSelected == 'datastore'}">
-                    <a ng-click="selectNav('datastore')" ui-sref="analyzer.datastore">
+                <li class="analyzer-nav-item" ng-class="{selected: analyzerNav.navSelected == 'datastore'}">
+                    <a ui-sref="analyzer.datastore">
                         <span class="analyzer-datastore-icon"></span> Datastore
                     </a>
                 </li>
 
-                <li class="analyzer-nav-item" ng-class="{selected: navSelected == 'fitness'}">
-                    <a ng-click="selectNav('fitness')" ui-sref="analyzer.fitness">
+                <li class="analyzer-nav-item" ng-class="{selected: analyzerNav.navSelected == 'fitness'}">
+                    <a ui-sref="analyzer.fitness">
                         <span class="analyzer-fitness-icon"></span> Fitness
                         <span class="counter">0</span>
                     </a>
                 </li>
 
-                <li class="analyzer-nav-item" ng-class="{selected: navSelected == 'endpoints'}">
-                    <a ng-click="selectNav('endpoints')" ui-sref="analyzer.endpoints">
+                <li class="analyzer-nav-item" ng-class="{selected: analyzerNav.navSelected == 'endpoints'}">
+                    <a ui-sref="analyzer.endpoints">
                         <span class="analyzer-endpoints-icon"></span> Endpoints
                     </a>
                 </li>
@@ -56,21 +56,21 @@
             <div class="analyzer-nav-separator"></div>
 
             <ul class="analyzer-nav-group">
-                <li class="analyzer-nav-item" ng-class="{selected: navSelected == 'insights'}">
-                    <a ng-click="selectNav('insights')" ui-sref="analyzer.insights">
+                <li class="analyzer-nav-item" ng-class="{selected: analyzerNav.navSelected == 'insights'}">
+                    <a ui-sref="analyzer.insights">
                         <span class="analyzer-insights-icon"></span> Insights
                         <span class="counter">0</span>
                     </a>
                 </li>
 
-                <li class="analyzer-nav-item" ng-class="{selected: navSelected == 'traffic'}">
-                    <a ng-click="selectNav('traffic')" ui-sref="analyzer.traffic">
+                <li class="analyzer-nav-item" ng-class="{selected: analyzerNav.navSelected == 'traffic'}">
+                    <a ui-sref="analyzer.traffic">
                         <span class="analyzer-traffic-icon"></span> Traffic
                     </a>
                 </li>
 
-                <li class="analyzer-nav-item" ng-class="{selected: navSelected == 'statistics'}">
-                    <a ng-click="selectNav('statistics')" ui-sref="analyzer.statistics">
+                <li class="analyzer-nav-item" ng-class="{selected: analyzerNav.navSelected == 'statistics'}">
+                    <a ui-sref="analyzer.statistics">
                         <span class="analyzer-statistics-icon"></span> Statistics
                     </a>
                 </li>
@@ -79,8 +79,8 @@
             <div class="analyzer-nav-separator"></div>
 
             <ul class="analyzer-nav-group">
-                <li class="analyzer-nav-item" ng-class="{selected: navSelected == 'configure'}">
-                    <a ng-click="selectNav('configure')" ui-sref="analyzer.configure">
+                <li class="analyzer-nav-item" ng-class="{selected: analyzerNav.navSelected == 'configure'}">
+                    <a ui-sref="analyzer.configure">
                         <span class="analyzer-configure-icon"></span> Configure
                     </a>
                 </li>