more updates to templates to match spec
updates to order page