Update UI
Merge branch 'develop' of https://github.com/RoyJin1987/Abs into develop