Improved edit incidents modal dialog