Editor improvements

fixed