moved logic of next button display to main toolbar