Extended to the other pages, addresses #18.