dependency fixes; views
view cleanup