Rejig layout and add a bit of card styling