My Shipments UI formatting as per mentioned changes