Revised/reorganized editing interface

Though I mostly made things worse.