Added metric selection controls.