Integrate order page; fix minor order-related problems