Improve editor