Some adjustments to Card UI