update new UI and cleanup