Updates for new UI