Rework of login page