Move new_map_form into partial