Improve Keyword Editor