More on wallet UI