added pagination for links
fixed merge conflict