First step of GUI cleanup, lots more to go.