Improve user editor