Added metrics, working on incident pages