Added appropriate logic for order views