light GUI-fixes
Merge branch 'master' into hanna
fixed some small GUI-stuff
merge fixes
merge fixes