Add Contact page
Refactor tests
Finish layout and routes