Shipping view fixes