Issue: Homepage and contacts page fixes