View refactor