A few more UI fixes/enhancements