Improved UI and usablility