Editor-Improvements2

Note Editor Improvements