Card layout changes and query fixes.
Card layout changes and query fixes.