Fixing some html validation issues