added links and improved separation between roles