Fix ids for the HTML elements