Tweaks and improvements to cards
Merge pull request #6655 from Hubblenaut/dev-freeze

Tweaks and improvements to cards