Added Ids to input fields