Fixed issues for html c & d