Some Ui and util updates