Order page fixes