Made some GUI cleanup.