Small bug fixes and UI improvements