Refactoring of login page