[Story2][chenyan & xuehai] - Improved the UI