diff --git a/accountant/frontend/static/js/app.js b/accountant/frontend/static/js/app.js
index 82ac9a2..6a96d17 100644
--- a/accountant/frontend/static/js/app.js
+++ b/accountant/frontend/static/js/app.js
@@ -75,11 +75,6 @@ angular.module('accountant', [
 
 }])
 
-.config(['$locationProvider', function($locationProvider) {
-    // Enable HTML5 mode.
-    $locationProvider.html5Mode(true);
-}])
-
 .config(['$storageProvider', function($storageProvider) {
     // Configure storage
     // Set global prefix for stored keys 
diff --git a/accountant/frontend/static/templates/accounts.html b/accountant/frontend/static/templates/accounts.html
index 553fb80..db6e2be 100644
--- a/accountant/frontend/static/templates/accounts.html
+++ b/accountant/frontend/static/templates/accounts.html
@@ -43,7 +43,7 @@
             e-placeholder="Nom du compte"
             e-style="width: 100%"
             e-name="name" e-form="rowform" e-required>
-            <a href="account/{{ account.id }}/operations">{{ account.name }}</a>
+            <a href="#/account/{{ account.id }}/operations">{{ account.name }}</a>
           </span>
         </td>
 
@@ -102,7 +102,7 @@
               <!-- Open account scheduler. -->
               <a class="btn btn-default"
                 ng-if="account.id"
-                href="account/{{ account.id }}/scheduler">
+                href="#/account/{{ account.id }}/scheduler">
                 <span class="fa fa-clock-o"></span>
               </a>
             </div>
diff --git a/accountant/frontend/templates/layout.html b/accountant/frontend/templates/layout.html
index 880a32d..9320e86 100644
--- a/accountant/frontend/templates/layout.html
+++ b/accountant/frontend/templates/layout.html
@@ -23,8 +23,6 @@
     <!-- Title -->
     <title>Accountant</title>
 
-    <base href="{{ url_for('frontend.index') }}">
-
     <!-- main css -->
     {% assets 'frontend_css' %}
     <link href="{{ ASSET_URL }}" rel="stylesheet">
@@ -47,7 +45,7 @@
       <div class="container-fluid">
         <!-- Brand -->
         <div class="navbar-header">
-          <a class="navbar-brand" href="accounts">&nbsp;Accountant</a>
+          <a class="navbar-brand" href="#/accounts">&nbsp;Accountant</a>
         </div>
       </div>
     </nav>