Improved UI and Speed