Changed Menu structure to fit Flex version