update some UI
Merge branch 'ljc' into dev