Further initial tweaks for switching to deck editor.