Improved navigator tree, added editors