Improve contact page functionality