Editor imprrovements