Merged in new changes for the link items page