swagged out the login page
fixed merge problems