Most recent feedback

There will be likely some merge conflicts with header_links class from other pull requests. The code from this pull request should take priority.