#48, add page navigation