Update homepage maps and fix loading