Improved loading on home page