Move from partials into views