Feature/login screen fixes