More Admin Shipping updates (Part 2)

More Admin Shipping updates (Part 2)