diff --git a/app/imports/ui/components/Sidebar.vue b/app/imports/ui/components/Sidebar.vue
index 13610ec7..dacd7f29 100644
--- a/app/imports/ui/components/Sidebar.vue
+++ b/app/imports/ui/components/Sidebar.vue
@@ -10,7 +10,7 @@
 				</v-tooltip>
 			</v-layout>
 			<v-layout row justify-center v-else="signedIn">
-				<v-btn flat>Sign in</v-btn>
+				<v-btn flat to="/sign-in">Sign in</v-btn>
 			</v-layout>
 		</v-toolbar>
     <v-list>
diff --git a/app/imports/ui/pages/Home.vue b/app/imports/ui/pages/Home.vue
index 12e0524a..f19058b0 100644
--- a/app/imports/ui/pages/Home.vue
+++ b/app/imports/ui/pages/Home.vue
@@ -57,9 +57,9 @@
           </v-layout>
         </v-layout>
       </section>
-      <section class="ma-5">
+      <section class="ma-5" v-if="!signedIn">
         <v-layout row align-center justify-space-around>
-          <v-btn color="accent" round large>
+          <v-btn color="accent" round large to="/register">
             Sign up
           </v-btn>
         </v-layout>
@@ -130,6 +130,11 @@
     components: {
       ToolbarLayout,
     },
+    meteor: {
+      signedIn(){
+				return Meteor.userId();
+			},
+    }
   };
 </script>
 
diff --git a/app/imports/ui/pages/Register.vue b/app/imports/ui/pages/Register.vue
index 17618c9b..77a1a00e 100644
--- a/app/imports/ui/pages/Register.vue
+++ b/app/imports/ui/pages/Register.vue
@@ -1,6 +1,6 @@
 <template>
 	<ToolbarLayout>
-		<div slot="toolbar">Sign In</div>
+		<div slot="toolbar">Sign Up</div>
 		<v-form ref="form" class="mt-4">
 			<v-layout column align-center>
 				<v-img
diff --git a/app/imports/ui/pages/SignIn.vue b/app/imports/ui/pages/SignIn.vue
index f49a8023..870ca8d2 100644
--- a/app/imports/ui/pages/SignIn.vue
+++ b/app/imports/ui/pages/SignIn.vue
@@ -35,7 +35,7 @@
 					>
 						Sign In
 					</v-btn>
-					<v-btn color="accent" href="/register">
+					<v-btn color="accent" to="/register">
 						Register
 					</v-btn>
 				</v-layout>
@@ -55,6 +55,7 @@
 
 <script>
 	import ToolbarLayout from "/imports/ui/layouts/ToolbarLayout.vue";
+	import {router} from "/imports/ui/vueSetup.js";
 	export default{
 		data: () => ({
       valid: true,
@@ -74,7 +75,11 @@
 				console.log("submitting");
         if (this.$refs.form.validate()) {
 					Meteor.loginWithPassword(this.name, this.password, e => {
-						this.error = e && e.reason;
+						if (e){
+							this.error = e.reason;
+						} else {
+							Router
+						}
 					});
         }
       },
diff --git a/app/imports/ui/vueSetup.js b/app/imports/ui/vueSetup.js
index 400dd4f6..93401299 100644
--- a/app/imports/ui/vueSetup.js
+++ b/app/imports/ui/vueSetup.js
@@ -7,6 +7,7 @@ import VueMeteorTracker from 'vue-meteor-tracker';
 import AppLayout from '/imports/ui/layouts/AppLayout.vue';
 import "vuetify/dist/vuetify.min.css";
 
+Vue.use(VueMeteorTracker);
 Vue.use(Vuetify, {
   theme: {
     primary: "#424242",
@@ -20,13 +21,12 @@ Vue.use(Vuetify, {
   iconfont: "mdi",
 });
 
-Vue.use(VueMeteorTracker);
+// Create the router instance
+const router = routerFactory.create();
+export router;
 
 // App start
 Meteor.startup(() => {
-  // Create the router instance
-  const router = routerFactory.create();
-
   // Start the Vue app
   new Vue({
     router,