Minor GUI cleanup