Improved the editor UI