fixed some of the views
Merge remote-tracking branch 'origin/master'