Improved UI and bugfixes.