Update views for any forms
Fix conflicts