Minor changes for a better html validation