Cleaned up main menu build.

Main menu command sections are now identified explicitly as command sections.