A couple new UI fixes