Updated form layout and login screen