Refactor new views