Initial GUI cleanup
More GUI cleanup