Various small UX and UI improvements and bug fixes