Changes to meet HTML5 standard