updated new UI