XD-1889 Polishing UI rendering