Add Editor Component
Merge conflicts for EditorComponent