Editor - small improvements