View refactoring p1
View refactoring p2
Merge branch 'new_view' into development