Remove redundant heading, link the links