UI fixed
Merge branch 'mathFrankxin'