Making the order page smarter