new UI and bug fixed