Add links to header, change <i>s to <span>s