merge with master
render dashboard upon successful login