Highlight any active cards, not just valid plays
Minor refactoring