Manual merge order/ship page changes from mockups