Rework login page