Various changes on custom metric form