Improve the StructEditor