Some login changes
css shit
Merged css conflicts