Login page refactoring