Moved id attributes to parent elements, removed superfluous anchor tags