update new UI and bug fixed