lots of fixes to views
conflict fixes