Basic wallet redesign work