A small style change to menus.
Fix a crash as a result of recent additions.
Reorganization.
More reorganization.
Reorganization.
Reorganization.
Reorganization.
More reorganization and cleanup.
Reorganize.