Re-labeled 'Layout' menu to 'Display' menu; Fix to hide the legacy display menu on layout aware content