Refactor as reply, reply button correctly mapped