Reorganize the account section