Design changes and conflict resolving

Changes to the design for activity, consultant and provider