moving more HTML into a new directive - newMetricForm