Further page load time improvements