Login screen refactored