Views refactor