diff --git a/angular_app/index.html b/angular_app/index.html
index 8fd295d..1aee94c 100644
--- a/angular_app/index.html
+++ b/angular_app/index.html
@@ -38,15 +38,15 @@
     -->
 
     <body>
-        <nav class="navbar navbar-default navbar-fixed-top">
-            <div class="container" ng-controller="NavigationCtrl as n">
+        <nav class="navbar navbar-default navbar-fixed-top" ng-controller="NavigationCtrl as n">
+            <div class="container">
                 <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
                     <ul class="nav navbar-nav">
-                        <li><a ng-click="n.go('/events')">{{'Events' | translate}}</a></li>
-                        <li><a ng-click="n.go('/new-event')">{{'Add event' | translate}}</a></li>
-                        <li><a ng-click="n.go('/persons')">{{'Persons' | translate}}</a></li>
-                        <li><a ng-click="n.go('/new-person')">{{'Add person' | translate}}</a></li>
-                        <li><a ng-click="n.go('/import-persons')">{{'Import persons' | translate}}</a></li>
+                        <li ng-class="{active: n.isActive('/events')}"><a ng-href="#/events">{{'Events' | translate}}</a></li>
+                        <li ng-class="{active: n.isActive('/new-event')}"><a ng-href="#/new-event">{{'Add event' | translate}}</a></li>
+                        <li ng-class="{active: n.isActive('/persons')}"><a ng-href="#/persons">{{'Persons' | translate}}</a></li>
+                        <li ng-class="{active: n.isActive('/new-person')}"><a ng-href="#/new-person">{{'Add person' | translate}}</a></li>
+                        <li ng-class="{active: n.isActive('/import-persons')}"><a ng-href="#/import-persons">{{'Import persons' | translate}}</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/angular_app/js/controllers.js b/angular_app/js/controllers.js
index 6cb4954..488a69f 100644
--- a/angular_app/js/controllers.js
+++ b/angular_app/js/controllers.js
@@ -12,6 +12,10 @@ eventManControllers.controller('NavigationCtrl', ['$location',
         this.go = function(url) {
             $location.url(url);
         };
+
+        this.isActive = function (view) { 
+            return view === $location.path();
+        };
     }]
 );
 
diff --git a/static/css/eventman.css b/static/css/eventman.css
index 624219c..bb48dbd 100644
--- a/static/css/eventman.css
+++ b/static/css/eventman.css
@@ -1,6 +1,6 @@
 
 /* nav-bar padding */
-body { padding-top: 54px; }
+body { padding-top: 65px; }
 
 /* fix styling for empty href */
 .nav, .pagination, .carousel, .panel-title a { cursor: pointer; }
