[FIX] Wallet Layout