Some minor refactoring and new contact modal.