Improvements to the GUI