Adding in proper transition between orders and review