Fixed form labels and input ids

They now correspond to their content and match their input's id