GUI update: option menu
Merge remote-tracking branch 'origin/master' into Monia