Fix next button on fields