menu and map fixes