Fixed sub-menus and merge conflicts.