[FACTOR] Ui changes