Bugfixes and changes to the UI.