restructure views
Merge branch 'master' into uesteibar-views