Reorganize public views a bit for consistency
Merge branch 'public-view-rework'