refactor views part 2