upgrade step and order view fixes