Worked on cards window
Merge pull request #138 from HoltMaki/master

Worked on cards window