More cleaning, card resize and tweaking