Chg small view refactor