Bugfixes and UI improvements