changes to ids and added labels to input tags