change span to button and adding comments