Few tweaks for main and login screen.
Merge remote-tracking branch 'origin/master'