Shipment package product ui change

Merge new UI changes in development