change layout header sizes in views
merge conflict event form partial