added views
major updates
Merged master fixed conflict