Fix order of pages.
More cleanup