fixing more issues added next button