Fixes for new UI