Editing MOde Improvements