Fixed the clickable names