Major UI fixes and enhancements