Bug-51: UI refresh