More cleanup for design editor interface