UX and UI improvements