Some design fixes for the editor

closes #374