Made editor independent from view. v2