WIP: refactor merge account page