changed html elements to proper content elements