Improving the GUI