Remove redundant nav attrib, add titles