Luke resolved some loading display issues