Refactored the signin pages