Add new pages and fix link bug