More work on the cards UI