Initial organization of the views
These should have been added with the previous commit