Changed login style
Merge origin/master