Better navigation in editor