diff --git a/dist/index.html b/dist/index.html
index bdfa225b4961086dc0138d09f8e48377f775374a..ec9d1dd8d51f0ab95999816d8a3c7e4bc6fe6251 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -76,7 +76,7 @@
         <script src="js/uppercaseController.js"></script>
         <script src="js/chartsController.js"></script>
         <script src="js/userToggleController.js"></script>
-        <script src="js/dataModelController.js"></script>
         <script src="js/analyzerController.js"></script>
+        <script src="js/dataModelController.js"></script>
     </body>
 </html>
diff --git a/dist/js/analyzerController.js b/dist/js/analyzerController.js
index a38b949850a3f44a3acdf8526d7e68ea1333ce1f..8643bfe777c3d54f05ce6ebc9f12b7afdfdfeae1 100644
--- a/dist/js/analyzerController.js
+++ b/dist/js/analyzerController.js
@@ -1,2 +1,3 @@
 app.controller('analyzerController', ['$scope', function ($scope) {
+    $scope.navSelected = "dataModel";
 }]);
diff --git a/dist/views/analyzer.dataModel.html b/dist/views/analyzer.dataModel.html
index b97d3680438b9bda6b850124a43ef5fd085f4b69..75b50cb26dc5852e401ff562b5b41b41a50c065f 100644
--- a/dist/views/analyzer.dataModel.html
+++ b/dist/views/analyzer.dataModel.html
@@ -1,4 +1,5 @@
 <div class="expand-collapse-links"><a ng-click="selectAllDataModelKeys()">Expand all</a> <a ng-click="unselectAllDataModelKeys()">Collapse all</a></div>
+
 <table class="data-model-table">
     <tbody>
         <tr class="data-model-table-key-row"  ng-class='{selected: datapoint.detailsVisible}' ng-click="selectDataModelKey($index)" ng-repeat-start="datapoint in datapoints">
diff --git a/dist/views/analyzer.html b/dist/views/analyzer.html
index 48fd835e25853a460b5d5eab96c7de78d397b9ef..fc210f118856034b072fd507745168fa894997d4 100644
--- a/dist/views/analyzer.html
+++ b/dist/views/analyzer.html
@@ -27,14 +27,14 @@
     <div class="analyzer-nav">
         <nav role="navigation">
             <ul class="analyzer-nav-group">
-                <li class="analyzer-nav-item selected">
-                    <a href="#">
+                <li class="analyzer-nav-item" ng-class="{selected: navSelected == 'dataModel'}">
+                    <a ui-sref="analyzer.dataModel">
                         <span class="analyzer-data-model-icon"></span> Data model
                     </a>
                 </li>
 
                 <li class="analyzer-nav-item">
-                    <a href="#">
+                    <a>
                         <span class="analyzer-datastore-icon"></span> Datastore
                     </a>
                 </li>