Bugfixes and GUI improvments