Small changes for the GUI