Contact page refactored