some GUI clean up