Finish page reordering, closes #5