Outlining view refactor