Assorted UI fixes