update ui headers
Merge branch 'feature-update_ui-1' into develop