fix ui
Merge branch 'fixslb' into dev