[WIP] First pass at updating wallet layout