Update menu handling (refs #3622)
Merge pull request #14 from cbonnissent/1.0_3622

Update menu