Cleaned up some of the views.