Improve initial load ux