Add Contact page, simple refactoring