More bug fixes. UI enhancements.