Changed effects and fixed linking next button