Minor bug fixes and UI enhancements