and even more gui cleanup