did some gui cleanup and minor fixes