Add items and page links and some fixes