cleaned up views
merge