[artf891148] Ui bug fix