More work on the contact page. This also fixes #7 and #9