First modifications for the GUI