Added order variable and moved some site/page variables around.
To do; order item