Add new Ui, some new features