Wallet anxiety implemented, layout changes