* Deck editor - Some minor layout changes (not finished yet).
Merge origin/master