Fixed redirect to login
Added some basic styling and added background image
Fixed merge conflicts