Fix all html validation issues
Fix grunt watch task