UI enhancements and bug fixes