Added ordering of links, removals of underscores