improve UI on loading
improve the performance :(