Minor changes: layout and login styles
Merged