Refactor change password page