minor bug fixes and UI enhancements