Contact page, refactoring