adjust the ui and removed some functions