Refactor views
Finish part two
Merge remote-tracking branch 'origin/master'