Add Metrics, cleanup buttons