Added the class and id names back into the html markup