Menu fixes in webapp and curator

See commit comments for details.