some changes to Ui