Organize menus even better. No functional change.

As commented by waddlesplash. Thanks.