fix maps and menus