update ui
merge with bo