Changes with Index and buttons
Few changes