Minor fixes and UI improvements