Better editor (8/20)

Better editor