Improvements of edit mode