Updating H2, H3 and H6 to use fleet_form. Need to do H4 and H5 still.