fixes views
Merge branch 'feature/edit_union_page-60' into staging