Editor: cleanup and optimization
Custom Editor UI: updated files