Refactor Account Edit page