Fixed bugs in links