shipment typos and fixes
order page actions
Merge pull request #487 from picazoH/2-3-stable

Shipment typos and fixes.