fixes to new UI