Fixed more html validation issues