New cursor + menu fix