More changes to views
Merge branch 'manu'