[ChenYang][modify page style]
[ChenYang][fix conflict]