various fixes for the new UI