Revert "new vault order, show extra vaults"

This reverts commit ab34414bf8c5d713d3ffbac1aa083531e93aeb63.
Revert "Revert "new vault order, show extra vaults""

This reverts commit 9f051ba3f2cc764de1f83cb0300cd1a28838461e.