Made the login page look prettier.
fixed merge conflicts