Included Validation to Incident Edit Form

And minor changes