Re-arrange to have eveything in one page.