Added contact page and a little refactor