Fixed sizing problem on login page
Fixed merge conflict