Moved card location plus general cleanup for new thumbs etc