[[ MERG-6.7 ]] Mac menus refactored.
Part of the display update merged