Added a list of shipments for each order
Clean up tables