improve Event Editor