Fixed link bug, still need to add separate links though