Fix some problems with orders
Makeup some pages