Added more buttons and error in review-filling