Fixed Links Bugs