Improved deck-editor, closes #1