Redesign login form

Redesign login form
fix merge with origin dev
Fix merge with origin dev