Added View class
Fixed merge conflicts
Update config