Fixed next button behaviours