Bug fixes and UI changes