New editor components + renaming