diff --git a/src/main/resources/static/app/modules/login/loginCtrl.js b/src/main/resources/static/app/modules/login/loginCtrl.js
diff --git a/src/main/resources/static/app/modules/splash/splash.html b/src/main/resources/static/app/modules/splash/splash.html
@@ -2,7 +2,7 @@
 	<md-card>
 		<md-card-actions layout="row" layout-align="start center">
 			<md-card-icon-actions>
-				<md-button aria-label="Login">
+				<md-button aria-label="Login" ng-click="vm.gotoLogin()">
 					Login to the system
 				</md-button>
 

diff --git a/src/main/resources/static/app/modules/splash/splashCtrl.js b/src/main/resources/static/app/modules/splash/splashCtrl.js
@@ -13,18 +13,22 @@
 		.module('splash')
 		.controller('SplashCtrl', Splash);
 
-		Splash.$inject = [];
+		Splash.$inject = ['$state'];
 
 		/*
 		* recommend
 		* Using function declarations
 		* and bindable members up top.
 		*/
 
-		function Splash() {
+		function Splash($state) {
 			/*jshint validthis: true */
 			var vm = this;
 
+			vm.gotoLogin =function() {
+				$state.go("home.dashboard");
+			}
+
 		}
 
 })();
diff --git a/src/main/resources/static/app/modules/splash/splashRoute.js b/src/main/resources/static/app/modules/splash/splashRoute.js
@@ -13,7 +13,8 @@ angular.module('splash')
 
 		$stateProvider
 			.state('home.splash', {
-				url:'/splash',
+				url:'/',
+				//url:'/splash',
 				templateUrl: 'app/modules/splash/splash.html',
 				controller: 'SplashCtrl',
 				controllerAs: 'vm'

diff --git a/src/main/resources/static/app/services/websocketservice.js b/src/main/resources/static/app/services/websocketservice.js
@@ -81,7 +81,7 @@
 				$mdToast.simple()
 					.content("Area: " + message.area + " - Change: " + message.crudType)
 					.position('top right')
-					.hideDelay(9000)
+					.hideDelay(2000)
 					.parent("#parent")
 			);
 
@@ -103,6 +103,7 @@
 		}
 
 		var startListener = function () {
+			console.log("Got connection");
 			socket.stomp.subscribe(service.CHAT_TOPIC, function (data) {
 				listener.notify(getMessage(data.body));
 			});
@@ -120,9 +121,11 @@
 		service.connect = function () {
 			socket.client = new SockJS(service.SOCKET_URL);
 			socket.stomp = Stomp.over(socket.client);
-			socket.stomp.connect({}, startListener);
 			socket.stomp.onclose = reconnect;
+			socket.stomp.connect({}, startListener);
+
 			console.log("connected");
+
 		};