Many changes to the views
Many changes to views and the view system