Refinments to shipment workspace and behavior.