cleaned up some views
Merge branch 'master' into ryan