A little refactoring and the contact page