next button fixed some bugs