Small fixes to the gui