Consolidated some thymeleaf html fragments.
Added primary check boxes to Address, Phone, and Email.