Added changes to Logistics module. Merged two forms.