Combining "extend" and "extensions" menus into one "Extra's" menu. Working on #1694