Corrected enabled/disabled state of menu items