Add Contact page and refactor