Merge "Slight tweaks to the card view." into mnc-ub-dev