More GUI work, threading cleaning