Improved editing experience