Improved UI and functionality