Menu bar: Changed structure of menu include to be more appropriate for WAI-ARIA and hard-coded in WAI-ARIA attributes