Improve toggleNext