updated html5 markups & class