Some GUI clean up