Additional menu

Consolidating improvements and producing still more change