refactor login area