comment and buttons now are better