orderpage moar fixes