Some edits for the incident template