Minor bug fixes and UI improvments