Incidents basic UI
Merge