Views refactor part 2