Some tweaks to the HTML