#JC-1251 UI to links