Craig - rework some card elements