Minor bug fixes and UI changes