UI fixes and enhancements