Bug fixes and user interface updates