diff --git a/api/message.js b/api/message.js
index a763a7b..d385019 100644
--- a/api/message.js
+++ b/api/message.js
@@ -7,7 +7,7 @@ async function sendWineSelectMessage(winnerObject) {
   winnerObject.timestamp_limit = new Date().getTime() * 600000;
   await winnerObject.save();
 
-  let url = new URL(`/#/winner/${winnerObject.id}`, "https://lottis.vin");
+  let url = new URL(`/winner/${winnerObject.id}`, "https://lottis.vin");
 
   return sendMessageToUser(
     winnerObject.phoneNumber,
diff --git a/api/update.js b/api/update.js
index c3fa4d1..9761c40 100644
--- a/api/update.js
+++ b/api/update.js
@@ -35,7 +35,7 @@ const submitWines = async (req, res) => {
     const message = JSON.stringify({
       message: "Dagens vin er lagt til, se den på lottis.vin/dagens!",
       title: "Ny vin!",
-      link: "/#/dagens"
+      link: "/dagens"
     });
 
     try {
diff --git a/src/components/VinlottisPage.vue b/src/components/VinlottisPage.vue
index e683a12..a7b1afd 100644
--- a/src/components/VinlottisPage.vue
+++ b/src/components/VinlottisPage.vue
@@ -13,7 +13,7 @@
           />
       </section>
       <div class="to-lottery-container">
-        <a href="#/lottery" class="to-lottery">Vil du til lotteriet?<span class="vin-link">Trykk her</span></a>
+        <router-link to="/lottery" class="to-lottery">Vil du til lotteriet?<span class="vin-link">Trykk her</span></router-link>
       </div>
       <section class="chart-container">
         <PurchaseGraph class="purchase" />
diff --git a/src/router.js b/src/router.js
index 78064b4..64043c5 100644
--- a/src/router.js
+++ b/src/router.js
@@ -1,3 +1,5 @@
+import VueRouter from "vue-router";
+
 import VinlottisPage from "@/components/VinlottisPage";
 import GeneratePage from "@/components/GeneratePage";
 import TodaysPage from "@/components/TodaysPage";
@@ -20,30 +22,37 @@ import AllRequestedWines from "@/components/AllRequestedWines";
 const routes = [
   {
     path: "*",
+    name: "Hjem",
     component: VinlottisPage
   },
   {
     path: "/lottery",
+    name: "Lotteri",
     component: LotteryPage
   },
   {
     path: "/dagens",
+    name: "Dagens vin",
     component: TodaysPage
   },
   {
     path: "/viner",
+    name: "Alle viner",
     component: AllWinesPage
   },
   {
     path: "/login",
+    name: "Login",
     component: LoginPage
   },
   {
     path: "/create",
+    name: "Registrer",
     component: CreatePage
   },
   {
     path: "/admin",
+    name: "Admin",
     component: AdminPage
   },
   {
@@ -55,25 +64,40 @@ const routes = [
     component: WinnerPage
   },
   {
-    path: "/history",
+    path: "/history/:date",
+    name: "Historie for dato",
+    component: HistoryPage
+  },
+  {
+    path: "/history/",
+    name: "Historie",
     component: HistoryPage
   },
   {
     path: "/highscore/:name",
+    name: "Personlig toppliste",
     component: PersonalHighscorePage
   },
   {
     path: "/highscore",
+    name: "Topplisten",
     component: HighscorePage
   },
   {
     path: "/request",
+    name: "Etterspør vin",
     component: RequestWine
   },
   {
     path: "/requested-wines",
+    name: "Etterspurte viner",
     component: AllRequestedWines
   }
 ];
 
-export { routes };
+const router = new VueRouter({
+  routes: routes,
+  mode: "history"
+});
+
+export default router;
diff --git a/src/vinlottis-init.js b/src/vinlottis-init.js
index f362976..52cc5a7 100644
--- a/src/vinlottis-init.js
+++ b/src/vinlottis-init.js
@@ -1,6 +1,6 @@
 import Vue from "vue";
 import VueRouter from "vue-router";
-import { routes } from "@/router.js";
+import VinlottisRouter from "@/router.js";
 import Vinlottis from "@/Vinlottis";
 import VueAnalytics from "vue-analytics";
 
@@ -9,13 +9,9 @@ Vue.use(VueAnalytics, {
   id: "UA-156846886-1"
 });
 
-const router = new VueRouter({
-  routes: routes
-});
-
 new Vue({
   el: "#app",
-  router,
+  router: VinlottisRouter,
   components: { Vinlottis },
   template: "<Vinlottis/>",
   render: h => h(Vinlottis)