Ui and few features updated