XC-25 Add Comment button still visible after clicking it -> confusing