Various improvements to the GUI