REFACTOR views