Prettify cards and stuff
Cleaning major merge fuckup