Added individual metrics; Fixed Edit link;