Made lots of changes to views.