Updated with new header links