wallet design finalization, #30