Fix a few issues with the GUI