Fix a few GUI bugs