restyled login
styled the users page
fixed merge conflicts