Trying to make the links work better.
Link improvements