Add page links and re-order sections