GUI - minor fixes