Form builder swapped around to work correctly