Add next previous buttons
remove some comments