Comment Button Update

Plus additional changes