updated login/user form styling
fixing merge conflicts
Merge branch 'login'