minor css to login
Resolving merge conflicts
Fixing merge conflicts