Fixed logic and improved card images