Login page refactored