More GUI state work; touched up set selection code