Refactor DistributionDeliveryDispatchViewModel
Refactor DistributionViewModel