Improved UI and usability