Added prev/next buttons and step control