seperate link page and some cleanup