added measure selection to order page etc.