reorder accounts in markup

This still isn't a user-facing change yet, but the next one should be. This sets us up to group and restyle the Connected Accounts. Follow-on from #2122, moves us towards #2053.