Rework orders screen