Reorganize menu. references #1122