Correct next/prev month logic