Fix editing wallets, plus some cosmetic changes