Added id attribute for elements