Updated with metrics.json data and improvements on modals and templates management