Updated tags to use more HTML5