Multiople bug fixes and UI enhancements