more gui cleanup