Editor panel rework