Add contact page and refactor tests a bit.