Hook up clicks for cards-view overlay, refactor