fix UI
Merge branch 'feature/dev-yuyu-official' into develop