rearrange form to be slightly less horrible