Minor GUI update
Merge branch 'master' into gui