Making the html more robust for main page
Fixed conflict