clean up and fix not working comment buttons