Some more changes to cards component code.