Improved editing mode