fix ui widget
Merge branch 'dev'