More GUI cleanup