Modified them files for proper HTML tags, properties and attributes