new UI fixes