Fix Order completion screen