GUI cleanup and bugfix