Bugfixes and GUI improvements