Fix with next and prev buttons