moved card location and cleanup
card cleanup
Merge pull request #359 from mozilla/experiment

Moved card location plus general cleanup for new thumbs etc