rebuilding views
cleaned up views