Refactored entry pages. TODO: AutenticationService needs clean up