names of incident table changed from incidents to incident, update to main template