Fixed bugs with the links