Several minor changes in the GUI