A few more improvements to the GUI