             [:div {:class (profile-column-width)}
              (bs/panel
               "Measurements"
-              [:dl
-               [:dt "Footprint (internal groundfloor area (m2)"] [:dd (display profile_data :footprint)]
-               [:dt "External Perimeter (m)"] [:dd (display profile_data :external_perimeter)]
-               [:dt "Gross Internal Area (m2)"] [:dd (display profile_data :gross_internal_area)]
-               [:dt "Number Of Storeys"] [:dd (display profile_data :number_of_storeys)]
-               [:dt "Total Volume (m3)"] [:dd (display profile_data :total_volume)]
-               [:dt "Total Rooms"] [:dd (display profile_data :total_rooms)]
-               [:dt "Total Bedrooms"] [:dd (display profile_data :bedroom_count)]
-               [:dt "Habitable Rooms"] [:dd (display profile_data :habitable_rooms)]
-               [:dt "Inadequate Heating?"] [:dd (display profile_data :inadequate_heating)]
-               [:dt "Heated Habitable Rooms"] [:dd (display profile_data :heated_habitable_rooms)]])]))]))))
-
-(defn energy-row [profiles ownwer]
+              [:div
+               (text-control profile_data state owner :footprint "Footprint (internal groundfloor area (m2)")
+               (text-control profile_data state owner :external_perimeter "External Perimeter (m)")
+               (text-control profile_data state owner :gross_internal_area "Gross Internal Area (m2)")
+               (text-control profile_data state owner :number_of_storeys "Number Of Storeys")
+               (text-control profile_data state owner :total_volume "Total Volume (m3)")
+               (text-control profile_data state owner :total_rooms "Total Rooms")
+               (text-control profile_data state owner :bedroom_count "Total Bedrooms")
+               (text-control profile_data state owner :habitable_rooms "Habitable Rooms")
+               (text-control profile_data state owner :inadequate_heating "Inadequate Heating?")
+               (text-control profile_data state owner :heated_habitable_rooms "Heated Habitable Rooms")])]))]))))
+
+(defn energy-row [profiles owner]
   (reify
     om/IRenderState
     (render-state [_ state]

        first
        :profiles))

(defn format-time-inst [t format]
  (if (nil? t)
    "Undated"

            [:div {:class (profile-column-width)}
             (bs/panel
              "Occupancy"
              [:div
               (text-control profile_data state owner :occupancy_under_18 "Occupancy Under 18")
               (text-control profile_data state owner :occupancy_18_to_60 "Occupancy 18 To 60")
               (text-control profile_data state owner :occupancy_over_60 "Occupancy Over 60")
               (text-control profile_data state owner :occupant_change "Occupant Change")])]))]))))

(defn measurements-row [profiles owner]
  (reify
    om/IRenderState
    (render-state [_ state]
