Further improvements to the GUI