added incident controls
merged dashboard