Removing card-top and card bottom from the editor, it doesn't work anyway.

And some merge fixes.