BUG FIX: Shipment Selection BACK button handling.
BUG FIX: Frieght is missing