Editor Improvements merge