Cards screen starting to work better
Merge pull request #140 from HoltMaki/master

Cards screen starting to work better