Fixes to card layouts