Finish Contact page and refactor