update ui
Merge branch 'feature-2' into develop