Fixed slow main page load