Improved UI and minor fixes.