bug fixes and UI changes