improve ui
Merge branch 'bowen' into rtong
Merge branch 'rtong' into bowen