Major fixes to login page