Add Contact Us page and refactor Rspec