Cleaned up the code, played a little bit with card appearance