Editor Improvements

Improved usability of the editor, and modified Deck to accommodate
future features.