Manager link refactor and fixes