merged with william and fixed home page loading issues
fixed home screen loading issue