Adding some more selectors and roles to HTML