Improve contact and service page