Bug fixed, Optimization UI