Updated editor view, models and collections