          (om/build extensions-row profiles)
          (om/build heating-systems-row profiles)
          (om/build hot-water-systems-row profiles)
-         ;; (om/build storeys profiles)
-         ;; (om/build walls profiles)
-         ;; (om/build roofs profiles)
-         ;; (om/build window-types profiles)
-         ;; (om/build door-types profiles)
-         ;; (om/build floors profiles)
-         ;; (om/build roof-rooms profiles)
-         ;; (om/build low-energy-lights profiles)
-         ;; (om/build ventilation-systems profiles)
-         ;; (om/build airflow-measurements profiles)
+         (om/build storeys-row profiles)
+         (om/build walls-row profiles)
+         (om/build roofs-row profiles)
+         (om/build window-sets-row profiles)
+         (om/build door-sets-row profiles)
+         (om/build floors-row profiles)
+         (om/build roof-rooms-row profiles)
+         (om/build low-energy-lights-row profiles)
+         (om/build ventilation-systems-row profiles)
+         (om/build airflow-measurements-row profiles)
 
          ;; renewable energy systems
          ;; (om/build photovoltaic-panels profiles)

             (bs/panel
              "Measurements"
              [: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")

           (bs/panel
            "Conservatories"
            (if-let [conservatories (seq (:conservatories profile))]
              [:div
               (for [c conservatories]
                 (bs/panel
                  "Conservtory"
