Improved editor ui