Fix menu mess

*Fix #830